<!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>[173883] 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/173883">173883</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2014-09-23 11:44:41 -0700 (Tue, 23 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Have Document::accessSVGExtensions() return a reference
https://bugs.webkit.org/show_bug.cgi?id=137030
Reviewed by Ryosuke Niwa.
Have Document::accessSVGExtensions() return a reference instead of a
pointer as it can never return null.
No new tests, no behavior change.
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::removeChild):
(WebCore::ContainerNode::removeChildren):
* dom/Document.cpp:
(WebCore::Document::commonTeardown):
(WebCore::Document::implicitClose):
(WebCore::Document::accessSVGExtensions):
* dom/Document.h:
* dom/Element.cpp:
(WebCore::Element::~Element):
(WebCore::Element::removedFrom):
* editing/markup.cpp:
(WebCore::isPlainTextMarkup):
* history/CachedFrame.cpp:
(WebCore::CachedFrameBase::restore):
* rendering/FilterEffectRenderer.cpp:
(WebCore::FilterEffectRenderer::buildReferenceFilter):
* rendering/svg/RenderSVGResource.cpp:
(WebCore::removeFromCacheAndInvalidateDependencies):
* rendering/svg/RenderSVGResourceContainer.cpp:
(WebCore::svgExtensionsFromElement):
* rendering/svg/RenderSVGResourceContainer.h:
(WebCore::getRenderSVGResourceContainerById):
(WebCore::getRenderSVGResourceById):
* rendering/svg/SVGResources.cpp:
(WebCore::registerPendingResource):
(WebCore::SVGResources::buildCachedResources):
* rendering/svg/SVGResourcesCache.cpp:
(WebCore::resourcesCacheFromRenderer):
(WebCore::SVGResourcesCache::resourceDestroyed):
* svg/SVGElement.cpp:
(WebCore::SVGElement::~SVGElement):
(WebCore::SVGElement::reportAttributeParsingError):
(WebCore::SVGElement::removedFrom):
(WebCore::SVGElement::viewportElement):
(WebCore::SVGElement::attributeChanged):
(WebCore::SVGElement::buildPendingResourcesIfNeeded):
(WebCore::SVGElement::accessDocumentSVGExtensions): Deleted.
* svg/SVGElement.h:
* svg/SVGFEConvolveMatrixElement.cpp:
(WebCore::SVGFEConvolveMatrixElement::parseAttribute):
* svg/SVGFEGaussianBlurElement.cpp:
(WebCore::SVGFEGaussianBlurElement::parseAttribute):
* svg/SVGFEImageElement.cpp:
(WebCore::SVGFEImageElement::clearResourceReferences):
(WebCore::SVGFEImageElement::buildPendingResource):
* svg/SVGFitToViewBox.cpp:
(WebCore::SVGFitToViewBox::parseViewBox):
* svg/SVGFontFaceElement.cpp:
(WebCore::SVGFontFaceElement::insertedInto):
(WebCore::SVGFontFaceElement::removedFrom):
* svg/SVGMPathElement.cpp:
(WebCore::SVGMPathElement::buildPendingResource):
(WebCore::SVGMPathElement::clearResourceReferences):
* svg/SVGPathElement.cpp:
(WebCore::SVGPathElement::parseAttribute):
(WebCore::SVGPathElement::invalidateMPathDependencies):
* svg/SVGPolyElement.cpp:
(WebCore::SVGPolyElement::parseAttribute):
* svg/SVGSVGElement.cpp:
(WebCore::SVGSVGElement::~SVGSVGElement):
(WebCore::SVGSVGElement::insertedInto):
(WebCore::SVGSVGElement::removedFrom):
* svg/SVGTRefElement.cpp:
(WebCore::SVGTRefElement::detachTarget):
(WebCore::SVGTRefElement::buildPendingResource):
* svg/SVGTextPathElement.cpp:
(WebCore::SVGTextPathElement::clearResourceReferences):
(WebCore::SVGTextPathElement::buildPendingResource):
* svg/SVGUseElement.cpp:
(WebCore::SVGUseElement::clearResourceReferences):
(WebCore::SVGUseElement::buildPendingResource):
(WebCore::SVGUseElement::toClipPath):
(WebCore::SVGUseElement::buildInstanceTree):
* svg/animation/SVGSMILElement.cpp:
(WebCore::SVGSMILElement::clearResourceReferences):
(WebCore::SVGSMILElement::buildPendingResource):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodecpp">trunk/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingmarkupcpp">trunk/Source/WebCore/editing/markup.cpp</a></li>
<li><a href="#trunkSourceWebCorehistoryCachedFramecpp">trunk/Source/WebCore/history/CachedFrame.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingFilterEffectRenderercpp">trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGResourcecpp">trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp</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="#trunkSourceWebCorerenderingsvgSVGResourcescpp">trunk/Source/WebCore/rendering/svg/SVGResources.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgSVGResourcesCachecpp">trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementcpp">trunk/Source/WebCore/svg/SVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGElementh">trunk/Source/WebCore/svg/SVGElement.h</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFEConvolveMatrixElementcpp">trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFEGaussianBlurElementcpp">trunk/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFEImageElementcpp">trunk/Source/WebCore/svg/SVGFEImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFitToViewBoxcpp">trunk/Source/WebCore/svg/SVGFitToViewBox.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFontFaceElementcpp">trunk/Source/WebCore/svg/SVGFontFaceElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGMPathElementcpp">trunk/Source/WebCore/svg/SVGMPathElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGPathElementcpp">trunk/Source/WebCore/svg/SVGPathElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGPolyElementcpp">trunk/Source/WebCore/svg/SVGPolyElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGSVGElementcpp">trunk/Source/WebCore/svg/SVGSVGElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGTRefElementcpp">trunk/Source/WebCore/svg/SVGTRefElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGTextPathElementcpp">trunk/Source/WebCore/svg/SVGTextPathElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementcpp">trunk/Source/WebCore/svg/SVGUseElement.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 (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/ChangeLog 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -1,3 +1,93 @@
</span><ins>+2014-09-23 Chris Dumez <cdumez@apple.com>
+
+ Have Document::accessSVGExtensions() return a reference
+ https://bugs.webkit.org/show_bug.cgi?id=137030
+
+ Reviewed by Ryosuke Niwa.
+
+ Have Document::accessSVGExtensions() return a reference instead of a
+ pointer as it can never return null.
+
+ No new tests, no behavior change.
+
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::removeChild):
+ (WebCore::ContainerNode::removeChildren):
+ * dom/Document.cpp:
+ (WebCore::Document::commonTeardown):
+ (WebCore::Document::implicitClose):
+ (WebCore::Document::accessSVGExtensions):
+ * dom/Document.h:
+ * dom/Element.cpp:
+ (WebCore::Element::~Element):
+ (WebCore::Element::removedFrom):
+ * editing/markup.cpp:
+ (WebCore::isPlainTextMarkup):
+ * history/CachedFrame.cpp:
+ (WebCore::CachedFrameBase::restore):
+ * rendering/FilterEffectRenderer.cpp:
+ (WebCore::FilterEffectRenderer::buildReferenceFilter):
+ * rendering/svg/RenderSVGResource.cpp:
+ (WebCore::removeFromCacheAndInvalidateDependencies):
+ * rendering/svg/RenderSVGResourceContainer.cpp:
+ (WebCore::svgExtensionsFromElement):
+ * rendering/svg/RenderSVGResourceContainer.h:
+ (WebCore::getRenderSVGResourceContainerById):
+ (WebCore::getRenderSVGResourceById):
+ * rendering/svg/SVGResources.cpp:
+ (WebCore::registerPendingResource):
+ (WebCore::SVGResources::buildCachedResources):
+ * rendering/svg/SVGResourcesCache.cpp:
+ (WebCore::resourcesCacheFromRenderer):
+ (WebCore::SVGResourcesCache::resourceDestroyed):
+ * svg/SVGElement.cpp:
+ (WebCore::SVGElement::~SVGElement):
+ (WebCore::SVGElement::reportAttributeParsingError):
+ (WebCore::SVGElement::removedFrom):
+ (WebCore::SVGElement::viewportElement):
+ (WebCore::SVGElement::attributeChanged):
+ (WebCore::SVGElement::buildPendingResourcesIfNeeded):
+ (WebCore::SVGElement::accessDocumentSVGExtensions): Deleted.
+ * svg/SVGElement.h:
+ * svg/SVGFEConvolveMatrixElement.cpp:
+ (WebCore::SVGFEConvolveMatrixElement::parseAttribute):
+ * svg/SVGFEGaussianBlurElement.cpp:
+ (WebCore::SVGFEGaussianBlurElement::parseAttribute):
+ * svg/SVGFEImageElement.cpp:
+ (WebCore::SVGFEImageElement::clearResourceReferences):
+ (WebCore::SVGFEImageElement::buildPendingResource):
+ * svg/SVGFitToViewBox.cpp:
+ (WebCore::SVGFitToViewBox::parseViewBox):
+ * svg/SVGFontFaceElement.cpp:
+ (WebCore::SVGFontFaceElement::insertedInto):
+ (WebCore::SVGFontFaceElement::removedFrom):
+ * svg/SVGMPathElement.cpp:
+ (WebCore::SVGMPathElement::buildPendingResource):
+ (WebCore::SVGMPathElement::clearResourceReferences):
+ * svg/SVGPathElement.cpp:
+ (WebCore::SVGPathElement::parseAttribute):
+ (WebCore::SVGPathElement::invalidateMPathDependencies):
+ * svg/SVGPolyElement.cpp:
+ (WebCore::SVGPolyElement::parseAttribute):
+ * svg/SVGSVGElement.cpp:
+ (WebCore::SVGSVGElement::~SVGSVGElement):
+ (WebCore::SVGSVGElement::insertedInto):
+ (WebCore::SVGSVGElement::removedFrom):
+ * svg/SVGTRefElement.cpp:
+ (WebCore::SVGTRefElement::detachTarget):
+ (WebCore::SVGTRefElement::buildPendingResource):
+ * svg/SVGTextPathElement.cpp:
+ (WebCore::SVGTextPathElement::clearResourceReferences):
+ (WebCore::SVGTextPathElement::buildPendingResource):
+ * svg/SVGUseElement.cpp:
+ (WebCore::SVGUseElement::clearResourceReferences):
+ (WebCore::SVGUseElement::buildPendingResource):
+ (WebCore::SVGUseElement::toClipPath):
+ (WebCore::SVGUseElement::buildInstanceTree):
+ * svg/animation/SVGSMILElement.cpp:
+ (WebCore::SVGSMILElement::clearResourceReferences):
+ (WebCore::SVGSMILElement::buildPendingResource):
+
</ins><span class="cx"> 2014-09-23 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Should be able to attach a debugger to a JSContext before anything is executed
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx"> if (document().svgExtensions()) {
</span><span class="cx"> Element* shadowHost = this->shadowHost();
</span><span class="cx"> if (!shadowHost || !shadowHost->hasTagName(SVGNames::useTag))
</span><del>- document().accessSVGExtensions()->rebuildElements();
</del><ins>+ document().accessSVGExtensions().rebuildElements();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> dispatchSubtreeModifiedEvent();
</span><span class="lines">@@ -670,7 +670,7 @@
</span><span class="cx"> if (document().svgExtensions()) {
</span><span class="cx"> Element* shadowHost = this->shadowHost();
</span><span class="cx"> if (!shadowHost || !shadowHost->hasTagName(SVGNames::useTag))
</span><del>- document().accessSVGExtensions()->rebuildElements();
</del><ins>+ document().accessSVGExtensions().rebuildElements();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> dispatchSubtreeModifiedEvent();
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -693,7 +693,7 @@
</span><span class="cx"> void Document::commonTeardown()
</span><span class="cx"> {
</span><span class="cx"> if (svgExtensions())
</span><del>- accessSVGExtensions()->pauseAnimations();
</del><ins>+ accessSVGExtensions().pauseAnimations();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(REQUEST_ANIMATION_FRAME)
</span><span class="cx"> clearScriptedAnimationController();
</span><span class="lines">@@ -2440,7 +2440,7 @@
</span><span class="cx"> // here, instead of doing it from SVGElement::finishedParsingChildren (if externalResourcesRequired="false",
</span><span class="cx"> // which is the default, for ='true' its fired at a later time, once all external resources finished loading).
</span><span class="cx"> if (svgExtensions())
</span><del>- accessSVGExtensions()->dispatchSVGLoadEventToOutermostSVGElements();
</del><ins>+ accessSVGExtensions().dispatchSVGLoadEventToOutermostSVGElements();
</ins><span class="cx">
</span><span class="cx"> dispatchWindowLoadEvent();
</span><span class="cx"> enqueuePageshowEvent(PageshowEventNotPersisted);
</span><span class="lines">@@ -2505,7 +2505,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (svgExtensions())
</span><del>- accessSVGExtensions()->startAnimations();
</del><ins>+ accessSVGExtensions().startAnimations();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::setParsing(bool b)
</span><span class="lines">@@ -4464,11 +4464,11 @@
</span><span class="cx"> return m_svgExtensions.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SVGDocumentExtensions* Document::accessSVGExtensions()
</del><ins>+SVGDocumentExtensions& Document::accessSVGExtensions()
</ins><span class="cx"> {
</span><span class="cx"> if (!m_svgExtensions)
</span><span class="cx"> m_svgExtensions = std::make_unique<SVGDocumentExtensions>(this);
</span><del>- return m_svgExtensions.get();
</del><ins>+ return *m_svgExtensions;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Document::hasSVGRootNode() const
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/dom/Document.h 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -1094,7 +1094,7 @@
</span><span class="cx"> virtual void removeAllEventListeners() override;
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT const SVGDocumentExtensions* svgExtensions();
</span><del>- WEBCORE_EXPORT SVGDocumentExtensions* accessSVGExtensions();
</del><ins>+ WEBCORE_EXPORT SVGDocumentExtensions& accessSVGExtensions();
</ins><span class="cx">
</span><span class="cx"> void initSecurityContext();
</span><span class="cx"> void initContentSecurityPolicy();
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/dom/Element.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> detachAllAttrNodesFromElement();
</span><span class="cx">
</span><span class="cx"> if (hasPendingResources()) {
</span><del>- document().accessSVGExtensions()->removeElementFromPendingResources(this);
</del><ins>+ document().accessSVGExtensions().removeElementFromPendingResources(this);
</ins><span class="cx"> ASSERT(!hasPendingResources());
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1410,7 +1410,7 @@
</span><span class="cx"> ContainerNode::removedFrom(insertionPoint);
</span><span class="cx">
</span><span class="cx"> if (hasPendingResources())
</span><del>- document().accessSVGExtensions()->removeElementFromPendingResources(this);
</del><ins>+ document().accessSVGExtensions().removeElementFromPendingResources(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Element::unregisterNamedFlowContentElement()
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingmarkupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/markup.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/markup.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/editing/markup.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -746,7 +746,7 @@
</span><span class="cx"> if (!isHTMLDivElement(node))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- HTMLDivElement& element = toHTMLDivElement(*node);
</del><ins>+ HTMLDivElement& element = downcast<HTMLDivElement>(*node);
</ins><span class="cx"> if (element.hasAttributes())
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> m_cachedFrameScriptData->restore(frame);
</span><span class="cx">
</span><span class="cx"> if (m_document->svgExtensions())
</span><del>- m_document->accessSVGExtensions()->unpauseAnimations();
</del><ins>+ m_document->accessSVGExtensions().unpauseAnimations();
</ins><span class="cx">
</span><span class="cx"> frame.animation().resumeAnimationsForDocument(m_document.get());
</span><span class="cx"> m_document->resumeActiveDOMObjects(ActiveDOMObject::DocumentWillBecomeInactive);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFilterEffectRenderercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> PassRefPtr<FilterEffect> FilterEffectRenderer::buildReferenceFilter(RenderElement* renderer, PassRefPtr<FilterEffect> previousEffect, ReferenceFilterOperation* filterOperation)
</span><span class="cx"> {
</span><span class="cx"> if (!renderer)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> Document* document = &renderer->document();
</span><span class="cx">
</span><span class="lines">@@ -100,15 +100,15 @@
</span><span class="cx"> document = cachedSVGDocument->document();
</span><span class="cx">
</span><span class="cx"> if (!document)
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><span class="cx"> Element* filter = document->getElementById(filterOperation->fragment());
</span><span class="cx"> if (!filter) {
</span><span class="cx"> // Although we did not find the referenced filter, it might exist later in the document.
</span><span class="cx"> // FIXME: This skips anonymous RenderObjects. <https://webkit.org/b/131085>
</span><span class="cx"> if (Element* element = renderer->element())
</span><del>- document->accessSVGExtensions()->addPendingResource(filterOperation->fragment(), element);
- return 0;
</del><ins>+ document->accessSVGExtensions().addPendingResource(filterOperation->fragment(), element);
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<FilterEffect> effect;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx">
</span><span class="cx"> if (!renderer.element() || !renderer.element()->isSVGElement())
</span><span class="cx"> return;
</span><del>- HashSet<SVGElement*>* dependencies = renderer.document().accessSVGExtensions()->setOfElementsReferencingTarget(downcast<SVGElement>(renderer.element()));
</del><ins>+ HashSet<SVGElement*>* dependencies = renderer.document().accessSVGExtensions().setOfElementsReferencingTarget(downcast<SVGElement>(renderer.element()));
</ins><span class="cx"> if (!dependencies)
</span><span class="cx"> return;
</span><span class="cx"> for (auto* element : *dependencies) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceContainercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -31,8 +31,7 @@
</span><span class="cx">
</span><span class="cx"> static inline SVGDocumentExtensions& svgExtensionsFromElement(SVGElement& element)
</span><span class="cx"> {
</span><del>- // FIXME: accessSVGExtensions() should return a reference.
- return *element.document().accessSVGExtensions();
</del><ins>+ return element.document().accessSVGExtensions();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderSVGResourceContainer::RenderSVGResourceContainer(SVGElement& element, PassRef<RenderStyle> style)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceContainerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceContainer.h 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -80,12 +80,12 @@
</span><span class="cx"> inline RenderSVGResourceContainer* getRenderSVGResourceContainerById(Document& document, const AtomicString& id)
</span><span class="cx"> {
</span><span class="cx"> if (id.isEmpty())
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx">
</span><del>- if (RenderSVGResourceContainer* renderResource = document.accessSVGExtensions()->resourceById(id))
</del><ins>+ if (RenderSVGResourceContainer* renderResource = document.accessSVGExtensions().resourceById(id))
</ins><span class="cx"> return renderResource;
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Renderer>
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> if (RenderSVGResourceContainer* container = getRenderSVGResourceContainerById(document, id))
</span><span class="cx"> return container->cast<Renderer>();
</span><span class="cx">
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResources.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGResources.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/rendering/svg/SVGResources.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -172,9 +172,9 @@
</span><span class="cx"> return container;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void registerPendingResource(SVGDocumentExtensions* extensions, const AtomicString& id, SVGElement& element)
</del><ins>+static inline void registerPendingResource(SVGDocumentExtensions& extensions, const AtomicString& id, SVGElement& element)
</ins><span class="cx"> {
</span><del>- extensions->addPendingResource(id, &element);
</del><ins>+ extensions.addPendingResource(id, &element);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SVGResources::buildCachedResources(const RenderElement& renderer, const SVGRenderStyle& svgStyle)
</span><span class="lines">@@ -189,8 +189,7 @@
</span><span class="cx">
</span><span class="cx"> Document& document = element.document();
</span><span class="cx">
</span><del>- SVGDocumentExtensions* extensions = document.accessSVGExtensions();
- ASSERT(extensions);
</del><ins>+ SVGDocumentExtensions& extensions = document.accessSVGExtensions();
</ins><span class="cx">
</span><span class="cx"> const AtomicString& tagName = element.localName();
</span><span class="cx"> if (tagName.isNull())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgSVGResourcesCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/rendering/svg/SVGResourcesCache.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -77,9 +77,7 @@
</span><span class="cx">
</span><span class="cx"> static inline SVGResourcesCache& resourcesCacheFromRenderer(const RenderElement& renderer)
</span><span class="cx"> {
</span><del>- SVGDocumentExtensions* extensions = renderer.document().accessSVGExtensions();
- ASSERT(extensions);
- return extensions->resourcesCache();
</del><ins>+ return renderer.document().accessSVGExtensions().resourcesCache();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SVGResources* SVGResourcesCache::cachedResourcesForRenderer(const RenderElement& renderer)
</span><span class="lines">@@ -175,9 +173,7 @@
</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><span class="cx"> Element* clientElement = it.key->element();
</span><del>- SVGDocumentExtensions* extensions = clientElement->document().accessSVGExtensions();
-
- extensions->addPendingResource(resourceElement.getIdAttribute(), clientElement);
</del><ins>+ clientElement->document().accessSVGExtensions().addPendingResource(resourceElement.getIdAttribute(), clientElement);
</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 (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -289,8 +289,8 @@
</span><span class="cx">
</span><span class="cx"> m_svgRareData = nullptr;
</span><span class="cx"> }
</span><del>- document().accessSVGExtensions()->rebuildAllElementReferencesForTarget(*this);
- document().accessSVGExtensions()->removeAllElementReferencesForTarget(this);
</del><ins>+ document().accessSVGExtensions().rebuildAllElementReferencesForTarget(*this);
+ document().accessSVGExtensions().removeAllElementReferencesForTarget(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> short SVGElement::tabIndex() const
</span><span class="lines">@@ -347,15 +347,15 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> String errorString = "<" + tagName() + "> attribute " + name.toString() + "=\"" + value + "\"";
</span><del>- SVGDocumentExtensions* extensions = document().accessSVGExtensions();
</del><ins>+ SVGDocumentExtensions& extensions = document().accessSVGExtensions();
</ins><span class="cx">
</span><span class="cx"> if (error == NegativeValueForbiddenError) {
</span><del>- extensions->reportError("Invalid negative value for " + errorString);
</del><ins>+ extensions.reportError("Invalid negative value for " + errorString);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (error == ParsingAttributeFailedError) {
</span><del>- extensions->reportError("Invalid value for " + errorString);
</del><ins>+ extensions.reportError("Invalid value for " + errorString);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -386,8 +386,8 @@
</span><span class="cx"> StyledElement::removedFrom(rootParent);
</span><span class="cx">
</span><span class="cx"> if (wasInDocument) {
</span><del>- document().accessSVGExtensions()->clearTargetDependencies(*this);
- document().accessSVGExtensions()->removeAllElementReferencesForTarget(this);
</del><ins>+ document().accessSVGExtensions().clearTargetDependencies(*this);
+ document().accessSVGExtensions().removeAllElementReferencesForTarget(this);
</ins><span class="cx"> }
</span><span class="cx"> SVGElementInstance::invalidateAllInstancesOfElement(this);
</span><span class="cx"> }
</span><span class="lines">@@ -419,13 +419,6 @@
</span><span class="cx">
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>-
-SVGDocumentExtensions* SVGElement::accessDocumentSVGExtensions()
-{
- // This function is provided for use by SVGAnimatedProperty to avoid
- // global inclusion of Document.h in SVG code.
- return document().accessSVGExtensions();
-}
</del><span class="cx">
</span><span class="cx"> void SVGElement::mapInstanceToElement(SVGElementInstance* instance)
</span><span class="cx"> {
</span><span class="lines">@@ -744,7 +737,7 @@
</span><span class="cx"> StyledElement::attributeChanged(name, oldValue, newValue);
</span><span class="cx">
</span><span class="cx"> if (name == HTMLNames::idAttr)
</span><del>- document().accessSVGExtensions()->rebuildAllElementReferencesForTarget(*this);
</del><ins>+ document().accessSVGExtensions().rebuildAllElementReferencesForTarget(*this);
</ins><span class="cx">
</span><span class="cx"> // Changes to the style attribute are processed lazily (see Element::getAttribute() and related methods),
</span><span class="cx"> // so we don't want changes to the style attribute to result in extra work here.
</span><span class="lines">@@ -1081,20 +1074,20 @@
</span><span class="cx"> if (!needsPendingResourceHandling() || !inDocument() || isInShadowTree())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- SVGDocumentExtensions* extensions = document().accessSVGExtensions();
</del><ins>+ SVGDocumentExtensions& extensions = document().accessSVGExtensions();
</ins><span class="cx"> String resourceId = getIdAttribute();
</span><del>- if (!extensions->isIdOfPendingResource(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><del>- extensions->markPendingResourcesForRemoval(resourceId);
</del><ins>+ extensions.markPendingResourcesForRemoval(resourceId);
</ins><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->removeElementFromPendingResourcesForRemovalMap(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><del>- extensions->clearHasPendingResourcesIfPossible(clientElement);
</del><ins>+ extensions.clearHasPendingResourcesIfPossible(clientElement);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGElement.h (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGElement.h 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGElement.h 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -74,8 +74,6 @@
</span><span class="cx"> void setInstanceUpdatesBlocked(bool);
</span><span class="cx"> virtual AffineTransform localCoordinateSpaceTransform(SVGLocatable::CTMScope) const;
</span><span class="cx">
</span><del>- SVGDocumentExtensions* accessDocumentSVGExtensions();
-
</del><span class="cx"> virtual bool isSVGGraphicsElement() const { return false; }
</span><span class="cx"> virtual bool isFilterEffect() const { return false; }
</span><span class="cx"> virtual bool isGradientStop() const { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFEConvolveMatrixElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGFEConvolveMatrixElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> setOrderXBaseValue(x);
</span><span class="cx"> setOrderYBaseValue(y);
</span><span class="cx"> } else
</span><del>- document().accessSVGExtensions()->reportWarning(
</del><ins>+ document().accessSVGExtensions().reportWarning(
</ins><span class="cx"> "feConvolveMatrix: problem parsing order=\"" + value
</span><span class="cx"> + "\". Filtered element will not be displayed.");
</span><span class="cx"> return;
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx"> if (propertyValue > 0)
</span><span class="cx"> setEdgeModeBaseValue(propertyValue);
</span><span class="cx"> else
</span><del>- document().accessSVGExtensions()->reportWarning(
</del><ins>+ document().accessSVGExtensions().reportWarning(
</ins><span class="cx"> "feConvolveMatrix: problem parsing edgeMode=\"" + value
</span><span class="cx"> + "\". Filtered element will not be displayed.");
</span><span class="cx"> return;
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> if (divisor)
</span><span class="cx"> setDivisorBaseValue(divisor);
</span><span class="cx"> else
</span><del>- document().accessSVGExtensions()->reportWarning(
</del><ins>+ document().accessSVGExtensions().reportWarning(
</ins><span class="cx"> "feConvolveMatrix: problem parsing divisor=\"" + value
</span><span class="cx"> + "\". Filtered element will not be displayed.");
</span><span class="cx"> return;
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> setKernelUnitLengthXBaseValue(x);
</span><span class="cx"> setKernelUnitLengthYBaseValue(y);
</span><span class="cx"> } else
</span><del>- document().accessSVGExtensions()->reportWarning(
</del><ins>+ document().accessSVGExtensions().reportWarning(
</ins><span class="cx"> "feConvolveMatrix: problem parsing kernelUnitLength=\"" + value
</span><span class="cx"> + "\". Filtered element will not be displayed.");
</span><span class="cx"> return;
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx"> else if (value == "false")
</span><span class="cx"> setPreserveAlphaBaseValue(false);
</span><span class="cx"> else
</span><del>- document().accessSVGExtensions()->reportWarning(
</del><ins>+ document().accessSVGExtensions().reportWarning(
</ins><span class="cx"> "feConvolveMatrix: problem parsing preserveAlphaAttr=\"" + value
</span><span class="cx"> + "\". Filtered element will not be displayed.");
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFEGaussianBlurElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGFEGaussianBlurElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> if (propertyValue > 0)
</span><span class="cx"> setEdgeModeBaseValue(propertyValue);
</span><span class="cx"> else
</span><del>- document().accessSVGExtensions()->reportWarning(
</del><ins>+ document().accessSVGExtensions().reportWarning(
</ins><span class="cx"> "feGaussianBlur: problem parsing edgeMode=\"" + value
</span><span class="cx"> + "\". Filtered element will not be displayed.");
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFEImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFEImageElement.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> m_cachedImage = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- document().accessSVGExtensions()->removeAllTargetReferencesForElement(this);
</del><ins>+ document().accessSVGExtensions().removeAllTargetReferencesForElement(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGFEImageElement::requestImageResource()
</span><span class="lines">@@ -100,13 +100,13 @@
</span><span class="cx"> if (id.isEmpty())
</span><span class="cx"> requestImageResource();
</span><span class="cx"> else {
</span><del>- document().accessSVGExtensions()->addPendingResource(id, this);
</del><ins>+ document().accessSVGExtensions().addPendingResource(id, this);
</ins><span class="cx"> ASSERT(hasPendingResources());
</span><span class="cx"> }
</span><span class="cx"> } else if (target->isSVGElement()) {
</span><span class="cx"> // Register us with the target in the dependencies map. Any change of hrefElement
</span><span class="cx"> // that leads to relayout/repainting now informs us, so we can react to it.
</span><del>- document().accessSVGExtensions()->addElementReferencingTarget(this, downcast<SVGElement>(target));
</del><ins>+ document().accessSVGExtensions().addElementReferencingTarget(this, downcast<SVGElement>(target));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> invalidate();
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFitToViewBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFitToViewBox.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFitToViewBox.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGFitToViewBox.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -56,21 +56,21 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> if (!valid) {
</span><del>- doc->accessSVGExtensions()->reportWarning("Problem parsing viewBox=\"" + str + "\"");
</del><ins>+ doc->accessSVGExtensions().reportWarning("Problem parsing viewBox=\"" + str + "\"");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (width < 0.0) { // check that width is positive
</span><del>- doc->accessSVGExtensions()->reportError("A negative value for ViewBox width is not allowed");
</del><ins>+ doc->accessSVGExtensions().reportError("A negative value for ViewBox width is not allowed");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> if (height < 0.0) { // check that height is positive
</span><del>- doc->accessSVGExtensions()->reportError("A negative value for ViewBox height is not allowed");
</del><ins>+ doc->accessSVGExtensions().reportError("A negative value for ViewBox height is not allowed");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx"> skipOptionalSVGSpaces(c, end);
</span><span class="cx"> if (c < end) { // nothing should come after the last, fourth number
</span><del>- doc->accessSVGExtensions()->reportWarning("Problem parsing viewBox=\"" + str + "\"");
</del><ins>+ doc->accessSVGExtensions().reportWarning("Problem parsing viewBox=\"" + str + "\"");
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontFaceElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontFaceElement.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontFaceElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGFontFaceElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -272,7 +272,7 @@
</span><span class="cx"> ASSERT(!m_fontElement);
</span><span class="cx"> return InsertionDone;
</span><span class="cx"> }
</span><del>- document().accessSVGExtensions()->registerSVGFontFaceElement(this);
</del><ins>+ document().accessSVGExtensions().registerSVGFontFaceElement(this);
</ins><span class="cx">
</span><span class="cx"> rebuildFontFace();
</span><span class="cx"> return InsertionDone;
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx">
</span><span class="cx"> if (rootParent.inDocument()) {
</span><span class="cx"> m_fontElement = 0;
</span><del>- document().accessSVGExtensions()->unregisterSVGFontFaceElement(this);
</del><ins>+ document().accessSVGExtensions().unregisterSVGFontFaceElement(this);
</ins><span class="cx"> m_fontFaceRule->mutableProperties().clear();
</span><span class="cx">
</span><span class="cx"> document().styleResolverChanged(DeferRecalcStyle);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGMPathElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGMPathElement.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGMPathElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGMPathElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -66,17 +66,17 @@
</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()->isPendingResource(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><del>- document().accessSVGExtensions()->addPendingResource(id, this);
</del><ins>+ document().accessSVGExtensions().addPendingResource(id, this);
</ins><span class="cx"> ASSERT(hasPendingResources());
</span><span class="cx"> }
</span><span class="cx"> } else if (target->isSVGElement()) {
</span><span class="cx"> // Register us with the target in the dependencies map. Any change of hrefElement
</span><span class="cx"> // that leads to relayout/repainting now informs us, so we can react to it.
</span><del>- document().accessSVGExtensions()->addElementReferencingTarget(this, downcast<SVGElement>(target));
</del><ins>+ document().accessSVGExtensions().addElementReferencingTarget(this, downcast<SVGElement>(target));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> targetPathChanged();
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> void SVGMPathElement::clearResourceReferences()
</span><span class="cx"> {
</span><del>- document().accessSVGExtensions()->removeAllTargetReferencesForElement(this);
</del><ins>+ document().accessSVGExtensions().removeAllTargetReferencesForElement(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node::InsertionNotificationRequest SVGMPathElement::insertedInto(ContainerNode& rootParent)
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGPathElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGPathElement.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGPathElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGPathElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -233,14 +233,14 @@
</span><span class="cx">
</span><span class="cx"> if (name == SVGNames::dAttr) {
</span><span class="cx"> if (!buildSVGPathByteStreamFromString(value, m_pathByteStream.get(), UnalteredParsing))
</span><del>- document().accessSVGExtensions()->reportError("Problem parsing d=\"" + value + "\"");
</del><ins>+ document().accessSVGExtensions().reportError("Problem parsing d=\"" + value + "\"");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (name == SVGNames::pathLengthAttr) {
</span><span class="cx"> setPathLengthBaseValue(value.toFloat());
</span><span class="cx"> if (pathLengthBaseValue() < 0)
</span><del>- document().accessSVGExtensions()->reportError("A negative value for path attribute <pathLength> is not allowed");
</del><ins>+ document().accessSVGExtensions().reportError("A negative value for path attribute <pathLength> is not allowed");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> {
</span><span class="cx"> // <mpath> can only reference <path> but this dependency is not handled in
</span><span class="cx"> // markForLayoutAndParentResourceInvalidation so we update any mpath dependencies manually.
</span><del>- if (HashSet<SVGElement*>* dependencies = document().accessSVGExtensions()->setOfElementsReferencingTarget(this)) {
</del><ins>+ if (HashSet<SVGElement*>* dependencies = document().accessSVGExtensions().setOfElementsReferencingTarget(this)) {
</ins><span class="cx"> for (auto* element : *dependencies) {
</span><span class="cx"> if (isSVGMPathElement(element))
</span><span class="cx"> downcast<SVGMPathElement>(*element).targetPathChanged();
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGPolyElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGPolyElement.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGPolyElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGPolyElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> if (name == SVGNames::pointsAttr) {
</span><span class="cx"> SVGPointList newList;
</span><span class="cx"> if (!pointsListFromSVGData(newList, value))
</span><del>- document().accessSVGExtensions()->reportError("Problem parsing points=\"" + value + "\"");
</del><ins>+ document().accessSVGExtensions().reportError("Problem parsing points=\"" + value + "\"");
</ins><span class="cx">
</span><span class="cx"> if (SVGAnimatedProperty* wrapper = SVGAnimatedProperty::lookupWrapper<SVGPolyElement, SVGAnimatedPointList>(this, pointsPropertyInfo()))
</span><span class="cx"> static_cast<SVGAnimatedPointList*>(wrapper)->detachListWrappers(newList.size());
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGSVGElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGSVGElement.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGSVGElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGSVGElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> document().unregisterForPageCacheSuspensionCallbacks(this);
</span><span class="cx"> // There are cases where removedFromDocument() is not called.
</span><span class="cx"> // see ContainerNode::removeAllChildren, called by its destructor.
</span><del>- document().accessSVGExtensions()->removeTimeContainer(this);
</del><ins>+ document().accessSVGExtensions().removeTimeContainer(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGSVGElement::didMoveToNewDocument(Document* oldDocument)
</span><span class="lines">@@ -481,7 +481,7 @@
</span><span class="cx"> Node::InsertionNotificationRequest SVGSVGElement::insertedInto(ContainerNode& rootParent)
</span><span class="cx"> {
</span><span class="cx"> if (rootParent.inDocument()) {
</span><del>- document().accessSVGExtensions()->addTimeContainer(this);
</del><ins>+ document().accessSVGExtensions().addTimeContainer(this);
</ins><span class="cx">
</span><span class="cx"> // Animations are started at the end of document parsing and after firing the load event,
</span><span class="cx"> // but if we miss that train (deferred programmatic element insertion for example) we need
</span><span class="lines">@@ -495,7 +495,7 @@
</span><span class="cx"> void SVGSVGElement::removedFrom(ContainerNode& rootParent)
</span><span class="cx"> {
</span><span class="cx"> if (rootParent.inDocument())
</span><del>- document().accessSVGExtensions()->removeTimeContainer(this);
</del><ins>+ document().accessSVGExtensions().removeTimeContainer(this);
</ins><span class="cx"> SVGGraphicsElement::removedFrom(rootParent);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGTRefElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGTRefElement.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGTRefElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGTRefElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx"> String id;
</span><span class="cx"> SVGURIReference::targetElementFromIRIString(href(), document(), &id);
</span><span class="cx"> if (!id.isEmpty())
</span><del>- document().accessSVGExtensions()->addPendingResource(id, this);
</del><ins>+ document().accessSVGExtensions().addPendingResource(id, this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SVGTRefElement::isSupportedAttribute(const QualifiedName& attrName)
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx"> if (id.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- document().accessSVGExtensions()->addPendingResource(id, this);
</del><ins>+ document().accessSVGExtensions().addPendingResource(id, this);
</ins><span class="cx"> ASSERT(hasPendingResources());
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGTextPathElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGTextPathElement.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGTextPathElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGTextPathElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> void SVGTextPathElement::clearResourceReferences()
</span><span class="cx"> {
</span><del>- document().accessSVGExtensions()->removeAllTargetReferencesForElement(this);
</del><ins>+ document().accessSVGExtensions().removeAllTargetReferencesForElement(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SVGTextPathElement::isSupportedAttribute(const QualifiedName& attrName)
</span><span class="lines">@@ -162,17 +162,17 @@
</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()->isPendingResource(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><del>- document().accessSVGExtensions()->addPendingResource(id, this);
</del><ins>+ document().accessSVGExtensions().addPendingResource(id, this);
</ins><span class="cx"> ASSERT(hasPendingResources());
</span><span class="cx"> }
</span><span class="cx"> } else if (target->hasTagName(SVGNames::pathTag)) {
</span><span class="cx"> // Register us with the target in the dependencies map. Any change of hrefElement
</span><span class="cx"> // that leads to relayout/repainting now informs us, so we can react to it.
</span><del>- document().accessSVGExtensions()->addElementReferencingTarget(this, downcast<SVGElement>(target));
</del><ins>+ document().accessSVGExtensions().addElementReferencingTarget(this, downcast<SVGElement>(target));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx">
</span><span class="cx"> m_needsShadowTreeRecreation = false;
</span><span class="cx">
</span><del>- document().accessSVGExtensions()->removeAllTargetReferencesForElement(this);
</del><ins>+ document().accessSVGExtensions().removeAllTargetReferencesForElement(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGUseElement::buildPendingResource()
</span><span class="lines">@@ -411,7 +411,7 @@
</span><span class="cx"> if (id.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- referencedDocument()->accessSVGExtensions()->addPendingResource(id, this);
</del><ins>+ referencedDocument()->accessSVGExtensions().addPendingResource(id, this);
</ins><span class="cx"> ASSERT(hasPendingResources());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -550,7 +550,7 @@
</span><span class="cx"> if (node->isSVGElement() && downcast<SVGElement>(*node).isSVGGraphicsElement()) {
</span><span class="cx"> if (!isDirectReference(downcast<SVGElement>(*node))) {
</span><span class="cx"> // Spec: Indirect references are an error (14.3.5)
</span><del>- document().accessSVGExtensions()->reportError("Not allowed to use indirect reference in <clip-path>");
</del><ins>+ document().accessSVGExtensions().reportError("Not allowed to use indirect reference in <clip-path>");
</ins><span class="cx"> } else {
</span><span class="cx"> toSVGGraphicsElement(*node).toClipPath(path);
</span><span class="cx"> // FIXME: Avoid manual resolution of x/y here. Its potentially harmful.
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx"> // We only need to track first degree <use> dependencies. Indirect references are handled
</span><span class="cx"> // as the invalidation bubbles up the dependency chain.
</span><span class="cx"> if (!foundUse) {
</span><del>- document().accessSVGExtensions()->addElementReferencingTarget(this, target);
</del><ins>+ document().accessSVGExtensions().addElementReferencingTarget(this, target);
</ins><span class="cx"> foundUse = true;
</span><span class="cx"> }
</span><span class="cx"> } else if (isDisallowedElement(*target)) {
</span></span></pre></div>
<a id="trunkSourceWebCoresvganimationSVGSMILElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp (173882 => 173883)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp 2014-09-23 18:38:24 UTC (rev 173882)
+++ trunk/Source/WebCore/svg/animation/SVGSMILElement.cpp 2014-09-23 18:44:41 UTC (rev 173883)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> void SVGSMILElement::clearResourceReferences()
</span><span class="cx"> {
</span><del>- document().accessSVGExtensions()->removeAllTargetReferencesForElement(this);
</del><ins>+ document().accessSVGExtensions().removeAllTargetReferencesForElement(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGSMILElement::clearTarget()
</span><span class="lines">@@ -178,17 +178,17 @@
</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()->isPendingResource(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><del>- document().accessSVGExtensions()->addPendingResource(id, this);
</del><ins>+ document().accessSVGExtensions().addPendingResource(id, this);
</ins><span class="cx"> ASSERT(hasPendingResources());
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> // Register us with the target in the dependencies map. Any change of hrefElement
</span><span class="cx"> // that leads to relayout/repainting now informs us, so we can react to it.
</span><del>- document().accessSVGExtensions()->addElementReferencingTarget(this, svgTarget);
</del><ins>+ document().accessSVGExtensions().addElementReferencingTarget(this, svgTarget);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>