<!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>[163279] 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/163279">163279</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-02 18:15:13 -0800 (Sun, 02 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderSVGResourceContainer clients are always RenderElement.
<https://webkit.org/b/128088>
All clients of RenderSVGResourceContainer are going to be RenderElement,
so make the interface take RenderElement& instead of RenderObject*.
Also modernized the code a bit with C++11 range for loops.
Reviewed by Sam Weinig.
* rendering/svg/RenderSVGResourceContainer.cpp:
(WebCore::RenderSVGResourceContainer::addClient):
(WebCore::RenderSVGResourceContainer::removeClient):
* rendering/svg/RenderSVGResourceContainer.h:
* rendering/svg/SVGResourcesCache.cpp:
(WebCore::SVGResourcesCache::addResourcesFromRenderer):
(WebCore::SVGResourcesCache::removeResourcesFromRenderer):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceContainercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourceContainerh">trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcesCachecpp">trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163278 => 163279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-03 01:40:12 UTC (rev 163278)
+++ trunk/Source/WebCore/ChangeLog 2014-02-03 02:15:13 UTC (rev 163279)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-02-02 Andreas Kling <akling@apple.com>
+
+ RenderSVGResourceContainer clients are always RenderElement.
+ <https://webkit.org/b/128088>
+
+ All clients of RenderSVGResourceContainer are going to be RenderElement,
+ so make the interface take RenderElement& instead of RenderObject*.
+
+ Also modernized the code a bit with C++11 range for loops.
+
+ Reviewed by Sam Weinig.
+
+ * rendering/svg/RenderSVGResourceContainer.cpp:
+ (WebCore::RenderSVGResourceContainer::addClient):
+ (WebCore::RenderSVGResourceContainer::removeClient):
+ * rendering/svg/RenderSVGResourceContainer.h:
+ * rendering/svg/SVGResourcesCache.cpp:
+ (WebCore::SVGResourcesCache::addResourcesFromRenderer):
+ (WebCore::SVGResourcesCache::removeResourcesFromRenderer):
+
</ins><span class="cx"> 2014-02-02 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Use floorf/roundf/fabs in device snapping helpers.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (163278 => 163279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-02-03 01:40:12 UTC (rev 163278)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-02-03 02:15:13 UTC (rev 163279)
</span><span class="lines">@@ -141,17 +141,15 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderSVGResourceContainer::addClient(RenderObject* client)
</del><ins>+void RenderSVGResourceContainer::addClient(RenderElement& client)
</ins><span class="cx"> {
</span><del>- ASSERT(client);
- m_clients.add(client);
</del><ins>+ m_clients.add(&client);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderSVGResourceContainer::removeClient(RenderObject* client)
</del><ins>+void RenderSVGResourceContainer::removeClient(RenderElement& client)
</ins><span class="cx"> {
</span><del>- ASSERT(client);
- removeClientFromCache(*client, false);
- m_clients.remove(client);
</del><ins>+ removeClientFromCache(client, false);
+ m_clients.remove(&client);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderSVGResourceContainer::addClientRenderLayer(RenderLayer* client)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h (163278 => 163279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2014-02-03 01:40:12 UTC (rev 163278)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2014-02-03 02:15:13 UTC (rev 163279)
</span><span class="lines">@@ -63,8 +63,8 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class SVGResourcesCache;
</span><del>- void addClient(RenderObject*);
- void removeClient(RenderObject*);
</del><ins>+ void addClient(RenderElement&);
+ void removeClient(RenderElement&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> virtual void willBeDestroyed() override final;
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> AtomicString m_id;
</span><span class="cx"> bool m_registered : 1;
</span><span class="cx"> bool m_isInvalidating : 1;
</span><del>- HashSet<RenderObject*> m_clients;
</del><ins>+ HashSet<RenderElement*> m_clients;
</ins><span class="cx"> HashSet<RenderLayer*> m_clientLayers;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcesCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp (163278 => 163279)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2014-02-03 01:40:12 UTC (rev 163278)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2014-02-03 02:15:13 UTC (rev 163279)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> HashSet<RenderSVGResourceContainer*> resourceSet;
</span><span class="cx"> resources.buildSetOfResources(resourceSet);
</span><span class="cx">
</span><del>- for (auto it = resourceSet.begin(), end = resourceSet.end(); it != end; ++it)
- (*it)->addClient(&renderer);
</del><ins>+ for (auto* resourceContainer : resourceSet)
+ resourceContainer->addClient(renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGResourcesCache::removeResourcesFromRenderer(RenderElement& renderer)
</span><span class="lines">@@ -72,8 +72,8 @@
</span><span class="cx"> HashSet<RenderSVGResourceContainer*> resourceSet;
</span><span class="cx"> resources->buildSetOfResources(resourceSet);
</span><span class="cx">
</span><del>- for (auto it = resourceSet.begin(), end = resourceSet.end(); it != end; ++it)
- (*it)->removeClient(&renderer);
</del><ins>+ for (auto* resourceContainer : resourceSet)
+ resourceContainer->removeClient(renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline SVGResourcesCache& resourcesCacheFromRenderer(const RenderObject& renderer)
</span></span></pre>
</div>
</div>
</body>
</html>