AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Draw glyphs on Mac without font transform.

Browse Source 
The transform on the font is increasingly going untested on Mac.
As a result, only use the transform on the context when possible.
This fixes color emoji on OSX10.2.

Review URL: https://codereview.chromium.org/975493002
This commit is contained in:
bungeman 2015-03-02 13:43:26 -08:00 committed by Commit bot
parent b421650e13
commit aae309111b
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/ports/SkFontHost_mac.cpp
View File

@ -675,6 +675,7 @@ private:
Offscreen fOffscreen; Offscreen fOffscreen;
AutoCFRelease<CTFontRef> fCTFont; AutoCFRelease<CTFontRef> fCTFont;
CGAffineTransform fTransform;
CGAffineTransform fInvTransform; CGAffineTransform fInvTransform;
/** Unrotated variant of fCTFont. /** Unrotated variant of fCTFont.
@ -724,12 +725,12 @@ SkScalerContext_Mac::SkScalerContext_Mac(SkTypeface_Mac* typeface,
SkMatrix skTransform; SkMatrix skTransform;
fRec.computeMatrices(SkScalerContextRec::kVertical_PreMatrixScale, &scale, &skTransform, fRec.computeMatrices(SkScalerContextRec::kVertical_PreMatrixScale, &scale, &skTransform,
NULL, NULL, &fFUnitMatrix); NULL, NULL, &fFUnitMatrix);
CGAffineTransform transform = MatrixToCGAffineTransform(skTransform); fTransform = MatrixToCGAffineTransform(skTransform);
fInvTransform = CGAffineTransformInvert(transform); fInvTransform = CGAffineTransformInvert(fTransform);
AutoCFRelease<CTFontDescriptorRef> ctFontDesc; AutoCFRelease<CTFontDescriptorRef> ctFontDesc;
if (fVertical) { if (fVertical) {
// Setting the vertical orientation here affects the character to glyph mapping. // Setting the vertical orientation here is required for vertical metrics on some versions.
AutoCFRelease<CFMutableDictionaryRef> cfAttributes(CFDictionaryCreateMutable( AutoCFRelease<CFMutableDictionaryRef> cfAttributes(CFDictionaryCreateMutable(
kCFAllocatorDefault, 0, kCFAllocatorDefault, 0,
&kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryKeyCallBacks,
@ -747,7 +748,7 @@ SkScalerContext_Mac::SkScalerContext_Mac(SkTypeface_Mac* typeface,
// Some properties, like 'trak', are based on the text size (before applying the matrix). // Some properties, like 'trak', are based on the text size (before applying the matrix).
CGFloat textSize = ScalarToCG(scale.y()); CGFloat textSize = ScalarToCG(scale.y());
fCTFont.reset(CTFontCreateCopyWithAttributes(ctFont, textSize, &transform, ctFontDesc)); fCTFont.reset(CTFontCreateCopyWithAttributes(ctFont, textSize, &fTransform, ctFontDesc));
fCGFont.reset(CTFontCopyGraphicsFont(fCTFont, NULL)); fCGFont.reset(CTFontCopyGraphicsFont(fCTFont, NULL));
fCTUnrotatedFont.reset(CTFontCreateCopyWithAttributes(ctFont, textSize, fCTUnrotatedFont.reset(CTFontCreateCopyWithAttributes(ctFont, textSize,
&CGAffineTransformIdentity, NULL)); &CGAffineTransformIdentity, NULL));
@ -859,8 +860,8 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
// Our 'fake' one does not, so set up the CGContext here. // Our 'fake' one does not, so set up the CGContext here.
CGContextSetFont(fCG, context.fCGFont); CGContextSetFont(fCG, context.fCGFont);
CGContextSetFontSize(fCG, CTFontGetSize(context.fCTFont)); CGContextSetFontSize(fCG, CTFontGetSize(context.fCTFont));
CGContextSetTextMatrix(fCG, CTFontGetMatrix(context.fCTFont));
} }
CGContextSetTextMatrix(fCG, context.fTransform);
} }
if (fDoAA != doAA) { if (fDoAA != doAA) {
@ -895,14 +896,16 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
} }
CGPoint point = CGPointMake(-glyph.fLeft + subX, glyph.fTop + glyph.fHeight - subY); CGPoint point = CGPointMake(-glyph.fLeft + subX, glyph.fTop + glyph.fHeight - subY);
if (darwinVersion() < 14) { // Prior to 10.10, CTFontDrawGlyphs acted like CGContextShowGlyphsAtPositions and took
// Prior to 10.10, CTFontDrawGlyphs acted like CGContextShowGlyphsAtPositions and took // 'positions' which are in text space. The glyph location (in device space) must be
// 'positions' which are in text space. The glyph location (in device space) must be // mapped into text space, so that CG can convert it back into device space.
// mapped into text space, so that CG can convert it back into device space. // In 10.10.1, this is handled directly in CTFontDrawGlyphs.
// In 10.10 and later, this is handled directly in CTFontDrawGlyphs.
point = CGPointApplyAffineTransform(point, context.fInvTransform); // However, in 10.10.2 color glyphs no longer rotate based on the font transform.
} // So always make the font transform identity and place the transform on the context.
ctFontDrawGlyphs(context.fCTFont, &glyphID, &point, 1, fCG); point = CGPointApplyAffineTransform(point, context.fInvTransform);
ctFontDrawGlyphs(context.fCTUnrotatedFont, &glyphID, &point, 1, fCG);
SkASSERT(rowBytesPtr); SkASSERT(rowBytesPtr);
*rowBytesPtr = rowBytes; *rowBytesPtr = rowBytes;