<!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>[162119] 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/162119">162119</a></dd>
<dt>Author</dt> <dd>krit@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-16 01:09:08 -0800 (Thu, 16 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename functions in SVGDocumentExtension
https://bugs.webkit.org/show_bug.cgi?id=127046
Reviewed by Sam Weinig.
Change some function names in SVGDocumentExtension
to make them more descriptive.
Simple refactoring. No new tests.
* rendering/svg/RenderSVGResourceContainer.cpp:
(WebCore::RenderSVGResourceContainer::registerResource):
* svg/SVGDocumentExtensions.cpp:
(WebCore::SVGDocumentExtensions::addPendingResource):
(WebCore::SVGDocumentExtensions::isIdOfPendingResource):
(WebCore::SVGDocumentExtensions::isElementWithPendingResources):
(WebCore::SVGDocumentExtensions::isPendingResource):
(WebCore::SVGDocumentExtensions::clearHasPendingResourcesIfPossible):
(WebCore::SVGDocumentExtensions::removeElementFromPendingResources):
(WebCore::SVGDocumentExtensions::removePendingResource):
(WebCore::SVGDocumentExtensions::removePendingResourceForRemoval):
(WebCore::SVGDocumentExtensions::markPendingResourcesForRemoval):
(WebCore::SVGDocumentExtensions::removeElementFromPendingResourcesForRemovalMap): The name is not great but a bit more descriptive.
* svg/SVGDocumentExtensions.h:
* svg/SVGElement.cpp:
(WebCore::SVGElement::buildPendingResourcesIfNeeded):
* svg/SVGMPathElement.cpp:
(WebCore::SVGMPathElement::buildPendingResource):
* svg/SVGTextPathElement.cpp:
(WebCore::SVGTextPathElement::buildPendingResource):
* svg/animation/SVGSMILElement.cpp:
(WebCore::SVGSMILElement::buildPendingResource):</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="#trunkSourceWebCoresvgSVGDocumentExtensionscpp">trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGDocumentExtensionsh">trunk/Source/WebCore/svg/SVGDocumentExtensions.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGMPathElementcpp">trunk/Source/WebCore/svg/SVGMPathElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGTextPathElementcpp">trunk/Source/WebCore/svg/SVGTextPathElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvganimationSVGSMILElementcpp">trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162118 => 162119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-16 07:37:46 UTC (rev 162118)
+++ trunk/Source/WebCore/ChangeLog 2014-01-16 09:09:08 UTC (rev 162119)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2014-01-16 Dirk Schulze <krit@webkit.org>
+
+ Rename functions in SVGDocumentExtension
+ https://bugs.webkit.org/show_bug.cgi?id=127046
+
+ Reviewed by Sam Weinig.
+
+ Change some function names in SVGDocumentExtension
+ to make them more descriptive.
+
+ Simple refactoring. No new tests.
+
+ * rendering/svg/RenderSVGResourceContainer.cpp:
+ (WebCore::RenderSVGResourceContainer::registerResource):
+ * svg/SVGDocumentExtensions.cpp:
+ (WebCore::SVGDocumentExtensions::addPendingResource):
+ (WebCore::SVGDocumentExtensions::isIdOfPendingResource):
+ (WebCore::SVGDocumentExtensions::isElementWithPendingResources):
+ (WebCore::SVGDocumentExtensions::isPendingResource):
+ (WebCore::SVGDocumentExtensions::clearHasPendingResourcesIfPossible):
+ (WebCore::SVGDocumentExtensions::removeElementFromPendingResources):
+ (WebCore::SVGDocumentExtensions::removePendingResource):
+ (WebCore::SVGDocumentExtensions::removePendingResourceForRemoval):
+ (WebCore::SVGDocumentExtensions::markPendingResourcesForRemoval):
+ (WebCore::SVGDocumentExtensions::removeElementFromPendingResourcesForRemovalMap): The name is not great but a bit more descriptive.
+ * svg/SVGDocumentExtensions.h:
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::buildPendingResourcesIfNeeded):
+ * svg/SVGMPathElement.cpp:
+ (WebCore::SVGMPathElement::buildPendingResource):
+ * svg/SVGTextPathElement.cpp:
+ (WebCore::SVGTextPathElement::buildPendingResource):
+ * svg/animation/SVGSMILElement.cpp:
+ (WebCore::SVGSMILElement::buildPendingResource):
+
</ins><span class="cx"> 2014-01-15 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][EFL][NIX] Do not use PrintContext, Frame and DocumentLoader in Errors
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (162118 => 162119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-01-16 07:37:46 UTC (rev 162118)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-01-16 09:09:08 UTC (rev 162119)
</span><span class="lines">@@ -169,19 +169,19 @@
</span><span class="cx"> void RenderSVGResourceContainer::registerResource()
</span><span class="cx"> {
</span><span class="cx"> SVGDocumentExtensions& extensions = svgExtensionsFromElement(element());
</span><del>- if (!extensions.hasPendingResource(m_id)) {
</del><ins>+ if (!extensions.isIdOfPendingResource(m_id)) {
</ins><span class="cx"> extensions.addResource(m_id, this);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- std::unique_ptr<SVGDocumentExtensions::SVGPendingElements> clients = extensions.removePendingResource(m_id);
</del><ins>+ std::unique_ptr<SVGDocumentExtensions::PendingElements> clients = extensions.removePendingResource(m_id);
</ins><span class="cx">
</span><span class="cx"> // Cache us with the new id.
</span><span class="cx"> extensions.addResource(m_id, this);
</span><span class="cx">
</span><span class="cx"> // Update cached resources of pending clients.
</span><del>- const SVGDocumentExtensions::SVGPendingElements::const_iterator end = clients->end();
- for (SVGDocumentExtensions::SVGPendingElements::const_iterator it = clients->begin(); it != end; ++it) {
</del><ins>+ auto end = clients->end();
+ for (auto it = clients->begin(); it != end; ++it) {
</ins><span class="cx"> ASSERT((*it)->hasPendingResources());
</span><span class="cx"> extensions.clearHasPendingResourcesIfPossible(*it);
</span><span class="cx"> auto renderer = (*it)->renderer();
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGDocumentExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp (162118 => 162119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp 2014-01-16 07:37:46 UTC (rev 162118)
+++ trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp 2014-01-16 09:09:08 UTC (rev 162119)
</span><span class="lines">@@ -155,13 +155,13 @@
</span><span class="cx">
</span><span class="cx"> auto result = m_pendingResources.add(id, nullptr);
</span><span class="cx"> if (result.isNewEntry)
</span><del>- result.iterator->value = std::make_unique<SVGPendingElements>();
</del><ins>+ result.iterator->value = std::make_unique<PendingElements>();
</ins><span class="cx"> result.iterator->value->add(element);
</span><span class="cx">
</span><span class="cx"> element->setHasPendingResources();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGDocumentExtensions::hasPendingResource(const AtomicString& id) const
</del><ins>+bool SVGDocumentExtensions::isIdOfPendingResource(const AtomicString& id) const
</ins><span class="cx"> {
</span><span class="cx"> if (id.isEmpty())
</span><span class="cx"> return false;
</span><span class="lines">@@ -169,16 +169,14 @@
</span><span class="cx"> return m_pendingResources.contains(id);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGDocumentExtensions::isElementPendingResources(Element* element) const
</del><ins>+bool SVGDocumentExtensions::isElementWithPendingResources(Element* element) const
</ins><span class="cx"> {
</span><span class="cx"> // This algorithm takes time proportional to the number of pending resources and need not.
</span><span class="cx"> // If performance becomes an issue we can keep a counted set of elements and answer the question efficiently.
</span><del>-
</del><span class="cx"> ASSERT(element);
</span><del>-
</del><span class="cx"> auto end = m_pendingResources.end();
</span><span class="cx"> for (auto it = m_pendingResources.begin(); it != end; ++it) {
</span><del>- SVGPendingElements* elements = it->value.get();
</del><ins>+ PendingElements* elements = it->value.get();
</ins><span class="cx"> ASSERT(elements);
</span><span class="cx">
</span><span class="cx"> if (elements->contains(element))
</span><span class="lines">@@ -187,11 +185,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool SVGDocumentExtensions::isElementPendingResource(Element* element, const AtomicString& id) const
</del><ins>+bool SVGDocumentExtensions::isPendingResource(Element* element, const AtomicString& id) const
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(element);
</span><span class="cx">
</span><del>- if (!hasPendingResource(id))
</del><ins>+ if (!isIdOfPendingResource(id))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> return m_pendingResources.get(id)->contains(element);
</span><span class="lines">@@ -199,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> void SVGDocumentExtensions::clearHasPendingResourcesIfPossible(Element* element)
</span><span class="cx"> {
</span><del>- if (!isElementPendingResources(element))
</del><ins>+ if (!isElementWithPendingResources(element))
</ins><span class="cx"> element->clearHasPendingResources();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -212,7 +210,7 @@
</span><span class="cx"> Vector<AtomicString> toBeRemoved;
</span><span class="cx"> auto end = m_pendingResources.end();
</span><span class="cx"> for (auto it = m_pendingResources.begin(); it != end; ++it) {
</span><del>- SVGPendingElements* elements = it->value.get();
</del><ins>+ PendingElements* elements = it->value.get();
</ins><span class="cx"> ASSERT(elements);
</span><span class="cx"> ASSERT(!elements->isEmpty());
</span><span class="cx">
</span><span class="lines">@@ -234,7 +232,7 @@
</span><span class="cx"> Vector<AtomicString> toBeRemoved;
</span><span class="cx"> auto end = m_pendingResourcesForRemoval.end();
</span><span class="cx"> for (auto it = m_pendingResourcesForRemoval.begin(); it != end; ++it) {
</span><del>- SVGPendingElements* elements = it->value.get();
</del><ins>+ PendingElements* elements = it->value.get();
</ins><span class="cx"> ASSERT(elements);
</span><span class="cx"> ASSERT(!elements->isEmpty());
</span><span class="cx">
</span><span class="lines">@@ -250,13 +248,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<SVGDocumentExtensions::SVGPendingElements> SVGDocumentExtensions::removePendingResource(const AtomicString& id)
</del><ins>+std::unique_ptr<SVGDocumentExtensions::PendingElements> SVGDocumentExtensions::removePendingResource(const AtomicString& id)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_pendingResources.contains(id));
</span><span class="cx"> return m_pendingResources.take(id);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-std::unique_ptr<SVGDocumentExtensions::SVGPendingElements> SVGDocumentExtensions::removePendingResourceForRemoval(const AtomicString& id)
</del><ins>+std::unique_ptr<SVGDocumentExtensions::PendingElements> SVGDocumentExtensions::removePendingResourceForRemoval(const AtomicString& id)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_pendingResourcesForRemoval.contains(id));
</span><span class="cx"> return m_pendingResourcesForRemoval.take(id);
</span><span class="lines">@@ -269,17 +267,17 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(!m_pendingResourcesForRemoval.contains(id));
</span><span class="cx">
</span><del>- std::unique_ptr<SVGPendingElements> existing = m_pendingResources.take(id);
</del><ins>+ std::unique_ptr<PendingElements> existing = m_pendingResources.take(id);
</ins><span class="cx"> if (existing && !existing->isEmpty())
</span><span class="cx"> m_pendingResourcesForRemoval.add(id, std::move(existing));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Element* SVGDocumentExtensions::removeElementFromPendingResourcesForRemoval(const AtomicString& id)
</del><ins>+Element* SVGDocumentExtensions::removeElementFromPendingResourcesForRemovalMap(const AtomicString& id)
</ins><span class="cx"> {
</span><span class="cx"> if (id.isEmpty())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- SVGPendingElements* resourceSet = m_pendingResourcesForRemoval.get(id);
</del><ins>+ PendingElements* resourceSet = m_pendingResourcesForRemoval.get(id);
</ins><span class="cx"> if (!resourceSet || resourceSet->isEmpty())
</span><span class="cx"> return 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGDocumentExtensionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGDocumentExtensions.h (162118 => 162119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGDocumentExtensions.h 2014-01-16 07:37:46 UTC (rev 162118)
+++ trunk/Source/WebCore/svg/SVGDocumentExtensions.h 2014-01-16 09:09:08 UTC (rev 162119)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> class SVGDocumentExtensions {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(SVGDocumentExtensions); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- typedef HashSet<Element*> SVGPendingElements;
</del><ins>+ typedef HashSet<Element*> PendingElements;
</ins><span class="cx"> SVGDocumentExtensions(Document*);
</span><span class="cx"> ~SVGDocumentExtensions();
</span><span class="cx">
</span><span class="lines">@@ -83,8 +83,8 @@
</span><span class="cx"> HashSet<SVGFontFaceElement*> m_svgFontFaceElements;
</span><span class="cx"> #endif
</span><span class="cx"> HashMap<AtomicString, RenderSVGResourceContainer*> m_resources;
</span><del>- HashMap<AtomicString, std::unique_ptr<SVGPendingElements>> m_pendingResources; // Resources that are pending.
- HashMap<AtomicString, std::unique_ptr<SVGPendingElements>> m_pendingResourcesForRemoval; // Resources that are pending and scheduled for removal.
</del><ins>+ HashMap<AtomicString, std::unique_ptr<PendingElements>> m_pendingResources; // Resources that are pending.
+ HashMap<AtomicString, std::unique_ptr<PendingElements>> m_pendingResourcesForRemoval; // Resources that are pending and scheduled for removal.
</ins><span class="cx"> HashMap<SVGElement*, std::unique_ptr<HashSet<SVGElement*>>> m_elementDependencies;
</span><span class="cx"> std::unique_ptr<SVGResourcesCache> m_resourcesCache;
</span><span class="cx">
</span><span class="lines">@@ -93,19 +93,19 @@
</span><span class="cx"> // which are referenced by any object in the SVG document, but do NOT exist yet.
</span><span class="cx"> // For instance, dynamically build gradients / patterns / clippers...
</span><span class="cx"> void addPendingResource(const AtomicString& id, Element*);
</span><del>- bool hasPendingResource(const AtomicString& id) const;
- bool isElementPendingResources(Element*) const;
- bool isElementPendingResource(Element*, const AtomicString& id) const;
</del><ins>+ bool isIdOfPendingResource(const AtomicString& id) const;
+ bool isPendingResource(Element*, const AtomicString& id) const;
</ins><span class="cx"> void clearHasPendingResourcesIfPossible(Element*);
</span><span class="cx"> void removeElementFromPendingResources(Element*);
</span><del>- std::unique_ptr<SVGPendingElements> removePendingResource(const AtomicString& id);
</del><ins>+ std::unique_ptr<PendingElements> removePendingResource(const AtomicString& id);
</ins><span class="cx">
</span><span class="cx"> // The following two functions are used for scheduling a pending resource to be removed.
</span><span class="cx"> void markPendingResourcesForRemoval(const AtomicString&);
</span><del>- Element* removeElementFromPendingResourcesForRemoval(const AtomicString&);
</del><ins>+ Element* removeElementFromPendingResourcesForRemovalMap(const AtomicString&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- std::unique_ptr<SVGPendingElements> removePendingResourceForRemoval(const AtomicString&);
</del><ins>+ bool isElementWithPendingResources(Element*) const;
+ std::unique_ptr<PendingElements> removePendingResourceForRemoval(const AtomicString&);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.cpp (162118 => 162119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2014-01-16 07:37:46 UTC (rev 162118)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2014-01-16 09:09:08 UTC (rev 162119)
</span><span class="lines">@@ -1036,14 +1036,14 @@
</span><span class="cx">
</span><span class="cx"> SVGDocumentExtensions* extensions = document().accessSVGExtensions();
</span><span class="cx"> String resourceId = getIdAttribute();
</span><del>- if (!extensions->hasPendingResource(resourceId))
</del><ins>+ if (!extensions->isIdOfPendingResource(resourceId))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Mark pending resources as pending for removal.
</span><span class="cx"> extensions->markPendingResourcesForRemoval(resourceId);
</span><span class="cx">
</span><span class="cx"> // Rebuild pending resources for each client of a pending resource that is being removed.
</span><del>- while (Element* clientElement = extensions->removeElementFromPendingResourcesForRemoval(resourceId)) {
</del><ins>+ while (Element* clientElement = extensions->removeElementFromPendingResourcesForRemovalMap(resourceId)) {
</ins><span class="cx"> ASSERT(clientElement->hasPendingResources());
</span><span class="cx"> if (clientElement->hasPendingResources()) {
</span><span class="cx"> clientElement->buildPendingResource();
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGMPathElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGMPathElement.cpp (162118 => 162119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGMPathElement.cpp 2014-01-16 07:37:46 UTC (rev 162118)
+++ trunk/Source/WebCore/svg/SVGMPathElement.cpp 2014-01-16 09:09:08 UTC (rev 162119)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> Element* target = SVGURIReference::targetElementFromIRIString(href(), document(), &id);
</span><span class="cx"> if (!target) {
</span><span class="cx"> // Do not register as pending if we are already pending this resource.
</span><del>- if (document().accessSVGExtensions()->isElementPendingResource(this, id))
</del><ins>+ if (document().accessSVGExtensions()->isPendingResource(this, id))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!id.isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGTextPathElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGTextPathElement.cpp (162118 => 162119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGTextPathElement.cpp 2014-01-16 07:37:46 UTC (rev 162118)
+++ trunk/Source/WebCore/svg/SVGTextPathElement.cpp 2014-01-16 09:09:08 UTC (rev 162119)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> Element* target = SVGURIReference::targetElementFromIRIString(href(), document(), &id);
</span><span class="cx"> if (!target) {
</span><span class="cx"> // Do not register as pending if we are already pending this resource.
</span><del>- if (document().accessSVGExtensions()->isElementPendingResource(this, id))
</del><ins>+ if (document().accessSVGExtensions()->isPendingResource(this, id))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!id.isEmpty()) {
</span></span></pre></div>
<a id="trunkSourceWebCoresvganimationSVGSMILElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp (162118 => 162119)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp 2014-01-16 07:37:46 UTC (rev 162118)
+++ trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp 2014-01-16 09:09:08 UTC (rev 162119)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx">
</span><span class="cx"> if (!svgTarget) {
</span><span class="cx"> // Do not register as pending if we are already pending this resource.
</span><del>- if (document().accessSVGExtensions()->isElementPendingResource(this, id))
</del><ins>+ if (document().accessSVGExtensions()->isPendingResource(this, id))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!id.isEmpty()) {
</span></span></pre>
</div>
</div>
</body>
</html>