Bug 1387594 - Respect the font smoothing background color in pushed layers again. This backs out
bug 1386643. r?jrmuizel
MozReview-Commit-ID: KNsd7tKuRk1
--- a/gfx/2d/DrawTargetSkia.cpp
+++ b/gfx/2d/DrawTargetSkia.cpp
@@ -1256,23 +1256,17 @@ DrawTargetSkia::FillGlyphsWithCG(ScaledF
Vector<CGGlyph,32> glyphs;
Vector<CGPoint,32> positions;
if (!SetupCGGlyphs(cgContext, aBuffer, glyphs, positions)) {
ReturnCGContext(cgContext);
return false;
}
- 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);
- }
+ 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 {