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

Source/core/layout/svg/LayoutSVGResourceMasker.cpp

 /*
  * Copyright (C) Research In Motion Limited 2009-2010. 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "core/layout/svg/LayoutSVGResourceMasker.h"
 
 #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"
 #include "third_party/skia/include/core/SkPicture.h"
 
 namespace blink {
 
 LayoutSVGResourceMasker::LayoutSVGResourceMasker(SVGMaskElement* node)
     : LayoutSVGResourceContainer(node)
 {
 }
 
 LayoutSVGResourceMasker::~LayoutSVGResourceMasker()
 {
 }
 
 void LayoutSVGResourceMasker::removeAllClientsFromCache(bool markForInvalidation)
 {
     m_maskContentPicture.clear();
     m_maskContentBoundaries = FloatRect();
     markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
 }
 
 void LayoutSVGResourceMasker::removeClientFromCache(LayoutObject* client, bool markForInvalidation)
 {
     ASSERT(client);
     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
     // with local clips/mask, which may yield incorrect results when mixing objectBoundingBox and
     // userSpaceOnUse units (http://crbug.com/294900).
     FloatRect bounds = strokeBoundingBox();
 
     OwnPtr<DisplayItemList> displayItemList;
     if (RuntimeEnabledFeatures::slimmingPaintEnabled())
         displayItemList = DisplayItemList::create();
@@ skipping 54 matching lines @@
         transform.translate(objectBoundingBox.x(), objectBoundingBox.y());
         transform.scaleNonUniform(objectBoundingBox.width(), objectBoundingBox.height());
         maskRect = transform.mapRect(maskRect);
     }
 
     maskRect.intersect(maskBoundaries);
     return maskRect;
 }
 
 }