Get rid of background-clip:text and PaintBehaviorForceBlackText.

sky/engine/core/rendering/RenderBoxModelObject.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  *           (C) 2005, 2006 Samuel Weinig (sam.weinig@gmail.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 462 matching lines @@
         bool includePadding = bgLayer.clip() == ContentFillBox;
         LayoutRect clipRect = LayoutRect(scrolledPaintRect.x() + bLeft + (includePadding ? pLeft : LayoutUnit()),
             scrolledPaintRect.y() + borderTop() + (includePadding ? paddingTop() : LayoutUnit()),
             scrolledPaintRect.width() - bLeft - bRight - (includePadding ? pLeft + pRight : LayoutUnit()),
             scrolledPaintRect.height() - borderTop() - borderBottom() - (includePadding ? paddingTop() + paddingBottom() : LayoutUnit()));
         backgroundClipStateSaver.save();
         context->clip(clipRect);
 
         break;
     }
-    case TextFillBox: {
-        // First figure out how big the mask has to be.  It should be no bigger than what we need
-        // to actually render, so we should intersect the dirty rect with the border box of the background.
-        maskRect = pixelSnappedIntRect(rect);
-        maskRect.intersect(paintInfo.rect);
-
-        // We draw the background into a separate layer, to be later masked with yet another layer
-        // holding the text content.
-        backgroundClipStateSaver.save();
-        context->clip(maskRect);
-        context->beginTransparencyLayer(1);
-
-        break;
-    }
     case BorderFillBox:
         break;
     default:
         ASSERT_NOT_REACHED();
         break;
     }
 
     // Paint the color first underneath all images, culled if background image occludes it.
     // FIXME: In the bgLayer->hasFiniteBounds() case, we could improve the culling test
     // by verifying whether the background image covers the entire layout rect.
@@ skipping 30 matching lines @@
             InterpolationQuality interpolationQuality = chooseInterpolationQuality(context, image.get(), &bgLayer, geometry.tileSize());
             if (bgLayer.maskSourceType() == MaskLuminance)
                 context->setColorFilter(ColorFilterLuminanceToAlpha);
             InterpolationQuality previousInterpolationQuality = context->imageInterpolationQuality();
             context->setImageInterpolationQuality(interpolationQuality);
             context->drawTiledImage(image.get(), geometry.destRect(), geometry.relativePhase(), geometry.tileSize(),
                 compositeOp, bgLayer.blendMode(), geometry.spaceSize());
             context->setImageInterpolationQuality(previousInterpolationQuality);
         }
     }
-
-    if (bgLayer.clip() == TextFillBox) {
-        // Create the text mask layer.
-        context->setCompositeOperation(CompositeDestinationIn);
-        context->beginTransparencyLayer(1);
-
-        // FIXME: Workaround for https://code.google.com/p/skia/issues/detail?id=1291.
-        context->clearRect(maskRect);
-
-        // Now draw the text into the mask. We do this by painting using a special paint phase that signals to
-        // InlineTextBoxes that they should just add their contents to the clip.
-        PaintInfo info(context, maskRect, PaintPhaseTextClip, PaintBehaviorForceBlackText, 0);
-        context->setCompositeOperation(CompositeSourceOver);
-        if (box) {
-            RootInlineBox& root = box->root();
-            box->paint(info, LayoutPoint(scrolledPaintRect.x() - box->x(), scrolledPaintRect.y() - box->y()), root.lineTop(), root.lineBottom());
-        } else {
-            LayoutSize localOffset = isBox() ? toRenderBox(this)->locationOffset() : LayoutSize();
-            paint(info, scrolledPaintRect.location() - localOffset);
-        }
-
-        context->endLayer();
-        context->endLayer();
-    }
 }
 
 static inline int resolveWidthForRatio(int height, const FloatSize& intrinsicRatio)
 {
     return ceilf(height * intrinsicRatio.width() / intrinsicRatio.height());
 }
 
 static inline int resolveHeightForRatio(int width, const FloatSize& intrinsicRatio)
 {
     return ceilf(width * intrinsicRatio.height() / intrinsicRatio.width());
@@ skipping 1948 matching lines @@
     ASSERT(!beforeChild || toBoxModelObject == beforeChild->parent());
     for (RenderObject* child = slowFirstChild(); child; ) {
         // Save our next sibling as moveChildTo will clear it.
         RenderObject* nextSibling = child->nextSibling();
         moveChildTo(toBoxModelObject, child, beforeChild, fullRemoveInsert);
         child = nextSibling;
     }
 }
 
 } // namespace blink