Title: [158011] trunk/Source/WebCore
- Revision
- 158011
- Author
- [email protected]
- Date
- 2013-10-25 07:42:22 -0700 (Fri, 25 Oct 2013)
Log Message
SVGResourcesCache::clientDestroyed() should take a RenderElement&.
<https://webkit.org/b/123339>
This function is always called with an object, and that object
is guaranteed to never be a text renderer.
Reviewed by Antti Koivisto.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (158010 => 158011)
--- trunk/Source/WebCore/ChangeLog 2013-10-25 13:52:57 UTC (rev 158010)
+++ trunk/Source/WebCore/ChangeLog 2013-10-25 14:42:22 UTC (rev 158011)
@@ -1,5 +1,15 @@
2013-10-25 Andreas Kling <[email protected]>
+ SVGResourcesCache::clientDestroyed() should take a RenderElement&.
+ <https://webkit.org/b/123339>
+
+ This function is always called with an object, and that object
+ is guaranteed to never be a text renderer.
+
+ Reviewed by Antti Koivisto.
+
+2013-10-25 Andreas Kling <[email protected]>
+
SVGResourcesCache::clientLayoutChanged() should take a RenderElement&.
<https://webkit.org/b/123336>
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGBlock.cpp (158010 => 158011)
--- trunk/Source/WebCore/rendering/svg/RenderSVGBlock.cpp 2013-10-25 13:52:57 UTC (rev 158010)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGBlock.cpp 2013-10-25 14:42:22 UTC (rev 158011)
@@ -90,7 +90,7 @@
void RenderSVGBlock::willBeDestroyed()
{
- SVGResourcesCache::clientDestroyed(this);
+ SVGResourcesCache::clientDestroyed(*this);
RenderBlockFlow::willBeDestroyed();
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp (158010 => 158011)
--- trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp 2013-10-25 13:52:57 UTC (rev 158010)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp 2013-10-25 14:42:22 UTC (rev 158011)
@@ -102,7 +102,7 @@
void RenderSVGInline::willBeDestroyed()
{
- SVGResourcesCache::clientDestroyed(this);
+ SVGResourcesCache::clientDestroyed(*this);
RenderInline::willBeDestroyed();
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp (158010 => 158011)
--- trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp 2013-10-25 13:52:57 UTC (rev 158010)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp 2013-10-25 14:42:22 UTC (rev 158011)
@@ -94,7 +94,7 @@
void RenderSVGModelObject::willBeDestroyed()
{
- SVGResourcesCache::clientDestroyed(this);
+ SVGResourcesCache::clientDestroyed(*this);
RenderElement::willBeDestroyed();
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (158010 => 158011)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2013-10-25 13:52:57 UTC (rev 158010)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2013-10-25 14:42:22 UTC (rev 158011)
@@ -309,7 +309,7 @@
{
RenderBlock::removePercentHeightDescendant(const_cast<RenderSVGRoot&>(*this));
- SVGResourcesCache::clientDestroyed(this);
+ SVGResourcesCache::clientDestroyed(*this);
RenderReplaced::willBeDestroyed();
}
Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp (158010 => 158011)
--- trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2013-10-25 13:52:57 UTC (rev 158010)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2013-10-25 14:42:22 UTC (rev 158011)
@@ -167,16 +167,14 @@
cache->removeResourcesFromRenderObject(renderer);
}
-void SVGResourcesCache::clientDestroyed(RenderObject* renderer)
+void SVGResourcesCache::clientDestroyed(RenderElement& renderer)
{
- ASSERT(renderer);
-
- SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer);
+ SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(&renderer);
if (resources)
- resources->removeClientFromCache(renderer);
+ resources->removeClientFromCache(&renderer);
- SVGResourcesCache* cache = resourcesCacheFromRenderObject(renderer);
- cache->removeResourcesFromRenderObject(renderer);
+ SVGResourcesCache* cache = resourcesCacheFromRenderObject(&renderer);
+ cache->removeResourcesFromRenderObject(&renderer);
}
void SVGResourcesCache::resourceDestroyed(RenderSVGResourceContainer* resource)
Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCache.h (158010 => 158011)
--- trunk/Source/WebCore/rendering/svg/SVGResourcesCache.h 2013-10-25 13:52:57 UTC (rev 158010)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCache.h 2013-10-25 14:42:22 UTC (rev 158011)
@@ -48,7 +48,7 @@
static void clientWillBeRemovedFromTree(RenderObject*);
// Called from all SVG renderers destroy() methods - except for RenderSVGResourceContainer.
- static void clientDestroyed(RenderObject*);
+ static void clientDestroyed(RenderElement&);
// Called from all SVG renderers layout() methods.
static void clientLayoutChanged(RenderElement&);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
