Move toClipPath to SVGGeometryElement.

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.
@@ skipping 14 matching lines @@
 
 #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"
 
@@ skipping 34 matching lines @@
 
     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;
         SVGGraphicsElement* styled = toSVGGraphicsElement(childElement);

[fs, 2015/06/22 10:57:44]

Could drop this variable, and just use |childElement| below instead.

         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())
             return false;
 
         // First clip shape.
         if (clipPath.isEmpty()) {
-            styled->toClipPath(clipPath);
+            if (isSVGGeometryElement(styled))
+                toSVGGeometryElement(styled)->toClipPath(clipPath);
+            else if (isSVGUseElement(styled))
+                toSVGUseElement(styled)->toClipPath(clipPath);
 
             continue;
         }
 
         // Multiple shapes require PathOps.
         if (!RuntimeEnabledFeatures::pathOpsSVGClippingEnabled())
             return false;
 
         // Second clip shape => start using the builder.
         if (!usingBuilder) {
             clipPathBuilder.add(clipPath.skPath(), kUnion_SkPathOp);
             usingBuilder = true;
         }
 
         Path subPath;
-        styled->toClipPath(subPath);
+        if (isSVGGeometryElement(styled))
+            toSVGGeometryElement(styled)->toClipPath(subPath);
+        else if (isSVGUseElement(styled))
+            toSVGUseElement(styled)->toClipPath(subPath);
+
         clipPathBuilder.add(subPath.skPath(), kUnion_SkPathOp);
     }
 
     if (usingBuilder) {
         SkPath resolvedPath;
         clipPathBuilder.resolve(&resolvedPath);
         clipPath = resolvedPath;
     }
 
     // We are able to represent the clip as a path. Continue with direct clipping,
@@ skipping 45 matching lines @@
         LayoutObject* layoutObject = childElement->layoutObject();
         if (!layoutObject)
             continue;
 
         const ComputedStyle* style = layoutObject->style();
         if (!style || style->display() == NONE || style->visibility() != VISIBLE)
             continue;
 
         bool isUseElement = isSVGUseElement(*childElement);
         if (isUseElement) {
-            layoutObject = toSVGUseElement(*childElement).layoutObjectClipChild();
+            const SVGGraphicsElement* clippingElement = toSVGUseElement(*childElement).targetGraphicsElementForClipping();
+            if (!clippingElement) {
+                layoutObject = nullptr;

[fs, 2015/06/22 10:57:44]

This is a dead store (layoutObject will go out of scope at the 'continue'
statement.)

+                continue;
+            }
+            layoutObject = clippingElement->layoutObject();
             if (!layoutObject)
                 continue;
         }
 
         // Only shapes, paths and texts are allowed for clipping.
         if (!layoutObject->isSVGShape() && !layoutObject->isSVGText())
             continue;
 
         if (isUseElement)
             layoutObject = childElement->layoutObject();
@@ skipping 76 matching lines @@
         AffineTransform transform;
         transform.translate(objectBoundingBox.x(), objectBoundingBox.y());
         transform.scaleNonUniform(objectBoundingBox.width(), objectBoundingBox.height());
         return transform.mapRect(m_clipBoundaries);
     }
 
     return m_clipBoundaries;
 }
 
 }