Bug 1386643 - Don't respect font smoothing background colors in pushed layers. r?jrmuizel
This is an imperfect workaround. Ideally we'd want layout to determine the
correct color here: If the pushed layer will end up on something mostly opaque
in the outer layer, the font smoothing background color should be transparent
(or even a color that approximates that opaque content), and if the pushed
layer will end up on transparency in the outer layer, the appropriate font
smoothing background color for the outer layer should be used when drawing text
in the pushed layer.
This workaround causes us to lose subpixel AA in background tabs that have the
overflow mask applied to them. For those, using the font smoothing background
color in the pushed layer was the right choice.
MozReview-Commit-ID: FPufh04EVp3
--- a/gfx/2d/DrawTargetSkia.cpp
+++ b/gfx/2d/DrawTargetSkia.cpp
@@ -1256,17 +1256,23 @@ DrawTargetSkia::FillGlyphsWithCG(ScaledF
Vector<CGGlyph,32> glyphs;
Vector<CGPoint,32> positions;
if (!SetupCGGlyphs(cgContext, aBuffer, glyphs, positions)) {
ReturnCGContext(cgContext);
return false;
}
- SetFontSmoothingBackgroundColor(cgContext, mColorSpace, aRenderingOptions);
+ if (mPushedLayers.empty()) {
+ // Respect the font smoothing background color, but only if no layer is
+ // currently pushed, because this color usually describes what's under this
+ // DrawTarget, and not what's within this DrawTarget under the currently
+ // pushed layer.
+ SetFontSmoothingBackgroundColor(cgContext, mColorSpace, aRenderingOptions);
+ }
SetFontColor(cgContext, mColorSpace, aPattern);
ScaledFontMac* macFont = static_cast<ScaledFontMac*>(aFont);
if (ScaledFontMac::CTFontDrawGlyphsPtr != nullptr) {
ScaledFontMac::CTFontDrawGlyphsPtr(macFont->mCTFont, glyphs.begin(),
positions.begin(),
aBuffer.mNumGlyphs, cgContext);
} else {