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

Ammend font table data experiment on Mac.

Browse Source 
Calling CGFontCopyTableForTag did not affect the runtime results,
so try to actually access the data to see if that makes a
difference.

TBR=reed1
This is a test change, allow data to be collected.

Review URL: https://codereview.chromium.org/1076183004
This commit is contained in:
bungeman 2015-04-10 15:35:22 -07:00 committed by Commit bot
parent 3c309db75b
commit 94164944f8
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ports/SkFontHost_mac.cpp
View File

@ -913,6 +913,14 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
AutoCFRelease<CFDataRef> sbix;
if (static_cast<SkTypeface_Mac*>(context.getTypeface())->fHasColorGlyphs) {
sbix.reset(CGFontCopyTableForTag(context.fCGFont, 'sbix'));
// Attempt to read from the sbix table data to determine if the returned data is valid.
const UInt8* sbixData = CFDataGetBytePtr(sbix);
CFIndex sbixLength = CFDataGetLength(sbix);
if (sbixLength > 0 && *sbixData > 0x80) {
// We need to actually do something to avoid this being optimized away.
CFRetain(sbix);
CFRelease(sbix);
}
}
ctFontDrawGlyphs(context.fCTUnrotatedFont, &glyphID, &point, 1, fCG);