Move toClipPath to SVGGeometryElement.

Source/core/svg/SVGUseElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) Research In Motion Limited 2009-2010. All rights reserved.
  * Copyright (C) 2011 Torch Mobile (Beijing) Co. Ltd. All rights reserved.
  * Copyright (C) 2012 University of Szeged
  * Copyright (C) 2012 Renata Hodovan <reni@webkit.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 422 matching lines @@
 {
     return isSVGPathElement(element)
         || isSVGRectElement(element)
         || isSVGCircleElement(element)
         || isSVGEllipseElement(element)
         || isSVGPolygonElement(element)
         || isSVGPolylineElement(element)
         || isSVGTextElement(element);
 }
 
-void SVGUseElement::toClipPath(Path& path)
+
+
+SVGGeometryElement* SVGUseElement::layoutObjectClipChild(Path& path) const
 {
     ASSERT(path.isEmpty());
 
-    Node* n = userAgentShadowRoot()->firstChild();
-    if (!n || !n->isSVGElement())
-        return;
-    SVGElement& element = toSVGElement(*n);
-
-    if (element.isSVGGraphicsElement()) {
-        if (!isDirectReference(element)) {
+    if (Node* n = userAgentShadowRoot()->firstChild()) {
+        if (n->isSVGElement() && isDirectReference(toSVGElement(*n))) {
+            SVGElement* element = toSVGElement(n);
+            if (element->isSVGGeometryElement()) {
+                toSVGGeometryElement(element)->toClipPath(path);
+                // FIXME: Avoid manual resolution of x/y here. Its potentially harmful.
+                SVGLengthContext lengthContext(this);
+                path.translate(FloatSize(m_x->currentValue()->value(lengthContext), m_y->currentValue()->value(lengthContext)));
+                path.transform(calculateAnimatedLocalTransform());
+                return toSVGGeometryElement(element);
+            }
+        } else {
             // Spec: Indirect references are an error (14.3.5)
             document().accessSVGExtensions().reportError("Not allowed to use indirect reference in <clip-path>");
-        } else {
-            toSVGGraphicsElement(element).toClipPath(path);
-            // FIXME: Avoid manual resolution of x/y here. Its potentially harmful.
-            SVGLengthContext lengthContext(this);
-            path.translate(FloatSize(m_x->currentValue()->value(lengthContext), m_y->currentValue()->value(lengthContext)));
-            path.transform(calculateAnimatedLocalTransform());
         }
     }
-}
-
-LayoutObject* SVGUseElement::layoutObjectClipChild() const
-{
-    if (Node* n = userAgentShadowRoot()->firstChild()) {
-        if (n->isSVGElement() && isDirectReference(toSVGElement(*n)))
-            return n->layoutObject();
-    }
 
     return nullptr;
 }
 
 bool SVGUseElement::buildShadowTree(SVGElement* target, SVGElement* targetInstance, bool foundUse)
 {
     ASSERT(target);
     ASSERT(targetInstance);
 
     // Spec: If the referenced object is itself a 'use', or if there are 'use' subelements within the referenced
@@ skipping 292 matching lines @@
 
     if (m_resource)
         m_resource->removeClient(this);
 
     m_resource = resource;
     if (m_resource)
         m_resource->addClient(this);
 }
 
 }