<!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>[170519] 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/170519">170519</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-26 22:33:01 -0700 (Thu, 26 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/170287">r170287</a>): SVGDocumentExtensions::rebuildElements() called on removed element
https://bugs.webkit.org/show_bug.cgi?id=134304
Patch by Jeongeun Kim <je_julie.kim@samsung.com> on 2014-06-26
Reviewed by Daniel Bates.
Roll out <http://trac.webkit.org/170287> (https://bugs.webkit.org/show_bug.cgi?id=134186)
as it led to SVGDocumentExtensions::rebuildElements() being called on an element(s) that
may no longer be in the document.
* dom/ContainerNode.cpp:
(WebCore::ContainerNode::removeChild):
(WebCore::ContainerNode::removeChildren):
* dom/Document.cpp:
(WebCore::Document::commonTeardown):
(WebCore::Document::implicitClose):
* history/CachedFrame.cpp:
(WebCore::CachedFrameBase::restore):
* svg/SVGDocumentExtensions.cpp:
(WebCore::SVGDocumentExtensions::startAnimations):
(WebCore::SVGDocumentExtensions::pauseAnimations):
(WebCore::SVGDocumentExtensions::unpauseAnimations):
(WebCore::SVGDocumentExtensions::dispatchSVGLoadEventToOutermostSVGElements):
(WebCore::SVGDocumentExtensions::rebuildElements):
* svg/SVGDocumentExtensions.h:</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="#trunkSourceWebCorehistoryCachedFramecpp">trunk/Source/WebCore/history/CachedFrame.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170518 => 170519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-27 04:31:25 UTC (rev 170518)
+++ trunk/Source/WebCore/ChangeLog 2014-06-27 05:33:01 UTC (rev 170519)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-06-26 Jeongeun Kim <je_julie.kim@samsung.com>
+
+ REGRESSION (r170287): SVGDocumentExtensions::rebuildElements() called on removed element
+ https://bugs.webkit.org/show_bug.cgi?id=134304
+
+ Reviewed by Daniel Bates.
+
+ Roll out <http://trac.webkit.org/170287> (https://bugs.webkit.org/show_bug.cgi?id=134186)
+ as it led to SVGDocumentExtensions::rebuildElements() being called on an element(s) that
+ may no longer be in the document.
+
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::removeChild):
+ (WebCore::ContainerNode::removeChildren):
+ * dom/Document.cpp:
+ (WebCore::Document::commonTeardown):
+ (WebCore::Document::implicitClose):
+ * history/CachedFrame.cpp:
+ (WebCore::CachedFrameBase::restore):
+ * svg/SVGDocumentExtensions.cpp:
+ (WebCore::SVGDocumentExtensions::startAnimations):
+ (WebCore::SVGDocumentExtensions::pauseAnimations):
+ (WebCore::SVGDocumentExtensions::unpauseAnimations):
+ (WebCore::SVGDocumentExtensions::dispatchSVGLoadEventToOutermostSVGElements):
+ (WebCore::SVGDocumentExtensions::rebuildElements):
+ * svg/SVGDocumentExtensions.h:
+
</ins><span class="cx"> 2014-06-26 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Pinch-zoom shadows can overlap headers and footers
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (170518 => 170519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp 2014-06-27 04:31:25 UTC (rev 170518)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp 2014-06-27 05:33:01 UTC (rev 170519)
</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().svgExtensions()->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().svgExtensions()->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 (170518 => 170519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-06-27 04:31:25 UTC (rev 170518)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-06-27 05:33:01 UTC (rev 170519)
</span><span class="lines">@@ -691,7 +691,7 @@
</span><span class="cx"> void Document::commonTeardown()
</span><span class="cx"> {
</span><span class="cx"> if (svgExtensions())
</span><del>- svgExtensions()->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">@@ -2386,7 +2386,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>- svgExtensions()->dispatchSVGLoadEventToOutermostSVGElements();
</del><ins>+ accessSVGExtensions()->dispatchSVGLoadEventToOutermostSVGElements();
</ins><span class="cx">
</span><span class="cx"> dispatchWindowLoadEvent();
</span><span class="cx"> enqueuePageshowEvent(PageshowEventNotPersisted);
</span><span class="lines">@@ -2451,7 +2451,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> if (svgExtensions())
</span><del>- svgExtensions()->startAnimations();
</del><ins>+ accessSVGExtensions()->startAnimations();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::setParsing(bool b)
</span></span></pre></div>
<a id="trunkSourceWebCorehistoryCachedFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/history/CachedFrame.cpp (170518 => 170519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/history/CachedFrame.cpp 2014-06-27 04:31:25 UTC (rev 170518)
+++ trunk/Source/WebCore/history/CachedFrame.cpp 2014-06-27 05:33:01 UTC (rev 170519)
</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->svgExtensions()->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="trunkSourceWebCoresvgSVGDocumentExtensionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp (170518 => 170519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp 2014-06-27 04:31:25 UTC (rev 170518)
+++ trunk/Source/WebCore/svg/SVGDocumentExtensions.cpp 2014-06-27 05:33:01 UTC (rev 170519)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> return m_resources.get(id);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGDocumentExtensions::startAnimations() const
</del><ins>+void SVGDocumentExtensions::startAnimations()
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Eventually every "Time Container" will need a way to latch on to some global timer
</span><span class="cx"> // starting animations for a document will do this "latching"
</span><span class="lines">@@ -100,21 +100,21 @@
</span><span class="cx"> (*it)->timeContainer()->begin();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGDocumentExtensions::pauseAnimations() const
</del><ins>+void SVGDocumentExtensions::pauseAnimations()
</ins><span class="cx"> {
</span><span class="cx"> auto end = m_timeContainers.end();
</span><span class="cx"> for (auto it = m_timeContainers.begin(); it != end; ++it)
</span><span class="cx"> (*it)->pauseAnimations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGDocumentExtensions::unpauseAnimations() const
</del><ins>+void SVGDocumentExtensions::unpauseAnimations()
</ins><span class="cx"> {
</span><span class="cx"> auto end = m_timeContainers.end();
</span><span class="cx"> for (auto it = m_timeContainers.begin(); it != end; ++it)
</span><span class="cx"> (*it)->unpauseAnimations();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGDocumentExtensions::dispatchSVGLoadEventToOutermostSVGElements() const
</del><ins>+void SVGDocumentExtensions::dispatchSVGLoadEventToOutermostSVGElements()
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<SVGSVGElement>> timeContainers;
</span><span class="cx"> timeContainers.appendRange(m_timeContainers.begin(), m_timeContainers.end());
</span><span class="lines">@@ -332,7 +332,7 @@
</span><span class="cx"> m_elementDependencies.remove(*it);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SVGDocumentExtensions::rebuildElements() const
</del><ins>+void SVGDocumentExtensions::rebuildElements()
</ins><span class="cx"> {
</span><span class="cx"> Vector<SVGElement*> shadowRebuildElements = std::move(m_rebuildElements);
</span><span class="cx"> for (auto* element : shadowRebuildElements)
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGDocumentExtensionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGDocumentExtensions.h (170518 => 170519)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGDocumentExtensions.h 2014-06-27 04:31:25 UTC (rev 170518)
+++ trunk/Source/WebCore/svg/SVGDocumentExtensions.h 2014-06-27 05:33:01 UTC (rev 170519)
</span><span class="lines">@@ -53,10 +53,10 @@
</span><span class="cx"> void removeResource(const AtomicString& id);
</span><span class="cx"> RenderSVGResourceContainer* resourceById(const AtomicString& id) const;
</span><span class="cx">
</span><del>- void startAnimations() const;
- void pauseAnimations() const;
- void unpauseAnimations() const;
- void dispatchSVGLoadEventToOutermostSVGElements() const;
</del><ins>+ void startAnimations();
+ void pauseAnimations();
+ void unpauseAnimations();
+ void dispatchSVGLoadEventToOutermostSVGElements();
</ins><span class="cx">
</span><span class="cx"> void reportWarning(const String&);
</span><span class="cx"> void reportError(const String&);
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> void removeAllElementReferencesForTarget(SVGElement*);
</span><span class="cx">
</span><span class="cx"> void clearTargetDependencies(SVGElement&);
</span><del>- void rebuildElements() const;
</del><ins>+ void rebuildElements();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SVG_FONTS)
</span><span class="cx"> const HashSet<SVGFontFaceElement*>& svgFontFaceElements() const { return m_svgFontFaceElements; }
</span></span></pre>
</div>
</div>
</body>
</html>