<!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>[150469] 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/150469">150469</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2013-05-21 12:34:31 -0700 (Tue, 21 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>dispatchEvent call can execute javascript and blow away endRoot from underneath
https://bugs.webkit.org/show_bug.cgi?id=116483

Source/WebCore: 

Reviewed by Andreas Kling.
        
Merge https://chromium.googlesource.com/chromium/blink/+/798cba0af9b2aff21e475e2e08ea3ca5e97dfc2c.

Test: editing/undo/undo-after-event-edited.html

* editing/Editor.cpp:
(WebCore::dispatchEditableContentChangedEvents):

LayoutTests: 

Reviewed by Andreas Kling.

Add a regression test.

* editing/undo/undo-after-event-edited-expected.txt: Added.
* editing/undo/undo-after-event-edited.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="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingundoundoaftereventeditedexpectedtxt">trunk/LayoutTests/editing/undo/undo-after-event-edited-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingundoundoaftereventeditedhtml">trunk/LayoutTests/editing/undo/undo-after-event-edited.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (150468 => 150469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-05-21 19:32:07 UTC (rev 150468)
+++ trunk/LayoutTests/ChangeLog        2013-05-21 19:34:31 UTC (rev 150469)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-05-20  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
+        dispatchEvent call can execute javascript and blow away endRoot from underneath
+        https://bugs.webkit.org/show_bug.cgi?id=116483
+
+        Reviewed by Andreas Kling.
+
+        Add a regression test.
+
+        * editing/undo/undo-after-event-edited-expected.txt: Added.
+        * editing/undo/undo-after-event-edited.html: Added.
+
</ins><span class="cx"> 2013-05-21  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         media/track/track-cue-rendering-snap-to-lines-not-set.html is failing
</span></span></pre></div>
<a id="trunkLayoutTestseditingundoundoaftereventeditedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/undo/undo-after-event-edited-expected.txt (0 => 150469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/undo/undo-after-event-edited-expected.txt                                (rev 0)
+++ trunk/LayoutTests/editing/undo/undo-after-event-edited-expected.txt        2013-05-21 19:34:31 UTC (rev 150469)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Pass. Test didn't crash.
</ins></span></pre></div>
<a id="trunkLayoutTestseditingundoundoaftereventeditedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/undo/undo-after-event-edited.html (0 => 150469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/undo/undo-after-event-edited.html                                (rev 0)
+++ trunk/LayoutTests/editing/undo/undo-after-event-edited.html        2013-05-21 19:34:31 UTC (rev 150469)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;style&gt;
+* { display:run-in; }
+.collapse { visibility:collapse; }
+&lt;/style&gt;
+&lt;script&gt;
+
+if (window.testRunner) {
+    window.testRunner.dumpAsText();
+    window.testRunner.waitUntilDone();
+}
+
+document.designMode = &quot;on&quot;;
+var scriptElements = document.getElementsByTagName(&quot;script&quot;);
+scriptElements[0].parentNode.removeChild(scriptElements[0]);
+var eventHandlerActive = false;
+
+document.addEventListener(&quot;webkitEditableContentChanged&quot;, function () {
+    if (eventHandlerActive)
+        return;
+    eventHandlerActive = true;
+    var srcElement = event.srcElement;
+    document.execCommand('InsertText',false,'dummy text');
+    srcElement.textContent = &quot;Pass. Test didn't crash.&quot;;
+    eventHandlerActive = false;
+    if (window.testRunner)
+        testRunner.notifyDone();
+}, true);
+
+document.addEventListener(&quot;DOMCharacterDataModified&quot;, function () {
+    document.execCommand('InsertParagraph',false,false);
+}, false);
+
+setTimeout(function() {
+  document.execCommand(&quot;SelectAll&quot;, false)
+  var documentFragment = getSelection().getRangeAt(0).extractContents();
+  document.execCommand('Undo', false);
+}, 1);
+
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;table class=&quot;collapse&quot;&gt;
+&lt;caption&gt;
+original text
+&lt;/caption&gt;
+&lt;/table&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (150468 => 150469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-21 19:32:07 UTC (rev 150468)
+++ trunk/Source/WebCore/ChangeLog        2013-05-21 19:34:31 UTC (rev 150469)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-05-20  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
+
+        dispatchEvent call can execute javascript and blow away endRoot from underneath
+        https://bugs.webkit.org/show_bug.cgi?id=116483
+
+        Reviewed by Andreas Kling.
+        
+        Merge https://chromium.googlesource.com/chromium/blink/+/798cba0af9b2aff21e475e2e08ea3ca5e97dfc2c.
+
+        Test: editing/undo/undo-after-event-edited.html
+
+        * editing/Editor.cpp:
+        (WebCore::dispatchEditableContentChangedEvents):
+
</ins><span class="cx"> 2013-05-21  Antti Koivisto  &lt;antti@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove ContentDistribution
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (150468 => 150469)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp        2013-05-21 19:32:07 UTC (rev 150468)
+++ trunk/Source/WebCore/editing/Editor.cpp        2013-05-21 19:34:31 UTC (rev 150469)
</span><span class="lines">@@ -831,8 +831,10 @@
</span><span class="cx">     applyCommand(IndentOutdentCommand::create(m_frame-&gt;document(), IndentOutdentCommand::Outdent));
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void dispatchEditableContentChangedEvents(Element* startRoot, Element* endRoot)
</del><ins>+static void dispatchEditableContentChangedEvents(RefPtr&lt;Element&gt; prpStartRoot, PassRefPtr&lt;Element&gt; prpEndRoot)
</ins><span class="cx"> {
</span><ins>+    RefPtr&lt;Element&gt; startRoot = prpStartRoot;
+    RefPtr&lt;Element&gt; endRoot = prpEndRoot;
</ins><span class="cx">     if (startRoot)
</span><span class="cx">         startRoot-&gt;dispatchEvent(Event::create(eventNames().webkitEditableContentChangedEvent, false, false), IGNORE_EXCEPTION);
</span><span class="cx">     if (endRoot &amp;&amp; endRoot != startRoot)
</span></span></pre>
</div>
</div>

</body>
</html>