Move painting code out of LayoutSVGResourceClipper

Source/core/layout/svg/LayoutSVGResourceClipper.cpp

 /*
  * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  * Copyright (C) 2011 Dirk Schulze <krit@webkit.org>
  *
  * 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/LayoutSVGResourceClipper.h"
 
 #include "core/SVGNames.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/layout/HitTestResult.h"
 #include "core/layout/svg/SVGLayoutSupport.h"
-#include "core/layout/svg/SVGResources.h"
-#include "core/layout/svg/SVGResourcesCache.h"
-#include "core/paint/CompositingRecorder.h"
 #include "core/paint/PaintInfo.h"
-#include "core/paint/TransformRecorder.h"
 #include "core/svg/SVGGeometryElement.h"
 #include "core/svg/SVGUseElement.h"
 #include "platform/RuntimeEnabledFeatures.h"
-#include "platform/graphics/paint/ClipPathDisplayItem.h"
-#include "platform/graphics/paint/CompositingDisplayItem.h"
-#include "platform/graphics/paint/DisplayItemList.h"
-#include "platform/graphics/paint/DrawingDisplayItem.h"
 #include "platform/graphics/paint/SkPictureBuilder.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/pathops/SkPathOps.h"
 
 namespace blink {
 
 LayoutSVGResourceClipper::LayoutSVGResourceClipper(SVGClipPathElement* node)
     : LayoutSVGResourceContainer(node)
     , m_inClipExpansion(false)
 {
 }
 
 LayoutSVGResourceClipper::~LayoutSVGResourceClipper()
 {
 }
 
 void LayoutSVGResourceClipper::removeAllClientsFromCache(bool markForInvalidation)
 {
     m_clipContentPicture.clear();
     m_clipBoundaries = FloatRect();
     markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
 }
 
 void LayoutSVGResourceClipper::removeClientFromCache(LayoutObject* client, bool markForInvalidation)
 {
     ASSERT(client);
     markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation);
 }
 
-bool LayoutSVGResourceClipper::tryPathOnlyClipping(const LayoutObject& layoutObject, GraphicsContext* context,
-    const AffineTransform& animatedLocalTransform, const FloatRect& objectBoundingBox) {
+bool LayoutSVGResourceClipper::asPath(const AffineTransform& animatedLocalTransform,
+    const FloatRect& referenceBox, Path& clipPath) {
     // If the current clip-path gets clipped itself, we have to fallback to masking.
-    if (!style()->svgStyle().clipperResource().isEmpty())
+    if (style()->svgStyle().hasClipper())
         return false;
 
-    Path clipPath;
     bool usingBuilder = false;
     SkOpBuilder clipPathBuilder;
 
     for (SVGElement* childElement = Traversal<SVGElement>::firstChild(*element()); childElement; childElement = Traversal<SVGElement>::nextSibling(*childElement)) {
         LayoutObject* childLayoutObject = childElement->layoutObject();
         if (!childLayoutObject)
             continue;
         // Only shapes or paths are supported for direct clipping. We need to fallback to masking for texts.
         if (childLayoutObject->isSVGText())
             return false;
         if (!childElement->isSVGGraphicsElement())
             continue;
 
         const ComputedStyle* style = childLayoutObject->style();
         if (!style || style->display() == NONE || style->visibility() != VISIBLE)
             continue;
         const SVGComputedStyle& svgStyle = style->svgStyle();
         // Current shape in clip-path gets clipped too. Fallback to masking.
-        if (!svgStyle.clipperResource().isEmpty())
+        if (svgStyle.hasClipper())
             return false;
 
         // First clip shape.
         if (clipPath.isEmpty()) {
             if (isSVGGeometryElement(childElement))
                 toSVGGeometryElement(childElement)->toClipPath(clipPath);
             else if (isSVGUseElement(childElement))
                 toSVGUseElement(childElement)->toClipPath(clipPath);
 
             continue;
@@ skipping 21 matching lines @@
     if (usingBuilder) {
         SkPath resolvedPath;
         clipPathBuilder.resolve(&resolvedPath);
         clipPath = resolvedPath;
     }
 
     // We are able to represent the clip as a path. Continue with direct clipping,
     // and transform the content to userspace if necessary.
     if (clipPathUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) {
         AffineTransform transform;
-        transform.translate(objectBoundingBox.x(), objectBoundingBox.y());
-        transform.scaleNonUniform(objectBoundingBox.width(), objectBoundingBox.height());
+        transform.translate(referenceBox.x(), referenceBox.y());
+        transform.scaleNonUniform(referenceBox.width(), referenceBox.height());
         clipPath.transform(transform);
     }
 
     // Transform path by animatedLocalTransform.
     clipPath.transform(animatedLocalTransform);
-
-    if (RuntimeEnabledFeatures::slimmingPaintEnabled()) {
-        if (!context->displayItemList()->displayItemConstructionIsDisabled())
-            context->displayItemList()->createAndAppend<BeginClipPathDisplayItem>(layoutObject, clipPath);
-    } else {
-        BeginClipPathDisplayItem clipPathDisplayItem(layoutObject, clipPath);
-        clipPathDisplayItem.replay(*context);
-    }
-
     return true;
 }
 
 PassRefPtr<const SkPicture> LayoutSVGResourceClipper::createContentPicture(AffineTransform& contentTransformation, const FloatRect& targetBoundingBox,
     GraphicsContext* context)
 {
     ASSERT(frame());
 
     if (clipPathUnits() == SVGUnitTypes::SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) {
         contentTransformation.translate(targetBoundingBox.x(), targetBoundingBox.y());
@@ skipping 117 matching lines @@
         AffineTransform transform;
         transform.translate(objectBoundingBox.x(), objectBoundingBox.y());
         transform.scaleNonUniform(objectBoundingBox.width(), objectBoundingBox.height());
         return transform.mapRect(m_clipBoundaries);
     }
 
     return m_clipBoundaries;
 }
 
 }