Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1230366. Render CG font with black on white on skia. r=lsalzman

Browse Source
This commit is contained in:
Mason Chang 2016-03-08 08:27:25 -08:00
parent 2048d9f4a0
commit ac058cacc5
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gfx/skia/skia/src/ports/SkFontHost_mac.cpp
View File

@ -863,10 +863,6 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
CGContextSetTextDrawingMode(fCG, kCGTextFill);
// Draw white on black to create mask.
// TODO: Draw black on white and invert, CG has a special case codepath.
CGContextSetGrayFillColor(fCG, 1.0f, 1.0f);
// force our checks below to happen
fDoAA = !doAA;
fDoLCD = !doLCD;
@ -889,13 +885,22 @@ CGRGBPixel* Offscreen::getCG(const SkScalerContext_Mac& context, const SkGlyph&
fDoLCD = doLCD;
}
// CG has two masks for white-on-black or black-on-white on OS X 10.11
// On 10.9, it doesn't matter.
// On 10.11, the white-on-black is slightly thinner text than
// black-on-white due to less dilation. This only happens with FontSmoothing
// When fDoLCD is true, draw black on white.
uint32_t backgroundColor = fDoLCD ? 0xFFFFFFFF : 0;
uint32_t foregroundColor = fDoLCD ? 0.0f : 1.0f;
CGContextSetGrayFillColor(fCG, foregroundColor, 1.0f);
CGRGBPixel* image = (CGRGBPixel*)fImageStorage.get();
sk_memset_rect32(image, backgroundColor, fSize.fWidth, fSize.fHeight, rowBytes);
// skip rows based on the glyph's height
image += (fSize.fHeight - glyph.fHeight) * fSize.fWidth;
// erase to black
sk_memset_rect32(image, 0, glyph.fWidth, glyph.fHeight, rowBytes);
float subX = 0;
float subY = 0;
if (context.fDoSubPosition) {
@ -1283,7 +1288,11 @@ void SkScalerContext_Mac::generateImage(const SkGlyph& glyph) {
int r = (addr[x] >> 16) & 0xFF;
int g = (addr[x] >> 8) & 0xFF;
int b = (addr[x] >> 0) & 0xFF;
addr[x] = (table[r] << 16) | (table[g] << 8) | table[b];
// Since we drew black on white, the rest of skia expects white on black
// Invert it once we're back to linear.
addr[x] = ((255 - table[r]) << 16) | ((255 - table[g]) << 8) | (255 - table[b]);
}
addr = SkTAddByteOffset(addr, cgRowBytes);
}