Bug 1387594 - Respect the font smoothing background color in pushed layers again. This backs out bug 1386643. r?jrmuizel draft
authorMarkus Stange <mstange@themasta.com>
Thu, 17 Aug 2017 15:59:46 -0400
changeset 664805 34c5432b3d9cc1b429ce267c43658ddbdddf44b9
parent 664804 87374b8d2f981b5b715c5367a9782c39fbadb312
child 664806 6878653dbea15bcfd7811c42ca2bc3c041b39d5c
push id79812
push userbmo:mstange@themasta.com
push dateThu, 14 Sep 2017 12:15:40 +0000
reviewersjrmuizel
bugs1387594, 1386643
milestone57.0a1
Bug 1387594 - Respect the font smoothing background color in pushed layers again. This backs out bug 1386643. r?jrmuizel MozReview-Commit-ID: KNsd7tKuRk1
gfx/2d/DrawTargetSkia.cpp
--- 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 {