Move common gradient attribute collection to SVGGradientElement

third_party/WebKit/Source/core/svg/SVGRadialGradientElement.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2008 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Dirk Schulze <krit@webkit.org>
  * Copyright (C) Research In Motion Limited 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
@@ skipping 85 matching lines @@
   }
 
   SVGGradientElement::svgAttributeChanged(attrName);
 }
 
 LayoutObject* SVGRadialGradientElement::createLayoutObject(
     const ComputedStyle&) {
   return new LayoutSVGResourceRadialGradient(this);
 }
 
-static void setGradientAttributes(SVGGradientElement* element,
+static void setGradientAttributes(const SVGGradientElement& element,
                                   RadialGradientAttributes& attributes,
-                                  bool isRadial = true) {
-  if (!attributes.hasSpreadMethod() && element->spreadMethod()->isSpecified())
-    attributes.setSpreadMethod(
-        element->spreadMethod()->currentValue()->enumValue());
+                                  bool isRadial) {
+  element.collectCommonAttributes(attributes);
 
-  if (!attributes.hasGradientUnits() && element->gradientUnits()->isSpecified())
-    attributes.setGradientUnits(
-        element->gradientUnits()->currentValue()->enumValue());
+  if (!isRadial)
+    return;
+  const SVGRadialGradientElement& radial = toSVGRadialGradientElement(element);
 
-  if (!attributes.hasGradientTransform() &&
-      element->hasTransform(SVGElement::ExcludeMotionTransform)) {
-    attributes.setGradientTransform(
-        element->calculateTransform(SVGElement::ExcludeMotionTransform));
-  }
+  if (!attributes.hasCx() && radial.cx()->isSpecified())
+    attributes.setCx(radial.cx()->currentValue());
 
-  if (!attributes.hasStops()) {
-    const Vector<Gradient::ColorStop>& stops(element->buildStops());
-    if (!stops.isEmpty())
-      attributes.setStops(stops);
-  }
+  if (!attributes.hasCy() && radial.cy()->isSpecified())
+    attributes.setCy(radial.cy()->currentValue());
 
-  if (isRadial) {
-    SVGRadialGradientElement* radial = toSVGRadialGradientElement(element);
+  if (!attributes.hasR() && radial.r()->isSpecified())
+    attributes.setR(radial.r()->currentValue());
 
-    if (!attributes.hasCx() && radial->cx()->isSpecified())
-      attributes.setCx(radial->cx()->currentValue());
+  if (!attributes.hasFx() && radial.fx()->isSpecified())
+    attributes.setFx(radial.fx()->currentValue());
 
-    if (!attributes.hasCy() && radial->cy()->isSpecified())
-      attributes.setCy(radial->cy()->currentValue());
+  if (!attributes.hasFy() && radial.fy()->isSpecified())
+    attributes.setFy(radial.fy()->currentValue());
 
-    if (!attributes.hasR() && radial->r()->isSpecified())
-      attributes.setR(radial->r()->currentValue());
-
-    if (!attributes.hasFx() && radial->fx()->isSpecified())
-      attributes.setFx(radial->fx()->currentValue());
-
-    if (!attributes.hasFy() && radial->fy()->isSpecified())
-      attributes.setFy(radial->fy()->currentValue());
-
-    if (!attributes.hasFr() && radial->fr()->isSpecified())
-      attributes.setFr(radial->fr()->currentValue());
-  }
+  if (!attributes.hasFr() && radial.fr()->isSpecified())
+    attributes.setFr(radial.fr()->currentValue());
 }
 
 bool SVGRadialGradientElement::collectGradientAttributes(
     RadialGradientAttributes& attributes) {
-  if (!layoutObject())
-    return false;
+  DCHECK(layoutObject());
 
-  HeapHashSet<Member<SVGGradientElement>> processedGradients;
-  SVGGradientElement* current = this;
-
-  setGradientAttributes(current, attributes);
-  processedGradients.insert(current);
+  VisitedSet visited;
+  const SVGGradientElement* current = this;
 
   while (true) {
-    // Respect xlink:href, take attributes from referenced element
-    Node* refNode = SVGURIReference::targetElementFromIRIString(
-        current->href()->currentValue()->value(), treeScope());
-    if (refNode && isSVGGradientElement(*refNode)) {
-      current = toSVGGradientElement(refNode);
+    setGradientAttributes(*current, attributes,
+                          isSVGRadialGradientElement(*current));
+    visited.insert(current);
 
-      // Cycle detection
-      if (processedGradients.contains(current))
-        break;
-
-      if (!current->layoutObject())
-        return false;
-
-      setGradientAttributes(current, attributes,
-                            isSVGRadialGradientElement(*current));
-      processedGradients.insert(current);
-    } else {
+    current = current->referencedElement();
+    if (!current || visited.contains(current))
       break;
-    }
+    if (!current->layoutObject())
+      return false;
   }
 
   // Handle default values for fx/fy
   if (!attributes.hasFx())
     attributes.setFx(attributes.cx());
 
   if (!attributes.hasFy())
     attributes.setFy(attributes.cy());
 
   return true;
 }
 
 bool SVGRadialGradientElement::selfHasRelativeLengths() const {
   return m_cx->currentValue()->isRelative() ||
          m_cy->currentValue()->isRelative() ||
          m_r->currentValue()->isRelative() ||
          m_fx->currentValue()->isRelative() ||
          m_fy->currentValue()->isRelative() ||
          m_fr->currentValue()->isRelative();
 }
 
 }  // namespace blink