<!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>[163277] 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/163277">163277</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-02-02 17:05:01 -0800 (Sun, 02 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>SVGDocumentExtensions::resourcesCache() should return a reference.
<https://webkit.org/b/128087>
The SVGResourcesCache is always present when the Document is using
SVG extensions, so make this return a reference and propagate that
knowledge to the call site.
This gets rid of an assertion and some rickety looking ->'s.
Also converted a loop to use C++11 range for syntax.
Reviewed by Sam Weinig.
* rendering/svg/SVGResourcesCache.cpp:
(WebCore::resourcesCacheFromRenderer):
(WebCore::SVGResourcesCache::cachedResourcesForRenderObject):
(WebCore::SVGResourcesCache::clientStyleChanged):
(WebCore::SVGResourcesCache::clientWasAddedToTree):
(WebCore::SVGResourcesCache::clientWillBeRemovedFromTree):
(WebCore::SVGResourcesCache::clientDestroyed):
(WebCore::SVGResourcesCache::resourceDestroyed):
* svg/SVGDocumentExtensions.h:
(WebCore::SVGDocumentExtensions::resourcesCache):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcesCachecpp">trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGDocumentExtensionsh">trunk/Source/WebCore/svg/SVGDocumentExtensions.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163276 => 163277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-03 01:03:48 UTC (rev 163276)
+++ trunk/Source/WebCore/ChangeLog 2014-02-03 01:05:01 UTC (rev 163277)
</span><span class="lines">@@ -1,5 +1,30 @@
</span><span class="cx"> 2014-02-02 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><ins>+ SVGDocumentExtensions::resourcesCache() should return a reference.
+ <https://webkit.org/b/128087>
+
+ The SVGResourcesCache is always present when the Document is using
+ SVG extensions, so make this return a reference and propagate that
+ knowledge to the call site.
+
+ This gets rid of an assertion and some rickety looking ->'s.
+ Also converted a loop to use C++11 range for syntax.
+
+ Reviewed by Sam Weinig.
+
+ * rendering/svg/SVGResourcesCache.cpp:
+ (WebCore::resourcesCacheFromRenderer):
+ (WebCore::SVGResourcesCache::cachedResourcesForRenderObject):
+ (WebCore::SVGResourcesCache::clientStyleChanged):
+ (WebCore::SVGResourcesCache::clientWasAddedToTree):
+ (WebCore::SVGResourcesCache::clientWillBeRemovedFromTree):
+ (WebCore::SVGResourcesCache::clientDestroyed):
+ (WebCore::SVGResourcesCache::resourceDestroyed):
+ * svg/SVGDocumentExtensions.h:
+ (WebCore::SVGDocumentExtensions::resourcesCache):
+
+2014-02-02 Andreas Kling <akling@apple.com>
+
</ins><span class="cx"> RenderSVGInlineText::computeNewScaledFontForStyle() should take references.
</span><span class="cx"> <https://webkit.org/b/128086>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcesCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp (163276 => 163277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2014-02-03 01:03:48 UTC (rev 163276)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2014-02-03 01:05:01 UTC (rev 163277)
</span><span class="lines">@@ -76,20 +76,16 @@
</span><span class="cx"> (*it)->removeClient(&renderer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline SVGResourcesCache* resourcesCacheFromRenderObject(const RenderObject& renderer)
</del><ins>+static inline SVGResourcesCache& resourcesCacheFromRenderer(const RenderObject& renderer)
</ins><span class="cx"> {
</span><span class="cx"> SVGDocumentExtensions* extensions = renderer.document().accessSVGExtensions();
</span><span class="cx"> ASSERT(extensions);
</span><del>-
- SVGResourcesCache* cache = extensions->resourcesCache();
- ASSERT(cache);
-
- return cache;
</del><ins>+ return extensions->resourcesCache();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SVGResources* SVGResourcesCache::cachedResourcesForRenderObject(const RenderObject& renderer)
</span><span class="cx"> {
</span><del>- return resourcesCacheFromRenderObject(renderer)->m_cache.get(&renderer);
</del><ins>+ return resourcesCacheFromRenderer(renderer).m_cache.get(&renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGResourcesCache::clientLayoutChanged(RenderElement& renderer)
</span><span class="lines">@@ -122,9 +118,9 @@
</span><span class="cx"> // FIXME: Avoid passing in a useless StyleDifference, but instead compare oldStyle/newStyle to see which resources changed
</span><span class="cx"> // to be able to selectively rebuild individual resources, instead of all of them.
</span><span class="cx"> if (rendererCanHaveResources(renderer)) {
</span><del>- SVGResourcesCache* cache = resourcesCacheFromRenderObject(renderer);
- cache->removeResourcesFromRenderer(renderer);
- cache->addResourcesFromRenderer(renderer, newStyle);
</del><ins>+ auto& cache = resourcesCacheFromRenderer(renderer);
+ cache.removeResourcesFromRenderer(renderer);
+ cache.addResourcesFromRenderer(renderer, newStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer, false);
</span><span class="lines">@@ -143,8 +139,7 @@
</span><span class="cx"> if (!rendererCanHaveResources(renderer))
</span><span class="cx"> return;
</span><span class="cx"> RenderElement& elementRenderer = toRenderElement(renderer);
</span><del>- SVGResourcesCache* cache = resourcesCacheFromRenderObject(elementRenderer);
- cache->addResourcesFromRenderer(elementRenderer, elementRenderer.style());
</del><ins>+ resourcesCacheFromRenderer(elementRenderer).addResourcesFromRenderer(elementRenderer, elementRenderer.style());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGResourcesCache::clientWillBeRemovedFromTree(RenderObject& renderer)
</span><span class="lines">@@ -157,8 +152,7 @@
</span><span class="cx"> if (!rendererCanHaveResources(renderer))
</span><span class="cx"> return;
</span><span class="cx"> RenderElement& elementRenderer = toRenderElement(renderer);
</span><del>- SVGResourcesCache* cache = resourcesCacheFromRenderObject(elementRenderer);
- cache->removeResourcesFromRenderer(elementRenderer);
</del><ins>+ resourcesCacheFromRenderer(elementRenderer).removeResourcesFromRenderer(elementRenderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGResourcesCache::clientDestroyed(RenderElement& renderer)
</span><span class="lines">@@ -167,23 +161,22 @@
</span><span class="cx"> if (resources)
</span><span class="cx"> resources->removeClientFromCache(renderer);
</span><span class="cx">
</span><del>- SVGResourcesCache* cache = resourcesCacheFromRenderObject(renderer);
- cache->removeResourcesFromRenderer(renderer);
</del><ins>+ resourcesCacheFromRenderer(renderer).removeResourcesFromRenderer(renderer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGResourcesCache::resourceDestroyed(RenderSVGResourceContainer& resource)
</span><span class="cx"> {
</span><del>- SVGResourcesCache* cache = resourcesCacheFromRenderObject(resource);
</del><ins>+ auto& cache = resourcesCacheFromRenderer(resource);
</ins><span class="cx">
</span><span class="cx"> // The resource itself may have clients, that need to be notified.
</span><del>- cache->removeResourcesFromRenderer(resource);
</del><ins>+ cache.removeResourcesFromRenderer(resource);
</ins><span class="cx">
</span><del>- for (auto it = cache->m_cache.begin(), end = cache->m_cache.end(); it != end; ++it) {
- it->value->resourceDestroyed(resource);
</del><ins>+ for (auto& it : cache.m_cache) {
+ it.value->resourceDestroyed(resource);
</ins><span class="cx">
</span><span class="cx"> // Mark users of destroyed resources as pending resolution based on the id of the old resource.
</span><span class="cx"> Element& resourceElement = resource.element();
</span><del>- Element* clientElement = toElement(it->key->node());
</del><ins>+ Element* clientElement = toElement(it.key->node());
</ins><span class="cx"> SVGDocumentExtensions* extensions = clientElement->document().accessSVGExtensions();
</span><span class="cx">
</span><span class="cx"> extensions->addPendingResource(resourceElement.getIdAttribute(), clientElement);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGDocumentExtensionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGDocumentExtensions.h (163276 => 163277)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGDocumentExtensions.h 2014-02-03 01:03:48 UTC (rev 163276)
+++ trunk/Source/WebCore/svg/SVGDocumentExtensions.h 2014-02-03 01:05:01 UTC (rev 163277)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> void reportWarning(const String&);
</span><span class="cx"> void reportError(const String&);
</span><span class="cx">
</span><del>- SVGResourcesCache* resourcesCache() const { return m_resourcesCache.get(); }
</del><ins>+ SVGResourcesCache& resourcesCache() { return *m_resourcesCache; }
</ins><span class="cx">
</span><span class="cx"> HashSet<SVGElement*>* setOfElementsReferencingTarget(SVGElement* referencedElement) const;
</span><span class="cx"> void addElementReferencingTarget(SVGElement* referencingElement, SVGElement* referencedElement);
</span></span></pre>
</div>
</div>
</body>
</html>