Remove argument to LayoutSVGResourceGradient::collectGradientAttributes

third_party/WebKit/Source/core/layout/svg/LayoutSVGResourceGradient.cpp

 /*
  * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@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
  * version 2 of the License, or (at your option) any later version.
@@ skipping 34 matching lines @@
   ASSERT(client);
   m_gradientMap.erase(client);
   markClientForInvalidation(
       client, markForInvalidation ? PaintInvalidation : ParentOnlyInvalidation);
 }
 
 SVGPaintServer LayoutSVGResourceGradient::preparePaintServer(
     const LayoutObject& object) {
   clearInvalidationMask();
 
-  // Be sure to synchronize all SVG properties on the gradientElement _before_
-  // processing any further. Otherwhise the call to collectGradientAttributes()
-  // in createTileImage(), may cause the SVG DOM property synchronization to
-  // kick in, which causes removeAllClientsFromCache() to be called, which in
-  // turn deletes our GradientData object! Leaving out the line below will cause
-  // svg/dynamic-updates/SVG*GradientElement-svgdom* to crash.
-  SVGGradientElement* gradientElement = toSVGGradientElement(element());
-  if (!gradientElement)
-    return SVGPaintServer::invalid();
-
+  // Validate gradient DOM state before building the actual
+  // gradient. This should avoid tearing down the gradient we're
+  // currently working on. Preferably the state validation should have
+  // no side-effects though.
   if (m_shouldCollectGradientAttributes) {
-    gradientElement->synchronizeAnimatedSVGAttribute(anyQName());
-    if (!collectGradientAttributes(gradientElement))
+    if (!collectGradientAttributes())
       return SVGPaintServer::invalid();
-
     m_shouldCollectGradientAttributes = false;
   }
 
   // Spec: When the geometry of the applicable element has no width or height
   // and objectBoundingBox is specified, then the given effect (e.g. a gradient
   // or a filter) will be ignored.
   FloatRect objectBoundingBox = object.objectBoundingBox();
   if (gradientUnits() == SVGUnitTypes::kSvgUnitTypeObjectboundingbox &&
       objectBoundingBox.isEmpty())
     return SVGPaintServer::invalid();
@@ skipping 49 matching lines @@
       return SpreadMethodReflect;
     case SVGSpreadMethodRepeat:
       return SpreadMethodRepeat;
   }
 
   ASSERT_NOT_REACHED();
   return SpreadMethodPad;
 }
 
 }  // namespace blink