Title: [163295] trunk/Source/WebCore
Revision
163295
Author
akl...@apple.com
Date
2014-02-03 01:02:55 -0800 (Mon, 03 Feb 2014)

Log Message

RenderSVGResource::removeClientFromCache() should take RenderElement&.
<https://webkit.org/b/128097>

Text renderers never have resources associated with them.
This is yet another step towards enforcing that at compile-time
by making all the resource cache interfaces deal in RenderElement.

Also marked the RenderSVGResourceSolidColor class final.

Reviewed by Darin Adler.

* rendering/svg/RenderSVGResource.cpp:
(WebCore::removeFromCacheAndInvalidateDependencies):
(WebCore::RenderSVGResource::markForLayoutAndParentResourceInvalidation):
* rendering/svg/RenderSVGResource.h:
* rendering/svg/RenderSVGResourceClipper.cpp:
(WebCore::RenderSVGResourceClipper::removeClientFromCache):
* rendering/svg/RenderSVGResourceClipper.h:
* rendering/svg/RenderSVGResourceFilter.cpp:
(WebCore::RenderSVGResourceFilter::removeClientFromCache):
* rendering/svg/RenderSVGResourceFilter.h:
* rendering/svg/RenderSVGResourceGradient.cpp:
(WebCore::RenderSVGResourceGradient::removeClientFromCache):
* rendering/svg/RenderSVGResourceGradient.h:
* rendering/svg/RenderSVGResourceMarker.cpp:
(WebCore::RenderSVGResourceMarker::removeClientFromCache):
* rendering/svg/RenderSVGResourceMarker.h:
* rendering/svg/RenderSVGResourceMasker.cpp:
(WebCore::RenderSVGResourceMasker::removeClientFromCache):
* rendering/svg/RenderSVGResourceMasker.h:
* rendering/svg/RenderSVGResourcePattern.cpp:
(WebCore::RenderSVGResourcePattern::removeClientFromCache):
* rendering/svg/RenderSVGResourcePattern.h:
* rendering/svg/RenderSVGResourceSolidColor.h:
* rendering/svg/SVGRenderSupport.cpp:
(WebCore::invalidateResourcesOfChildren):
(WebCore::SVGRenderSupport::layoutChildren):
* rendering/svg/SVGResources.cpp:
(WebCore::SVGResources::removeClientFromCache):
* rendering/svg/SVGResources.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (163294 => 163295)


--- trunk/Source/WebCore/ChangeLog	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/ChangeLog	2014-02-03 09:02:55 UTC (rev 163295)
@@ -1,3 +1,46 @@
+2014-02-03  Andreas Kling  <akl...@apple.com>
+
+        RenderSVGResource::removeClientFromCache() should take RenderElement&.
+        <https://webkit.org/b/128097>
+
+        Text renderers never have resources associated with them.
+        This is yet another step towards enforcing that at compile-time
+        by making all the resource cache interfaces deal in RenderElement.
+
+        Also marked the RenderSVGResourceSolidColor class final.
+
+        Reviewed by Darin Adler.
+
+        * rendering/svg/RenderSVGResource.cpp:
+        (WebCore::removeFromCacheAndInvalidateDependencies):
+        (WebCore::RenderSVGResource::markForLayoutAndParentResourceInvalidation):
+        * rendering/svg/RenderSVGResource.h:
+        * rendering/svg/RenderSVGResourceClipper.cpp:
+        (WebCore::RenderSVGResourceClipper::removeClientFromCache):
+        * rendering/svg/RenderSVGResourceClipper.h:
+        * rendering/svg/RenderSVGResourceFilter.cpp:
+        (WebCore::RenderSVGResourceFilter::removeClientFromCache):
+        * rendering/svg/RenderSVGResourceFilter.h:
+        * rendering/svg/RenderSVGResourceGradient.cpp:
+        (WebCore::RenderSVGResourceGradient::removeClientFromCache):
+        * rendering/svg/RenderSVGResourceGradient.h:
+        * rendering/svg/RenderSVGResourceMarker.cpp:
+        (WebCore::RenderSVGResourceMarker::removeClientFromCache):
+        * rendering/svg/RenderSVGResourceMarker.h:
+        * rendering/svg/RenderSVGResourceMasker.cpp:
+        (WebCore::RenderSVGResourceMasker::removeClientFromCache):
+        * rendering/svg/RenderSVGResourceMasker.h:
+        * rendering/svg/RenderSVGResourcePattern.cpp:
+        (WebCore::RenderSVGResourcePattern::removeClientFromCache):
+        * rendering/svg/RenderSVGResourcePattern.h:
+        * rendering/svg/RenderSVGResourceSolidColor.h:
+        * rendering/svg/SVGRenderSupport.cpp:
+        (WebCore::invalidateResourcesOfChildren):
+        (WebCore::SVGRenderSupport::layoutChildren):
+        * rendering/svg/SVGResources.cpp:
+        (WebCore::SVGResources::removeClientFromCache):
+        * rendering/svg/SVGResources.h:
+
 2014-02-03  Dan Bernstein  <m...@apple.com>
 
         More iOS build fixing.

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp	2014-02-03 09:02:55 UTC (rev 163295)
@@ -156,23 +156,23 @@
     return s_sharedSolidPaintingResource;
 }
 
-static inline void removeFromCacheAndInvalidateDependencies(RenderObject& object, bool needsLayout)
+static inline void removeFromCacheAndInvalidateDependencies(RenderElement& renderer, bool needsLayout)
 {
-    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(object)) {
+    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer)) {
 #if ENABLE(FILTERS)
         if (RenderSVGResourceFilter* filter = resources->filter())
-            filter->removeClientFromCache(object);
+            filter->removeClientFromCache(renderer);
 #endif
         if (RenderSVGResourceMasker* masker = resources->masker())
-            masker->removeClientFromCache(object);
+            masker->removeClientFromCache(renderer);
 
         if (RenderSVGResourceClipper* clipper = resources->clipper())
-            clipper->removeClientFromCache(object);
+            clipper->removeClientFromCache(renderer);
     }
 
-    if (!object.node() || !object.node()->isSVGElement())
+    if (!renderer.element() || !renderer.element()->isSVGElement())
         return;
-    HashSet<SVGElement*>* dependencies = object.document().accessSVGExtensions()->setOfElementsReferencingTarget(toSVGElement(object.node()));
+    HashSet<SVGElement*>* dependencies = renderer.document().accessSVGExtensions()->setOfElementsReferencingTarget(toSVGElement(renderer.element()));
     if (!dependencies)
         return;
     for (auto element : *dependencies) {
@@ -188,10 +188,11 @@
     if (needsLayout && !object.documentBeingDestroyed())
         object.setNeedsLayout();
 
-    removeFromCacheAndInvalidateDependencies(object, needsLayout);
+    if (object.isRenderElement())
+        removeFromCacheAndInvalidateDependencies(toRenderElement(object), needsLayout);
 
     // Invalidate resources in ancestor chain, if needed.
-    RenderObject* current = object.parent();
+    auto current = object.parent();
     while (current) {
         removeFromCacheAndInvalidateDependencies(*current, needsLayout);
 

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.h (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.h	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.h	2014-02-03 09:02:55 UTC (rev 163295)
@@ -60,7 +60,7 @@
     virtual ~RenderSVGResource() { }
 
     virtual void removeAllClientsFromCache(bool markForInvalidation = true) = 0;
-    virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true) = 0;
+    virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) = 0;
 
     virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) = 0;
     virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short, const Path*, const RenderSVGShape*) { }

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp	2014-02-03 09:02:55 UTC (rev 163295)
@@ -61,7 +61,7 @@
     markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
 }
 
-void RenderSVGResourceClipper::removeClientFromCache(RenderObject& client, bool markForInvalidation)
+void RenderSVGResourceClipper::removeClientFromCache(RenderElement& client, bool markForInvalidation)
 {
     m_clipper.remove(&client);
 

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h	2014-02-03 09:02:55 UTC (rev 163295)
@@ -45,8 +45,8 @@
 
     SVGClipPathElement& clipPathElement() const { return toSVGClipPathElement(nodeForNonAnonymous()); }
 
-    virtual void removeAllClientsFromCache(bool markForInvalidation = true);
-    virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true);
+    virtual void removeAllClientsFromCache(bool markForInvalidation = true) override;
+    virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) override;
 
     virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) override;
     // clipPath can be clipped too, but don't have a boundingBox or repaintRect. So we can't call

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp	2014-02-03 09:02:55 UTC (rev 163295)
@@ -64,7 +64,7 @@
     markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
 }
 
-void RenderSVGResourceFilter::removeClientFromCache(RenderObject& client, bool markForInvalidation)
+void RenderSVGResourceFilter::removeClientFromCache(RenderElement& client, bool markForInvalidation)
 {
     if (FilterData* filterData = m_filter.get(&client)) {
         if (filterData->savedContext)

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h	2014-02-03 09:02:55 UTC (rev 163295)
@@ -68,8 +68,8 @@
 
     SVGFilterElement& filterElement() const { return toSVGFilterElement(RenderSVGResourceContainer::element()); }
 
-    virtual void removeAllClientsFromCache(bool markForInvalidation = true);
-    virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true);
+    virtual void removeAllClientsFromCache(bool markForInvalidation = true) override;
+    virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) override;
 
     virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) override;
     virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) override;

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp	2014-02-03 09:02:55 UTC (rev 163295)
@@ -48,7 +48,7 @@
     markAllClientsForInvalidation(markForInvalidation ? RepaintInvalidation : ParentOnlyInvalidation);
 }
 
-void RenderSVGResourceGradient::removeClientFromCache(RenderObject& client, bool markForInvalidation)
+void RenderSVGResourceGradient::removeClientFromCache(RenderElement& client, bool markForInvalidation)
 {
     m_gradientMap.remove(&client);
     markClientForInvalidation(client, markForInvalidation ? RepaintInvalidation : ParentOnlyInvalidation);

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h	2014-02-03 09:02:55 UTC (rev 163295)
@@ -46,7 +46,7 @@
     SVGGradientElement& gradientElement() const { return static_cast<SVGGradientElement&>(RenderSVGResourceContainer::element()); }
 
     virtual void removeAllClientsFromCache(bool markForInvalidation = true) override final;
-    virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true) override final;
+    virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) override final;
 
     virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) override final;
     virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) override final;

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp	2014-02-03 09:02:55 UTC (rev 163295)
@@ -59,7 +59,7 @@
     markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
 }
 
-void RenderSVGResourceMarker::removeClientFromCache(RenderObject& client, bool markForInvalidation)
+void RenderSVGResourceMarker::removeClientFromCache(RenderElement& client, bool markForInvalidation)
 {
     markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation);
 }

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.h (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.h	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.h	2014-02-03 09:02:55 UTC (rev 163295)
@@ -38,8 +38,8 @@
 
     SVGMarkerElement& markerElement() const { return toSVGMarkerElement(RenderSVGResourceContainer::element()); }
 
-    virtual void removeAllClientsFromCache(bool markForInvalidation = true);
-    virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true);
+    virtual void removeAllClientsFromCache(bool markForInvalidation = true) override;
+    virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) override;
 
     void draw(PaintInfo&, const AffineTransform&);
 

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp	2014-02-03 09:02:55 UTC (rev 163295)
@@ -50,7 +50,7 @@
     markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
 }
 
-void RenderSVGResourceMasker::removeClientFromCache(RenderObject& client, bool markForInvalidation)
+void RenderSVGResourceMasker::removeClientFromCache(RenderElement& client, bool markForInvalidation)
 {
     m_masker.remove(&client);
 

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h	2014-02-03 09:02:55 UTC (rev 163295)
@@ -43,8 +43,8 @@
 
     SVGMaskElement& maskElement() const { return toSVGMaskElement(RenderSVGResourceContainer::element()); }
 
-    virtual void removeAllClientsFromCache(bool markForInvalidation = true);
-    virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true);
+    virtual void removeAllClientsFromCache(bool markForInvalidation = true) override;
+    virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) override;
     virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) override;
     virtual FloatRect resourceBoundingBox(const RenderObject&) override;
 

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp	2014-02-03 09:02:55 UTC (rev 163295)
@@ -52,7 +52,7 @@
     markAllClientsForInvalidation(markForInvalidation ? RepaintInvalidation : ParentOnlyInvalidation);
 }
 
-void RenderSVGResourcePattern::removeClientFromCache(RenderObject& client, bool markForInvalidation)
+void RenderSVGResourcePattern::removeClientFromCache(RenderElement& client, bool markForInvalidation)
 {
     m_patternMap.remove(&client);
     markClientForInvalidation(client, markForInvalidation ? RepaintInvalidation : ParentOnlyInvalidation);

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h	2014-02-03 09:02:55 UTC (rev 163295)
@@ -45,8 +45,8 @@
     RenderSVGResourcePattern(SVGPatternElement&, PassRef<RenderStyle>);
     SVGPatternElement& patternElement() const;
 
-    virtual void removeAllClientsFromCache(bool markForInvalidation = true);
-    virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true);
+    virtual void removeAllClientsFromCache(bool markForInvalidation = true) override;
+    virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) override;
 
     virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) override;
     virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) override;

Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.h (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.h	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.h	2014-02-03 09:02:55 UTC (rev 163295)
@@ -26,19 +26,19 @@
 
 namespace WebCore {
 
-class RenderSVGResourceSolidColor : public RenderSVGResource {
+class RenderSVGResourceSolidColor final : public RenderSVGResource {
 public:
     RenderSVGResourceSolidColor();
     virtual ~RenderSVGResourceSolidColor();
 
-    virtual void removeAllClientsFromCache(bool = true) { }
-    virtual void removeClientFromCache(RenderObject&, bool = true) { }
+    virtual void removeAllClientsFromCache(bool = true) override { }
+    virtual void removeClientFromCache(RenderElement&, bool = true) override { }
 
     virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) override;
     virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) override;
     virtual FloatRect resourceBoundingBox(const RenderObject&) override { return FloatRect(); }
 
-    virtual RenderSVGResourceType resourceType() const { return s_resourceType; }
+    virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
     static RenderSVGResourceType s_resourceType;
 
     const Color& color() const { return m_color; }

Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp	2014-02-03 09:02:55 UTC (rev 163295)
@@ -185,14 +185,14 @@
     return *lineageOfType<RenderSVGRoot>(start).first();
 }
 
-static inline void invalidateResourcesOfChildren(RenderObject& start)
+static inline void invalidateResourcesOfChildren(RenderElement& renderer)
 {
-    ASSERT(!start.needsLayout());
-    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(start))
-        resources->removeClientFromCache(start, false);
+    ASSERT(!renderer.needsLayout());
+    if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer))
+        resources->removeClientFromCache(renderer, false);
 
-    for (RenderObject* child = start.firstChildSlow(); child; child = child->nextSibling())
-        invalidateResourcesOfChildren(*child);
+    for (auto& child : childrenOfType<RenderElement>(renderer))
+        invalidateResourcesOfChildren(child);
 }
 
 static inline bool layoutSizeOfNearestViewportChanged(const RenderElement& renderer)
@@ -288,8 +288,10 @@
     }
 
     // If the layout size changed, invalidate all resources of all children that didn't go through the layout() code path.
-    for (auto child : notlayoutedObjects)
-        invalidateResourcesOfChildren(*child);
+    for (auto child : notlayoutedObjects) {
+        if (child->isRenderElement())
+            invalidateResourcesOfChildren(toRenderElement(*child));
+    }
 }
 
 bool SVGRenderSupport::isOverflowHidden(const RenderElement& renderer)

Modified: trunk/Source/WebCore/rendering/svg/SVGResources.cpp (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/SVGResources.cpp	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/SVGResources.cpp	2014-02-03 09:02:55 UTC (rev 163295)
@@ -279,7 +279,7 @@
     return foundResources;
 }
 
-void SVGResources::removeClientFromCache(RenderObject& object, bool markForInvalidation) const
+void SVGResources::removeClientFromCache(RenderElement& renderer, bool markForInvalidation) const
 {
     if (!m_clipperFilterMaskerData && !m_markerData && !m_fillStrokeData && !m_linkedResource)
         return;
@@ -288,35 +288,35 @@
         ASSERT(!m_clipperFilterMaskerData);
         ASSERT(!m_markerData);
         ASSERT(!m_fillStrokeData);
-        m_linkedResource->removeClientFromCache(object, markForInvalidation);
+        m_linkedResource->removeClientFromCache(renderer, markForInvalidation);
         return;
     }
 
     if (m_clipperFilterMaskerData) {
         if (m_clipperFilterMaskerData->clipper)
-            m_clipperFilterMaskerData->clipper->removeClientFromCache(object, markForInvalidation);
+            m_clipperFilterMaskerData->clipper->removeClientFromCache(renderer, markForInvalidation);
 #if ENABLE(FILTERS)
         if (m_clipperFilterMaskerData->filter)
-            m_clipperFilterMaskerData->filter->removeClientFromCache(object, markForInvalidation);
+            m_clipperFilterMaskerData->filter->removeClientFromCache(renderer, markForInvalidation);
 #endif
         if (m_clipperFilterMaskerData->masker)
-            m_clipperFilterMaskerData->masker->removeClientFromCache(object, markForInvalidation);
+            m_clipperFilterMaskerData->masker->removeClientFromCache(renderer, markForInvalidation);
     }
 
     if (m_markerData) {
         if (m_markerData->markerStart)
-            m_markerData->markerStart->removeClientFromCache(object, markForInvalidation);
+            m_markerData->markerStart->removeClientFromCache(renderer, markForInvalidation);
         if (m_markerData->markerMid)
-            m_markerData->markerMid->removeClientFromCache(object, markForInvalidation);
+            m_markerData->markerMid->removeClientFromCache(renderer, markForInvalidation);
         if (m_markerData->markerEnd)
-            m_markerData->markerEnd->removeClientFromCache(object, markForInvalidation);
+            m_markerData->markerEnd->removeClientFromCache(renderer, markForInvalidation);
     }
 
     if (m_fillStrokeData) {
         if (m_fillStrokeData->fill)
-            m_fillStrokeData->fill->removeClientFromCache(object, markForInvalidation);
+            m_fillStrokeData->fill->removeClientFromCache(renderer, markForInvalidation);
         if (m_fillStrokeData->stroke)
-            m_fillStrokeData->stroke->removeClientFromCache(object, markForInvalidation);
+            m_fillStrokeData->stroke->removeClientFromCache(renderer, markForInvalidation);
     }
 }
 

Modified: trunk/Source/WebCore/rendering/svg/SVGResources.h (163294 => 163295)


--- trunk/Source/WebCore/rendering/svg/SVGResources.h	2014-02-03 08:41:24 UTC (rev 163294)
+++ trunk/Source/WebCore/rendering/svg/SVGResources.h	2014-02-03 09:02:55 UTC (rev 163295)
@@ -72,7 +72,7 @@
     void buildSetOfResources(HashSet<RenderSVGResourceContainer*>&);
 
     // Methods operating on all cached resources
-    void removeClientFromCache(RenderObject&, bool markForInvalidation = true) const;
+    void removeClientFromCache(RenderElement&, bool markForInvalidation = true) const;
     void resourceDestroyed(RenderSVGResourceContainer&);
 
 #ifndef NDEBUG
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to