<!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>[191605] 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/191605">191605</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-26 15:49:50 -0700 (Mon, 26 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Null dereference loading Blink layout test editing/execCommand/insert-ordered-list-crash.html
https://bugs.webkit.org/show_bug.cgi?id=150209
<rdar://problem/23137198>
Patch by Jiewen Tan <jiewen_tan@apple.com> on 2015-10-26
Reviewed by Chris Dumez.
Source/WebCore:
This is a merge from Blink <a href="http://trac.webkit.org/projects/webkit/changeset/168006">r168006</a>:
https://codereview.chromium.org/181283002
Test: editing/execCommand/insert-ordered-list-crash.html
* editing/InsertListCommand.cpp:
(WebCore::InsertListCommand::doApply):
setEndingSelection() might change endingSelection(), we should check again.
LayoutTests:
* editing/execCommand/insert-ordered-list-crash-expected.txt: Added.
* editing/execCommand/insert-ordered-list-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="#trunkSourceWebCoreeditingInsertListCommandcpp">trunk/Source/WebCore/editing/InsertListCommand.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingexecCommandinsertorderedlistcrashexpectedtxt">trunk/LayoutTests/editing/execCommand/insert-ordered-list-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingexecCommandinsertorderedlistcrashhtml">trunk/LayoutTests/editing/execCommand/insert-ordered-list-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191604 => 191605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-26 22:03:55 UTC (rev 191604)
+++ trunk/LayoutTests/ChangeLog 2015-10-26 22:49:50 UTC (rev 191605)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-10-26 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><ins>+ Null dereference loading Blink layout test editing/execCommand/insert-ordered-list-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=150209
+ <rdar://problem/23137198>
+
+ Reviewed by Chris Dumez.
+
+ * editing/execCommand/insert-ordered-list-crash-expected.txt: Added.
+ * editing/execCommand/insert-ordered-list-crash.html: Added.
+
+2015-10-26 Jiewen Tan <jiewen_tan@apple.com>
+
</ins><span class="cx"> Null dereference loading Blink layout test editing/execCommand/insert-html-to-document-element-crash.html
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149294
</span><span class="cx"> <rdar://problem/22746657>
</span></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandinsertorderedlistcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/execCommand/insert-ordered-list-crash-expected.txt (0 => 191605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/insert-ordered-list-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/execCommand/insert-ordered-list-crash-expected.txt 2015-10-26 22:49:50 UTC (rev 191605)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Pass if not crash.
</ins></span></pre></div>
<a id="trunkLayoutTestseditingexecCommandinsertorderedlistcrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/execCommand/insert-ordered-list-crash.html (0 => 191605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/insert-ordered-list-crash.html (rev 0)
+++ trunk/LayoutTests/editing/execCommand/insert-ordered-list-crash.html 2015-10-26 22:49:50 UTC (rev 191605)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+ <script>
+ document.addEventListener("DOMContentLoaded", function () {
+ document.execCommand("SelectAll", false);
+ window.getSelection().deleteFromDocument();
+ }, true);
+
+ var count = 0;
+ document.addEventListener("DOMSubtreeModified", function () {
+ count++;
+ if (count < 3) {
+ var src = event.srcElement;
+ src.contentEditable = "true";
+ src.innerHTML = '<div></div>';
+ document.execCommand('InsertOrderedList', false, false);
+ }
+ else if (count == 6)
+ document.write('Pass if not crash.')
+ }, false);
+
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ </script>
+ <h5>
+ aa
+ <textarea></textarea>
+ </h5>
+ <dl>
+ aa
+ </dl>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (191604 => 191605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-26 22:03:55 UTC (rev 191604)
+++ trunk/Source/WebCore/ChangeLog 2015-10-26 22:49:50 UTC (rev 191605)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-10-26 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><ins>+ Null dereference loading Blink layout test editing/execCommand/insert-ordered-list-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=150209
+ <rdar://problem/23137198>
+
+ Reviewed by Chris Dumez.
+
+ This is a merge from Blink r168006:
+ https://codereview.chromium.org/181283002
+
+ Test: editing/execCommand/insert-ordered-list-crash.html
+
+ * editing/InsertListCommand.cpp:
+ (WebCore::InsertListCommand::doApply):
+ setEndingSelection() might change endingSelection(), we should check again.
+
+2015-10-26 Jiewen Tan <jiewen_tan@apple.com>
+
</ins><span class="cx"> Null dereference loading Blink layout test editing/execCommand/insert-html-to-document-element-crash.html
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149294
</span><span class="cx"> <rdar://problem/22746657>
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingInsertListCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/InsertListCommand.cpp (191604 => 191605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/InsertListCommand.cpp 2015-10-26 22:03:55 UTC (rev 191604)
+++ trunk/Source/WebCore/editing/InsertListCommand.cpp 2015-10-26 22:49:50 UTC (rev 191605)
</span><span class="lines">@@ -127,8 +127,11 @@
</span><span class="cx"> // FIXME: We paint the gap before some paragraphs that are indented with left
</span><span class="cx"> // margin/padding, but not others. We should make the gap painting more consistent and
</span><span class="cx"> // then use a left margin/padding rule here.
</span><del>- if (visibleEnd != visibleStart && isStartOfParagraph(visibleEnd, CanSkipOverEditingBoundary))
</del><ins>+ if (visibleEnd != visibleStart && isStartOfParagraph(visibleEnd, CanSkipOverEditingBoundary)) {
</ins><span class="cx"> setEndingSelection(VisibleSelection(visibleStart, visibleEnd.previous(CannotCrossEditingBoundary), endingSelection().isDirectional()));
</span><ins>+ if (!endingSelection().rootEditableElement())
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> auto& listTag = (m_type == OrderedList) ? olTag : ulTag;
</span><span class="cx"> if (endingSelection().isRange()) {
</span></span></pre>
</div>
</div>
</body>
</html>