<!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>[146853] trunk</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/146853">146853</a></dd>
<dt>Author</dt> <dd>morrita@google.com</dd>
<dt>Date</dt> <dd>2013-03-25 23:39:12 -0700 (Mon, 25 Mar 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Listening touch events on ShadowRoot can crash.
https://bugs.webkit.org/show_bug.cgi?id=113035

Reviewed by Kentaro Hara.

Source/WebCore:

TreeScope destructor clears a document reference on ShadowRoot but
destructors of ContainerNode and Node assumed it being available
and tried to access it for some cleanup purposes.

This change extracts such cleanup to Node::willBeDeletedFrom() and
calls it from ShadowRoot dtor before the document reference gets cleared.

Test: fast/dom/shadow/shadow-root-touch-listener-crash.html

* dom/ContainerNode.cpp:
(WebCore::ContainerNode::~ContainerNode): Adopted willBeDeletedFrom()
* dom/Node.cpp:
(WebCore::Node::~Node): Adopted willBeDeletedFrom()
(WebCore::Node::willBeDeletedFrom): Extracted from Node and ContainerNode
(WebCore):
* dom/Node.h:
* dom/ShadowRoot.cpp:
(WebCore::ShadowRoot::~ShadowRoot): Adopted willBeDeletedFrom()

LayoutTests:

* fast/dom/shadow/shadow-root-touch-listener-crash-expected.txt: Added.
* fast/dom/shadow/shadow-root-touch-listener-crash.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<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="#trunkSourceWebCoredomNodecpp">trunk/Source/WebCore/dom/Node.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeh">trunk/Source/WebCore/dom/Node.h</a></li>
<li><a href="#trunkSourceWebCoredomShadowRootcpp">trunk/Source/WebCore/dom/ShadowRoot.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomshadowshadowroottouchlistenercrashexpectedtxt">trunk/LayoutTests/fast/dom/shadow/shadow-root-touch-listener-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomshadowshadowroottouchlistenercrashhtml">trunk/LayoutTests/fast/dom/shadow/shadow-root-touch-listener-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (146852 => 146853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-03-26 06:35:49 UTC (rev 146852)
+++ trunk/LayoutTests/ChangeLog        2013-03-26 06:39:12 UTC (rev 146853)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-03-22  Hajime Morrita  &lt;morrita@google.com&gt;
+
+        Listening touch events on ShadowRoot can crash.
+        https://bugs.webkit.org/show_bug.cgi?id=113035
+
+        Reviewed by Kentaro Hara.
+
+        * fast/dom/shadow/shadow-root-touch-listener-crash-expected.txt: Added.
+        * fast/dom/shadow/shadow-root-touch-listener-crash.html: Added.
+
</ins><span class="cx"> 2013-03-25  James Robinson  &lt;jamesr@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Update a few more chromium compositor baselines.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomshadowshadowroottouchlistenercrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/shadow/shadow-root-touch-listener-crash-expected.txt (0 => 146853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/shadow/shadow-root-touch-listener-crash-expected.txt                                (rev 0)
+++ trunk/LayoutTests/fast/dom/shadow/shadow-root-touch-listener-crash-expected.txt        2013-03-26 06:39:12 UTC (rev 146853)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Tests to ensure that event dispatching behaves as the Shadow DOM spec describes.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+PASS unless crash
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomshadowshadowroottouchlistenercrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/shadow/shadow-root-touch-listener-crash.html (0 => 146853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/shadow/shadow-root-touch-listener-crash.html                                (rev 0)
+++ trunk/LayoutTests/fast/dom/shadow/shadow-root-touch-listener-crash.html        2013-03-26 06:39:12 UTC (rev 146853)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;body&gt;
+&lt;script src=&quot;../../js/resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;resources/shadow-dom.js&quot;&gt;&lt;/script&gt;
+&lt;script src=&quot;resources/event-dispatching.js&quot;&gt;&lt;/script&gt;
+&lt;div id=target&gt;&lt;/div&gt;
+&lt;script&gt;
+jsTestIsAsync = true;
+
+function addTouchEventListeners(name)
+{
+    var node = getNodeInShadowTreeStack(name);
+    node.addEventListener('touchstart', recordEvent, false);
+}
+
+target.appendChild(
+    createDOM('div', {'id': 'A'},
+          createShadowRoot()));
+addTouchEventListeners('A/');
+
+setTimeout(function() {
+    target.parentNode.removeChild(target);
+    gc();
+    debug(&quot;PASS unless crash&quot;);
+    finishJSTest();
+}, 0);
+&lt;/script&gt;
+&lt;script src=&quot;../../js/resources/js-test-post.js&quot;&gt;&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (146852 => 146853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-03-26 06:35:49 UTC (rev 146852)
+++ trunk/Source/WebCore/ChangeLog        2013-03-26 06:39:12 UTC (rev 146853)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-03-22  Hajime Morrita  &lt;morrita@google.com&gt;
+
+        Listening touch events on ShadowRoot can crash.
+        https://bugs.webkit.org/show_bug.cgi?id=113035
+
+        Reviewed by Kentaro Hara.
+
+        TreeScope destructor clears a document reference on ShadowRoot but
+        destructors of ContainerNode and Node assumed it being available
+        and tried to access it for some cleanup purposes.
+
+        This change extracts such cleanup to Node::willBeDeletedFrom() and
+        calls it from ShadowRoot dtor before the document reference gets cleared.
+
+        Test: fast/dom/shadow/shadow-root-touch-listener-crash.html
+
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::~ContainerNode): Adopted willBeDeletedFrom()
+        * dom/Node.cpp:
+        (WebCore::Node::~Node): Adopted willBeDeletedFrom()
+        (WebCore::Node::willBeDeletedFrom): Extracted from Node and ContainerNode
+        (WebCore):
+        * dom/Node.h:
+        * dom/ShadowRoot.cpp:
+        (WebCore::ShadowRoot::~ShadowRoot): Adopted willBeDeletedFrom()
+
</ins><span class="cx"> 2013-03-25  Hajime Morrita  &lt;morrita@google.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Custom Elements Refactoring: The name V8CustomElement is confusing.
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.cpp (146852 => 146853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.cpp        2013-03-26 06:35:49 UTC (rev 146852)
+++ trunk/Source/WebCore/dom/ContainerNode.cpp        2013-03-26 06:39:12 UTC (rev 146853)
</span><span class="lines">@@ -138,11 +138,8 @@
</span><span class="cx"> 
</span><span class="cx"> ContainerNode::~ContainerNode()
</span><span class="cx"> {
</span><del>-    if (documentInternal()) {
-        if (AXObjectCache* cache = documentInternal()-&gt;existingAXObjectCache())
-            cache-&gt;remove(this);
-    }
-
</del><ins>+    if (Document* document = documentInternal())
+        willBeDeletedFrom(document);
</ins><span class="cx">     removeDetachedChildren();
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.cpp (146852 => 146853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.cpp        2013-03-26 06:35:49 UTC (rev 146852)
+++ trunk/Source/WebCore/dom/Node.cpp        2013-03-26 06:39:12 UTC (rev 146853)
</span><span class="lines">@@ -418,24 +418,14 @@
</span><span class="cx">     if (hasRareData())
</span><span class="cx">         clearRareData();
</span><span class="cx"> 
</span><del>-    Document* doc = documentInternal();
-
-    if (hasEventTargetData()) {
-#if ENABLE(TOUCH_EVENT_TRACKING)
-        if (doc)
-            doc-&gt;didRemoveEventTargetNode(this);
-#endif
-        clearEventTargetData();
-    }
-
</del><span class="cx">     if (renderer())
</span><span class="cx">         detach();
</span><span class="cx"> 
</span><del>-    if (doc &amp;&amp; !isContainerNode()) {
-        if (AXObjectCache* cache = doc-&gt;existingAXObjectCache())
-            cache-&gt;remove(this);
</del><ins>+    if (!isContainerNode()) {
+        if (Document* document = documentInternal())
+            willBeDeletedFrom(document);
</ins><span class="cx">     }
</span><del>-    
</del><ins>+
</ins><span class="cx">     if (m_previous)
</span><span class="cx">         m_previous-&gt;setNextSibling(0);
</span><span class="cx">     if (m_next)
</span><span class="lines">@@ -446,6 +436,22 @@
</span><span class="cx">     InspectorCounters::decrementCounter(InspectorCounters::NodeCounter);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void Node::willBeDeletedFrom(Document* document)
+{
+    if (hasEventTargetData()) {
+#if ENABLE(TOUCH_EVENT_TRACKING)
+        if (document)
+            document-&gt;didRemoveEventTargetNode(this);
+#endif
+        clearEventTargetData();
+    }
+
+    if (document) {
+        if (AXObjectCache* cache = document-&gt;existingAXObjectCache())
+            cache-&gt;remove(this);
+    }
+}
+
</ins><span class="cx"> NodeRareData* Node::rareData() const
</span><span class="cx"> {
</span><span class="cx">     ASSERT(hasRareData());
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Node.h (146852 => 146853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Node.h        2013-03-26 06:35:49 UTC (rev 146852)
+++ trunk/Source/WebCore/dom/Node.h        2013-03-26 06:39:12 UTC (rev 146853)
</span><span class="lines">@@ -176,6 +176,7 @@
</span><span class="cx">     static StyleChange diff(const RenderStyle*, const RenderStyle*, Document*);
</span><span class="cx"> 
</span><span class="cx">     virtual ~Node();
</span><ins>+    void willBeDeletedFrom(Document*);
</ins><span class="cx"> 
</span><span class="cx">     // DOM methods &amp; attributes for Node
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoredomShadowRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ShadowRoot.cpp (146852 => 146853)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ShadowRoot.cpp        2013-03-26 06:35:49 UTC (rev 146852)
+++ trunk/Source/WebCore/dom/ShadowRoot.cpp        2013-03-26 06:39:12 UTC (rev 146853)
</span><span class="lines">@@ -77,6 +77,12 @@
</span><span class="cx">     ASSERT(!m_prev);
</span><span class="cx">     ASSERT(!m_next);
</span><span class="cx"> 
</span><ins>+    // We cannot let ContainerNode destructor call willBeDeletedFrom()
+    // for this ShadowRoot instance because TreeScope destructor
+    // clears Node::m_treeScope thus ContainerNode is no longer able
+    // to access it Document reference after that.
+    willBeDeletedFrom(documentInternal());
+
</ins><span class="cx">     // We must remove all of our children first before the TreeScope destructor
</span><span class="cx">     // runs so we don't go through TreeScopeAdopter for each child with a
</span><span class="cx">     // destructed tree scope in each descendant.
</span></span></pre>
</div>
</div>

</body>
</html>