[S.P.] Move svg mask painting to SVGMaskPainter

Source/core/layout/svg/LayoutSVGResourceMasker.cpp

Index: Source/core/layout/svg/LayoutSVGResourceMasker.cpp
diff --git a/Source/core/layout/svg/LayoutSVGResourceMasker.cpp b/Source/core/layout/svg/LayoutSVGResourceMasker.cpp
index 27a5d949e9cde219f67ad6459029ed32c4060c3e..3bc4d449357f1aeff27b9274088c887ab7e1c44a 100644
--- a/Source/core/layout/svg/LayoutSVGResourceMasker.cpp
+++ b/Source/core/layout/svg/LayoutSVGResourceMasker.cpp
@@ -22,11 +22,9 @@
 
 #include "core/dom/ElementTraversal.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
-#include "core/paint/CompositingRecorder.h"
 #include "core/paint/SVGPaintContext.h"
 #include "core/paint/TransformRecorder.h"

[fs, 2015/03/02 13:24:51]

Still needed? Same for DrawingDisplayItem.h.

[Erik Dahlström (inactive), 2015/03/03 08:42:58]

Done.

 #include "core/svg/SVGElement.h"
-#include "platform/graphics/paint/CompositingDisplayItem.h"
 #include "platform/graphics/paint/DisplayItemList.h"
 #include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/transforms/AffineTransform.h"
@@ -56,81 +54,6 @@ void LayoutSVGResourceMasker::removeClientFromCache(LayoutObject* client, bool m
     markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation);
 }
 
-bool LayoutSVGResourceMasker::prepareEffect(LayoutObject* object, GraphicsContext* context)
-{
-    ASSERT(object);
-    ASSERT(context);
-    ASSERT(style());
-    ASSERT_WITH_SECURITY_IMPLICATION(!needsLayout());
-
-    clearInvalidationMask();
-
-    FloatRect paintInvalidationRect = object->paintInvalidationRectInLocalCoordinates();
-    if (paintInvalidationRect.isEmpty() || !element()->hasChildren())
-        return false;
-
-    if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
-        ASSERT(context->displayItemList());
-        context->displayItemList()->add(BeginCompositingDisplayItem::create(object->displayItemClient(), WebCoreCompositeToSkiaComposite(context->compositeOperationDeprecated(), WebBlendModeNormal), 1, &paintInvalidationRect));
-    } else {
-        BeginCompositingDisplayItem beginCompositingContent(object->displayItemClient(), WebCoreCompositeToSkiaComposite(context->compositeOperationDeprecated(), WebBlendModeNormal), 1, &paintInvalidationRect);
-        beginCompositingContent.replay(context);
-    }
-
-    return true;
-}
-
-void LayoutSVGResourceMasker::finishEffect(LayoutObject* object, GraphicsContext* context)
-{
-    ASSERT(object);
-    ASSERT(context);
-    ASSERT(style());
-    ASSERT_WITH_SECURITY_IMPLICATION(!needsLayout());
-
-    FloatRect paintInvalidationRect = object->paintInvalidationRectInLocalCoordinates();
-    {
-        ColorFilter maskLayerFilter = style()->svgStyle().maskType() == MT_LUMINANCE
-            ? ColorFilterLuminanceToAlpha : ColorFilterNone;
-        CompositingRecorder maskCompositing(context, object->displayItemClient(), SkXfermode::kDstIn_Mode, 1, &paintInvalidationRect, maskLayerFilter);
-        drawMaskForRenderer(context, object->displayItemClient(), object->objectBoundingBox());
-    }
-
-    if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
-        ASSERT(context->displayItemList());
-        context->displayItemList()->add(EndCompositingDisplayItem::create(object->displayItemClient()));
-    } else {
-        EndCompositingDisplayItem endCompositingContent(object->displayItemClient());
-        endCompositingContent.replay(context);
-    }
-}
-
-void LayoutSVGResourceMasker::drawMaskForRenderer(GraphicsContext* context, DisplayItemClient client, const FloatRect& targetBoundingBox)
-{
-    ASSERT(context);
-
-    AffineTransform contentTransformation;
-    SVGUnitTypes::SVGUnitType contentUnits = toSVGMaskElement(element())->maskContentUnits()->currentValue()->enumValue();
-    if (contentUnits == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) {
-        contentTransformation.translate(targetBoundingBox.x(), targetBoundingBox.y());
-        contentTransformation.scaleNonUniform(targetBoundingBox.width(), targetBoundingBox.height());
-    }
-
-    if (!m_maskContentPicture) {
-        SubtreeContentTransformScope contentTransformScope(contentTransformation);
-        m_maskContentPicture = createContentPicture();
-    }
-
-    TransformRecorder recorder(*context, client, contentTransformation);
-
-    if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
-        ASSERT(context->displayItemList());
-        context->displayItemList()->add(DrawingDisplayItem::create(client, DisplayItem::SVGMask, m_maskContentPicture));
-    } else {
-        DrawingDisplayItem maskPicture(client, DisplayItem::SVGMask, m_maskContentPicture);
-        maskPicture.replay(context);
-    }
-}
-
 PassRefPtr<const SkPicture> LayoutSVGResourceMasker::createContentPicture()
 {
     // Using strokeBoundingBox (instead of paintInvalidationRectInLocalCoordinates) to avoid the intersection