<!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>[192220] releases/WebKitGTK/webkit-2.10</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/192220">192220</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-10 02:44:55 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191647">r191647</a> - Null dereference loading Blink layout test editing/execCommand/format-block-uneditable-crash.html
https://bugs.webkit.org/show_bug.cgi?id=150207
<rdar://problem/23137066>
Patch by Jiewen Tan <jiewen_tan@apple.com> on 2015-10-27
Reviewed by Enrica Casucci.
Source/WebCore:
This is a merge of Blink <a href="http://trac.webkit.org/projects/webkit/changeset/200238">r200238</a>:
https://codereview.chromium.org/1280263002
Test: editing/execCommand/format-block-uneditable-crash.html
* editing/ApplyBlockElementCommand.cpp:
(WebCore::ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded):
splitTextNode() will return early if the given text node is not editable. Hence, check
its editablity before calling the method.
LayoutTests:
* editing/execCommand/format-block-uneditable-crash-expected.txt: Added.
* editing/execCommand/format-block-uneditable-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreeditingApplyBlockElementCommandcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/ApplyBlockElementCommand.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestseditingexecCommandformatblockuneditablecrashexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/format-block-uneditable-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestseditingexecCommandformatblockuneditablecrashhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/format-block-uneditable-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (192219 => 192220)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-10 10:43:38 UTC (rev 192219)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-10 10:44:55 UTC (rev 192220)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-10-27 Jiewen Tan <jiewen_tan@apple.com>
+
+ Null dereference loading Blink layout test editing/execCommand/format-block-uneditable-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=150207
+ <rdar://problem/23137066>
+
+ Reviewed by Enrica Casucci.
+
+ * editing/execCommand/format-block-uneditable-crash-expected.txt: Added.
+ * editing/execCommand/format-block-uneditable-crash.html: Added.
+
</ins><span class="cx"> 2015-10-27 Keith Rollin <krollin@apple.com>
</span><span class="cx">
</span><span class="cx"> Do not sanitize user input for input[type=url]
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestseditingexecCommandformatblockuneditablecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/format-block-uneditable-crash-expected.txt (0 => 192220)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/format-block-uneditable-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/format-block-uneditable-crash-expected.txt 2015-11-10 10:44:55 UTC (rev 192220)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of PRE > BODY > HTML > #document to 3 of PRE > BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 1 of PRE > BODY > HTML > #document to 2 of PRE > BODY > HTML > #document toDOMRange:range from 0 of #text > H1 > PRE > BODY > HTML > #document to 3 of #text > H1 > PRE > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: webViewDidEndEditing:WebViewDidEndEditingNotification
+PASS. WebKit didn't crash.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestseditingexecCommandformatblockuneditablecrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/format-block-uneditable-crash.html (0 => 192220)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/format-block-uneditable-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/format-block-uneditable-crash.html 2015-11-10 10:44:55 UTC (rev 192220)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../editing.js"></script>
+
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function editingTest() {
+ var container = document.getElementById('sample');
+ var range = document.createRange()
+ range.setEndAfter(container.lastChild);
+ window.getSelection().addRange(range);
+ document.execCommand('formatblock', false, '<h1>');
+ document.write("PASS. WebKit didn't crash.");
+};
+</script>
+</head>
+<body onload=runEditingTest()>
+<pre id="sample" contenteditable="true">
+foo
+<div contenteditable="false">bar
+</div>
+
+</pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (192219 => 192220)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-10 10:43:38 UTC (rev 192219)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-10 10:44:55 UTC (rev 192220)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-10-27 Jiewen Tan <jiewen_tan@apple.com>
+
+ Null dereference loading Blink layout test editing/execCommand/format-block-uneditable-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=150207
+ <rdar://problem/23137066>
+
+ Reviewed by Enrica Casucci.
+
+ This is a merge of Blink r200238:
+ https://codereview.chromium.org/1280263002
+
+ Test: editing/execCommand/format-block-uneditable-crash.html
+
+ * editing/ApplyBlockElementCommand.cpp:
+ (WebCore::ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded):
+ splitTextNode() will return early if the given text node is not editable. Hence, check
+ its editablity before calling the method.
+
</ins><span class="cx"> 2015-10-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Cancel navigation policy checks like we do content policy checks.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreeditingApplyBlockElementCommandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/ApplyBlockElementCommand.cpp (192219 => 192220)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/ApplyBlockElementCommand.cpp 2015-11-10 10:43:38 UTC (rev 192219)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/ApplyBlockElementCommand.cpp 2015-11-10 10:44:55 UTC (rev 192220)
</span><span class="lines">@@ -233,8 +233,8 @@
</span><span class="cx"> m_endOfLastParagraph = end;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // If end is in the middle of a text node, split.
- if (!endStyle->collapseWhiteSpace() && end.offsetInContainerNode() && end.offsetInContainerNode() < end.containerNode()->maxCharacterOffset()) {
</del><ins>+ // If end is in the middle of a text node and the text node is editable, split.
+ if (endStyle->userModify() != READ_ONLY && !endStyle->collapseWhiteSpace() && end.offsetInContainerNode() && end.offsetInContainerNode() < end.containerNode()->maxCharacterOffset()) {
</ins><span class="cx"> RefPtr<Text> endContainer = end.containerText();
</span><span class="cx"> splitTextNode(endContainer, end.offsetInContainerNode());
</span><span class="cx"> if (isStartAndEndOnSameNode)
</span></span></pre>
</div>
</div>
</body>
</html>