<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[163295] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/163295">163295</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-03 01:02:55 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcecpp">trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceh">trunk/Source/WebCore/rendering/svg/RenderSVGResource.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceClipperh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceFilterh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceGradientcpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceGradienth">trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceMarkercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceMarkerh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceMaskercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceMaskerh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcePatternh">trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceSolidColorh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGRenderSupportcpp">trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcescpp">trunk/Source/WebCore/rendering/svg/SVGResources.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcesh">trunk/Source/WebCore/rendering/svg/SVGResources.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,46 @@
</span><ins>+2014-02-03 Andreas Kling <akling@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:
+
</ins><span class="cx"> 2014-02-03 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> More iOS build fixing.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -156,23 +156,23 @@
</span><span class="cx"> return s_sharedSolidPaintingResource;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void removeFromCacheAndInvalidateDependencies(RenderObject& object, bool needsLayout)
</del><ins>+static inline void removeFromCacheAndInvalidateDependencies(RenderElement& renderer, bool needsLayout)
</ins><span class="cx"> {
</span><del>- if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(object)) {
</del><ins>+ if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer)) {
</ins><span class="cx"> #if ENABLE(FILTERS)
</span><span class="cx"> if (RenderSVGResourceFilter* filter = resources->filter())
</span><del>- filter->removeClientFromCache(object);
</del><ins>+ filter->removeClientFromCache(renderer);
</ins><span class="cx"> #endif
</span><span class="cx"> if (RenderSVGResourceMasker* masker = resources->masker())
</span><del>- masker->removeClientFromCache(object);
</del><ins>+ masker->removeClientFromCache(renderer);
</ins><span class="cx">
</span><span class="cx"> if (RenderSVGResourceClipper* clipper = resources->clipper())
</span><del>- clipper->removeClientFromCache(object);
</del><ins>+ clipper->removeClientFromCache(renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (!object.node() || !object.node()->isSVGElement())
</del><ins>+ if (!renderer.element() || !renderer.element()->isSVGElement())
</ins><span class="cx"> return;
</span><del>- HashSet<SVGElement*>* dependencies = object.document().accessSVGExtensions()->setOfElementsReferencingTarget(toSVGElement(object.node()));
</del><ins>+ HashSet<SVGElement*>* dependencies = renderer.document().accessSVGExtensions()->setOfElementsReferencingTarget(toSVGElement(renderer.element()));
</ins><span class="cx"> if (!dependencies)
</span><span class="cx"> return;
</span><span class="cx"> for (auto element : *dependencies) {
</span><span class="lines">@@ -188,10 +188,11 @@
</span><span class="cx"> if (needsLayout && !object.documentBeingDestroyed())
</span><span class="cx"> object.setNeedsLayout();
</span><span class="cx">
</span><del>- removeFromCacheAndInvalidateDependencies(object, needsLayout);
</del><ins>+ if (object.isRenderElement())
+ removeFromCacheAndInvalidateDependencies(toRenderElement(object), needsLayout);
</ins><span class="cx">
</span><span class="cx"> // Invalidate resources in ancestor chain, if needed.
</span><del>- RenderObject* current = object.parent();
</del><ins>+ auto current = object.parent();
</ins><span class="cx"> while (current) {
</span><span class="cx"> removeFromCacheAndInvalidateDependencies(*current, needsLayout);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.h (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> virtual ~RenderSVGResource() { }
</span><span class="cx">
</span><span class="cx"> virtual void removeAllClientsFromCache(bool markForInvalidation = true) = 0;
</span><del>- virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true) = 0;
</del><ins>+ virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) = 0;
</span><span class="cx"> virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short, const Path*, const RenderSVGShape*) { }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceClippercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.cpp (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderSVGResourceClipper::removeClientFromCache(RenderObject& client, bool markForInvalidation)
</del><ins>+void RenderSVGResourceClipper::removeClientFromCache(RenderElement& client, bool markForInvalidation)
</ins><span class="cx"> {
</span><span class="cx"> m_clipper.remove(&client);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceClipperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceClipper.h (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx">
</span><span class="cx"> SVGClipPathElement& clipPathElement() const { return toSVGClipPathElement(nodeForNonAnonymous()); }
</span><span class="cx">
</span><del>- virtual void removeAllClientsFromCache(bool markForInvalidation = true);
- virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true);
</del><ins>+ virtual void removeAllClientsFromCache(bool markForInvalidation = true) override;
+ virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) override;
</span><span class="cx"> // clipPath can be clipped too, but don't have a boundingBox or repaintRect. So we can't call
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderSVGResourceFilter::removeClientFromCache(RenderObject& client, bool markForInvalidation)
</del><ins>+void RenderSVGResourceFilter::removeClientFromCache(RenderElement& client, bool markForInvalidation)
</ins><span class="cx"> {
</span><span class="cx"> if (FilterData* filterData = m_filter.get(&client)) {
</span><span class="cx"> if (filterData->savedContext)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceFilterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.h (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -68,8 +68,8 @@
</span><span class="cx">
</span><span class="cx"> SVGFilterElement& filterElement() const { return toSVGFilterElement(RenderSVGResourceContainer::element()); }
</span><span class="cx">
</span><del>- virtual void removeAllClientsFromCache(bool markForInvalidation = true);
- virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true);
</del><ins>+ virtual void removeAllClientsFromCache(bool markForInvalidation = true) override;
+ virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) override;
</span><span class="cx"> virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceGradientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.cpp (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -48,7 +48,7 @@
</span><span class="cx"> markAllClientsForInvalidation(markForInvalidation ? RepaintInvalidation : ParentOnlyInvalidation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderSVGResourceGradient::removeClientFromCache(RenderObject& client, bool markForInvalidation)
</del><ins>+void RenderSVGResourceGradient::removeClientFromCache(RenderElement& client, bool markForInvalidation)
</ins><span class="cx"> {
</span><span class="cx"> m_gradientMap.remove(&client);
</span><span class="cx"> markClientForInvalidation(client, markForInvalidation ? RepaintInvalidation : ParentOnlyInvalidation);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceGradienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceGradient.h (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> SVGGradientElement& gradientElement() const { return static_cast<SVGGradientElement&>(RenderSVGResourceContainer::element()); }
</span><span class="cx">
</span><span class="cx"> virtual void removeAllClientsFromCache(bool markForInvalidation = true) override final;
</span><del>- virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true) override final;
</del><ins>+ virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) override final;
</ins><span class="cx">
</span><span class="cx"> virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) override final;
</span><span class="cx"> virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) override final;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceMarkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.cpp (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderSVGResourceMarker::removeClientFromCache(RenderObject& client, bool markForInvalidation)
</del><ins>+void RenderSVGResourceMarker::removeClientFromCache(RenderElement& client, bool markForInvalidation)
</ins><span class="cx"> {
</span><span class="cx"> markClientForInvalidation(client, markForInvalidation ? BoundariesInvalidation : ParentOnlyInvalidation);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceMarkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMarker.h (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx">
</span><span class="cx"> SVGMarkerElement& markerElement() const { return toSVGMarkerElement(RenderSVGResourceContainer::element()); }
</span><span class="cx">
</span><del>- virtual void removeAllClientsFromCache(bool markForInvalidation = true);
- virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true);
</del><ins>+ virtual void removeAllClientsFromCache(bool markForInvalidation = true) override;
+ virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) override;
</ins><span class="cx">
</span><span class="cx"> void draw(PaintInfo&, const AffineTransform&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceMaskercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.cpp (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> markAllClientsForInvalidation(markForInvalidation ? LayoutAndBoundariesInvalidation : ParentOnlyInvalidation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderSVGResourceMasker::removeClientFromCache(RenderObject& client, bool markForInvalidation)
</del><ins>+void RenderSVGResourceMasker::removeClientFromCache(RenderElement& client, bool markForInvalidation)
</ins><span class="cx"> {
</span><span class="cx"> m_masker.remove(&client);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceMaskerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceMasker.h (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx">
</span><span class="cx"> SVGMaskElement& maskElement() const { return toSVGMaskElement(RenderSVGResourceContainer::element()); }
</span><span class="cx">
</span><del>- virtual void removeAllClientsFromCache(bool markForInvalidation = true);
- virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true);
</del><ins>+ virtual void removeAllClientsFromCache(bool markForInvalidation = true) override;
+ virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) override;
</ins><span class="cx"> virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) override;
</span><span class="cx"> virtual FloatRect resourceBoundingBox(const RenderObject&) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatterncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.cpp (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> markAllClientsForInvalidation(markForInvalidation ? RepaintInvalidation : ParentOnlyInvalidation);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderSVGResourcePattern::removeClientFromCache(RenderObject& client, bool markForInvalidation)
</del><ins>+void RenderSVGResourcePattern::removeClientFromCache(RenderElement& client, bool markForInvalidation)
</ins><span class="cx"> {
</span><span class="cx"> m_patternMap.remove(&client);
</span><span class="cx"> markClientForInvalidation(client, markForInvalidation ? RepaintInvalidation : ParentOnlyInvalidation);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcePatternh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourcePattern.h (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,8 +45,8 @@
</span><span class="cx"> RenderSVGResourcePattern(SVGPatternElement&, PassRef<RenderStyle>);
</span><span class="cx"> SVGPatternElement& patternElement() const;
</span><span class="cx">
</span><del>- virtual void removeAllClientsFromCache(bool markForInvalidation = true);
- virtual void removeClientFromCache(RenderObject&, bool markForInvalidation = true);
</del><ins>+ virtual void removeAllClientsFromCache(bool markForInvalidation = true) override;
+ virtual void removeClientFromCache(RenderElement&, bool markForInvalidation = true) override;
</ins><span class="cx">
</span><span class="cx"> virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) override;
</span><span class="cx"> virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceSolidColorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceSolidColor.h (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -26,19 +26,19 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class RenderSVGResourceSolidColor : public RenderSVGResource {
</del><ins>+class RenderSVGResourceSolidColor final : public RenderSVGResource {
</ins><span class="cx"> public:
</span><span class="cx"> RenderSVGResourceSolidColor();
</span><span class="cx"> virtual ~RenderSVGResourceSolidColor();
</span><span class="cx">
</span><del>- virtual void removeAllClientsFromCache(bool = true) { }
- virtual void removeClientFromCache(RenderObject&, bool = true) { }
</del><ins>+ virtual void removeAllClientsFromCache(bool = true) override { }
+ virtual void removeClientFromCache(RenderElement&, bool = true) override { }
</ins><span class="cx">
</span><span class="cx"> virtual bool applyResource(RenderElement&, const RenderStyle&, GraphicsContext*&, unsigned short resourceMode) override;
</span><span class="cx"> virtual void postApplyResource(RenderElement&, GraphicsContext*&, unsigned short resourceMode, const Path*, const RenderSVGShape*) override;
</span><span class="cx"> virtual FloatRect resourceBoundingBox(const RenderObject&) override { return FloatRect(); }
</span><span class="cx">
</span><del>- virtual RenderSVGResourceType resourceType() const { return s_resourceType; }
</del><ins>+ virtual RenderSVGResourceType resourceType() const override { return s_resourceType; }
</ins><span class="cx"> static RenderSVGResourceType s_resourceType;
</span><span class="cx">
</span><span class="cx"> const Color& color() const { return m_color; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGRenderSupportcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -185,14 +185,14 @@
</span><span class="cx"> return *lineageOfType<RenderSVGRoot>(start).first();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void invalidateResourcesOfChildren(RenderObject& start)
</del><ins>+static inline void invalidateResourcesOfChildren(RenderElement& renderer)
</ins><span class="cx"> {
</span><del>- ASSERT(!start.needsLayout());
- if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(start))
- resources->removeClientFromCache(start, false);
</del><ins>+ ASSERT(!renderer.needsLayout());
+ if (SVGResources* resources = SVGResourcesCache::cachedResourcesForRenderObject(renderer))
+ resources->removeClientFromCache(renderer, false);
</ins><span class="cx">
</span><del>- for (RenderObject* child = start.firstChildSlow(); child; child = child->nextSibling())
- invalidateResourcesOfChildren(*child);
</del><ins>+ for (auto& child : childrenOfType<RenderElement>(renderer))
+ invalidateResourcesOfChildren(child);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool layoutSizeOfNearestViewportChanged(const RenderElement& renderer)
</span><span class="lines">@@ -288,8 +288,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the layout size changed, invalidate all resources of all children that didn't go through the layout() code path.
</span><del>- for (auto child : notlayoutedObjects)
- invalidateResourcesOfChildren(*child);
</del><ins>+ for (auto child : notlayoutedObjects) {
+ if (child->isRenderElement())
+ invalidateResourcesOfChildren(toRenderElement(*child));
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SVGRenderSupport::isOverflowHidden(const RenderElement& renderer)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResources.cpp (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -279,7 +279,7 @@
</span><span class="cx"> return foundResources;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGResources::removeClientFromCache(RenderObject& object, bool markForInvalidation) const
</del><ins>+void SVGResources::removeClientFromCache(RenderElement& renderer, bool markForInvalidation) const
</ins><span class="cx"> {
</span><span class="cx"> if (!m_clipperFilterMaskerData && !m_markerData && !m_fillStrokeData && !m_linkedResource)
</span><span class="cx"> return;
</span><span class="lines">@@ -288,35 +288,35 @@
</span><span class="cx"> ASSERT(!m_clipperFilterMaskerData);
</span><span class="cx"> ASSERT(!m_markerData);
</span><span class="cx"> ASSERT(!m_fillStrokeData);
</span><del>- m_linkedResource->removeClientFromCache(object, markForInvalidation);
</del><ins>+ m_linkedResource->removeClientFromCache(renderer, markForInvalidation);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_clipperFilterMaskerData) {
</span><span class="cx"> if (m_clipperFilterMaskerData->clipper)
</span><del>- m_clipperFilterMaskerData->clipper->removeClientFromCache(object, markForInvalidation);
</del><ins>+ m_clipperFilterMaskerData->clipper->removeClientFromCache(renderer, markForInvalidation);
</ins><span class="cx"> #if ENABLE(FILTERS)
</span><span class="cx"> if (m_clipperFilterMaskerData->filter)
</span><del>- m_clipperFilterMaskerData->filter->removeClientFromCache(object, markForInvalidation);
</del><ins>+ m_clipperFilterMaskerData->filter->removeClientFromCache(renderer, markForInvalidation);
</ins><span class="cx"> #endif
</span><span class="cx"> if (m_clipperFilterMaskerData->masker)
</span><del>- m_clipperFilterMaskerData->masker->removeClientFromCache(object, markForInvalidation);
</del><ins>+ m_clipperFilterMaskerData->masker->removeClientFromCache(renderer, markForInvalidation);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_markerData) {
</span><span class="cx"> if (m_markerData->markerStart)
</span><del>- m_markerData->markerStart->removeClientFromCache(object, markForInvalidation);
</del><ins>+ m_markerData->markerStart->removeClientFromCache(renderer, markForInvalidation);
</ins><span class="cx"> if (m_markerData->markerMid)
</span><del>- m_markerData->markerMid->removeClientFromCache(object, markForInvalidation);
</del><ins>+ m_markerData->markerMid->removeClientFromCache(renderer, markForInvalidation);
</ins><span class="cx"> if (m_markerData->markerEnd)
</span><del>- m_markerData->markerEnd->removeClientFromCache(object, markForInvalidation);
</del><ins>+ m_markerData->markerEnd->removeClientFromCache(renderer, markForInvalidation);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_fillStrokeData) {
</span><span class="cx"> if (m_fillStrokeData->fill)
</span><del>- m_fillStrokeData->fill->removeClientFromCache(object, markForInvalidation);
</del><ins>+ m_fillStrokeData->fill->removeClientFromCache(renderer, markForInvalidation);
</ins><span class="cx"> if (m_fillStrokeData->stroke)
</span><del>- m_fillStrokeData->stroke->removeClientFromCache(object, markForInvalidation);
</del><ins>+ m_fillStrokeData->stroke->removeClientFromCache(renderer, markForInvalidation);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResources.h (163294 => 163295)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> void buildSetOfResources(HashSet<RenderSVGResourceContainer*>&);
</span><span class="cx">
</span><span class="cx"> // Methods operating on all cached resources
</span><del>- void removeClientFromCache(RenderObject&, bool markForInvalidation = true) const;
</del><ins>+ void removeClientFromCache(RenderElement&, bool markForInvalidation = true) const;
</ins><span class="cx"> void resourceDestroyed(RenderSVGResourceContainer&);
</span><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span></span></pre>
</div>
</div>
</body>
</html>