<!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>[192043] 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/192043">192043</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2015-11-04 16:46:34 -0800 (Wed, 04 Nov 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Null dereference loading Blink layout test editing/execCommand/delete-hidden-crash.html
https://bugs.webkit.org/show_bug.cgi?id=149289
&lt;rdar://problem/22746352&gt;

Reviewed by Enrica Casucci.

Source/WebCore:

This is a merge of Blink <a href="http://trac.webkit.org/projects/webkit/changeset/176497">r176497</a>:
https://codereview.chromium.org/340713003

It ensures the start &amp; end positions in DeleteSelectionCommand::initializePositionData
are editable.

Test: editing/execCommand/delete-hidden-crash.html

* editing/DeleteSelectionCommand.cpp:
(WebCore::DeleteSelectionCommand::initializePositionData):
* editing/Editor.cpp:
(WebCore::Editor::advanceToNextMisspelling):
* editing/htmlediting.cpp:
(WebCore::firstEditablePositionAfterPositionInRoot):
(WebCore::lastEditablePositionBeforePositionInRoot):
These two functions don't make any sense to return VisiblePosition. Change them
to return Position instead. Since there is a viable conversion from Position to
VisiblePosition. It should not change the behavior of any other components depending
on it.
* editing/htmlediting.h:

LayoutTests:

* editing/execCommand/delete-hidden-crash-expected.txt: Added.
* editing/execCommand/delete-hidden-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="#trunkSourceWebCoreeditingDeleteSelectionCommandcpp">trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditingEditorcpp">trunk/Source/WebCore/editing/Editor.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditinghtmleditingcpp">trunk/Source/WebCore/editing/htmlediting.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditinghtmleditingh">trunk/Source/WebCore/editing/htmlediting.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingexecCommanddeletehiddencrashexpectedtxt">trunk/LayoutTests/editing/execCommand/delete-hidden-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingexecCommanddeletehiddencrashhtml">trunk/LayoutTests/editing/execCommand/delete-hidden-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192042 => 192043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-11-05 00:26:26 UTC (rev 192042)
+++ trunk/LayoutTests/ChangeLog        2015-11-05 00:46:34 UTC (rev 192043)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-11-04  Jiewen Tan  &lt;jiewen_tan@apple.com&gt;
+
+        Null dereference loading Blink layout test editing/execCommand/delete-hidden-crash.html
+        https://bugs.webkit.org/show_bug.cgi?id=149289
+        &lt;rdar://problem/22746352&gt;
+
+        Reviewed by Enrica Casucci.
+
+        * editing/execCommand/delete-hidden-crash-expected.txt: Added.
+        * editing/execCommand/delete-hidden-crash.html: Added.
+
</ins><span class="cx"> 2015-11-03  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Ruby base ending in tatechuyoko forces a line break before the tatechuyoko
</span></span></pre></div>
<a id="trunkLayoutTestseditingexecCommanddeletehiddencrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/execCommand/delete-hidden-crash-expected.txt (0 => 192043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/delete-hidden-crash-expected.txt                                (rev 0)
+++ trunk/LayoutTests/editing/execCommand/delete-hidden-crash-expected.txt        2015-11-05 00:46:34 UTC (rev 192043)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS. WebKit didn't crash.
</ins></span></pre></div>
<a id="trunkLayoutTestseditingexecCommanddeletehiddencrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/execCommand/delete-hidden-crash.html (0 => 192043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/execCommand/delete-hidden-crash.html                                (rev 0)
+++ trunk/LayoutTests/editing/execCommand/delete-hidden-crash.html        2015-11-05 00:46:34 UTC (rev 192043)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;script src=&quot;../editing.js&quot;&gt;&lt;/script&gt;
+
+&lt;script&gt;
+if (window.testRunner)
+    testRunner.dumpAsText();
+
+function editingTest() {
+    document.execCommand('SelectAll')
+    span = document.getElementsByTagName('span')[0];
+    span.contentEditable = 'true';
+    span.textContent = 'bar';
+    document.execCommand('InsertText', false, '1');
+    document.body.textContent = &quot;PASS. WebKit didn't crash.&quot;;
+};
+&lt;/script&gt;
+
+&lt;style&gt;
+* { visibility:visible; }
+.inline { display:inline; }
+* :only-child { visibility:hidden; }
+&lt;/style&gt;
+&lt;/head&gt;
+&lt;body onload=editingTest()&gt;
+&lt;table&gt;
+&lt;tr&gt;&lt;td&gt;&lt;span&gt;&lt;table&gt;&lt;/table&gt;&lt;span&gt;&lt;/span&gt;&lt;/span&gt;&lt;/td&gt;&lt;/tr&gt;
+&lt;tr&gt;&lt;td&gt;&lt;td class=&quot;inline&quot;&gt;foo&lt;/td&gt;&lt;/tr&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 (192042 => 192043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-11-05 00:26:26 UTC (rev 192042)
+++ trunk/Source/WebCore/ChangeLog        2015-11-05 00:46:34 UTC (rev 192043)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-11-04  Jiewen Tan  &lt;jiewen_tan@apple.com&gt;
+
+        Null dereference loading Blink layout test editing/execCommand/delete-hidden-crash.html
+        https://bugs.webkit.org/show_bug.cgi?id=149289
+        &lt;rdar://problem/22746352&gt;
+
+        Reviewed by Enrica Casucci.
+
+        This is a merge of Blink r176497:
+        https://codereview.chromium.org/340713003
+
+        It ensures the start &amp; end positions in DeleteSelectionCommand::initializePositionData
+        are editable.
+
+        Test: editing/execCommand/delete-hidden-crash.html
+
+        * editing/DeleteSelectionCommand.cpp:
+        (WebCore::DeleteSelectionCommand::initializePositionData):
+        * editing/Editor.cpp:
+        (WebCore::Editor::advanceToNextMisspelling):
+        * editing/htmlediting.cpp:
+        (WebCore::firstEditablePositionAfterPositionInRoot):
+        (WebCore::lastEditablePositionBeforePositionInRoot):
+        These two functions don't make any sense to return VisiblePosition. Change them
+        to return Position instead. Since there is a viable conversion from Position to
+        VisiblePosition. It should not change the behavior of any other components depending
+        on it.
+        * editing/htmlediting.h:
+
</ins><span class="cx"> 2015-11-03  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Ruby base ending in tatechuyoko forces a line break before the tatechuyoko
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingDeleteSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp (192042 => 192043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp        2015-11-05 00:26:26 UTC (rev 192042)
+++ trunk/Source/WebCore/editing/DeleteSelectionCommand.cpp        2015-11-05 00:46:34 UTC (rev 192043)
</span><span class="lines">@@ -177,6 +177,11 @@
</span><span class="cx">     Position start, end;
</span><span class="cx">     initializeStartEnd(start, end);
</span><span class="cx">     
</span><ins>+    if (!isEditablePosition(start, ContentIsEditable))
+        start = firstEditablePositionAfterPositionInRoot(start, highestEditableRoot(start));
+    if (!isEditablePosition(end, ContentIsEditable))
+        end = lastEditablePositionBeforePositionInRoot(end, highestEditableRoot(start));
+
</ins><span class="cx">     m_upstreamStart = start.upstream();
</span><span class="cx">     m_downstreamStart = start.downstream();
</span><span class="cx">     m_upstreamEnd = end.upstream();
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingEditorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/Editor.cpp (192042 => 192043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/Editor.cpp        2015-11-05 00:26:26 UTC (rev 192042)
+++ trunk/Source/WebCore/editing/Editor.cpp        2015-11-05 00:46:34 UTC (rev 192043)
</span><span class="lines">@@ -1902,7 +1902,7 @@
</span><span class="cx">         // when spell checking the whole document before sending the message.
</span><span class="cx">         // In that case the document might not be editable, but there are editable pockets that need to be spell checked.
</span><span class="cx"> 
</span><del>-        position = firstEditablePositionAfterPositionInRoot(position, document().documentElement()).deepEquivalent();
</del><ins>+        position = VisiblePosition(firstEditablePositionAfterPositionInRoot(position, document().documentElement())).deepEquivalent();
</ins><span class="cx">         if (position.isNull())
</span><span class="cx">             return;
</span><span class="cx">         
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.cpp (192042 => 192043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.cpp        2015-11-05 00:26:26 UTC (rev 192042)
+++ trunk/Source/WebCore/editing/htmlediting.cpp        2015-11-05 00:46:34 UTC (rev 192043)
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx">     return Position();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-VisiblePosition firstEditablePositionAfterPositionInRoot(const Position&amp; position, Node* highestRoot)
</del><ins>+Position firstEditablePositionAfterPositionInRoot(const Position&amp; position, Node* highestRoot)
</ins><span class="cx"> {
</span><span class="cx">     // position falls before highestRoot.
</span><span class="cx">     if (comparePositions(position, firstPositionInNode(highestRoot)) == -1 &amp;&amp; highestRoot-&gt;hasEditableStyle())
</span><span class="lines">@@ -296,7 +296,7 @@
</span><span class="cx">     if (&amp;position.deprecatedNode()-&gt;treeScope() != &amp;highestRoot-&gt;treeScope()) {
</span><span class="cx">         Node* shadowAncestor = highestRoot-&gt;treeScope().ancestorInThisScope(p.deprecatedNode());
</span><span class="cx">         if (!shadowAncestor)
</span><del>-            return VisiblePosition();
</del><ins>+            return Position();
</ins><span class="cx"> 
</span><span class="cx">         p = positionAfterNode(shadowAncestor);
</span><span class="cx">     }
</span><span class="lines">@@ -305,12 +305,12 @@
</span><span class="cx">         p = isAtomicNode(p.deprecatedNode()) ? positionInParentAfterNode(p.deprecatedNode()) : nextVisuallyDistinctCandidate(p);
</span><span class="cx">     
</span><span class="cx">     if (p.deprecatedNode() &amp;&amp; p.deprecatedNode() != highestRoot &amp;&amp; !p.deprecatedNode()-&gt;isDescendantOf(highestRoot))
</span><del>-        return VisiblePosition();
</del><ins>+        return Position();
</ins><span class="cx">     
</span><del>-    return VisiblePosition(p);
</del><ins>+    return p;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-VisiblePosition lastEditablePositionBeforePositionInRoot(const Position&amp; position, Node* highestRoot)
</del><ins>+Position lastEditablePositionBeforePositionInRoot(const Position&amp; position, Node* highestRoot)
</ins><span class="cx"> {
</span><span class="cx">     // When position falls after highestRoot, the result is easy to compute.
</span><span class="cx">     if (comparePositions(position, lastPositionInNode(highestRoot)) == 1)
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx">     if (&amp;position.deprecatedNode()-&gt;treeScope() != &amp;highestRoot-&gt;treeScope()) {
</span><span class="cx">         Node* shadowAncestor = highestRoot-&gt;treeScope().ancestorInThisScope(p.deprecatedNode());
</span><span class="cx">         if (!shadowAncestor)
</span><del>-            return VisiblePosition();
</del><ins>+            return Position();
</ins><span class="cx"> 
</span><span class="cx">         p = firstPositionInOrBeforeNode(shadowAncestor);
</span><span class="cx">     }
</span><span class="lines">@@ -330,9 +330,9 @@
</span><span class="cx">         p = isAtomicNode(p.deprecatedNode()) ? positionInParentBeforeNode(p.deprecatedNode()) : previousVisuallyDistinctCandidate(p);
</span><span class="cx">     
</span><span class="cx">     if (p.deprecatedNode() &amp;&amp; p.deprecatedNode() != highestRoot &amp;&amp; !p.deprecatedNode()-&gt;isDescendantOf(highestRoot))
</span><del>-        return VisiblePosition();
</del><ins>+        return Position();
</ins><span class="cx">     
</span><del>-    return VisiblePosition(p);
</del><ins>+    return p;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // FIXME: The method name, comment, and code say three different things here!
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.h (192042 => 192043)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.h        2015-11-05 00:26:26 UTC (rev 192042)
+++ trunk/Source/WebCore/editing/htmlediting.h        2015-11-05 00:46:34 UTC (rev 192043)
</span><span class="lines">@@ -161,6 +161,9 @@
</span><span class="cx">     return editingIgnoresContent(node) ? positionAfterNode(node) : lastPositionInNode(node);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+Position firstEditablePositionAfterPositionInRoot(const Position&amp;, Node*);
+Position lastEditablePositionBeforePositionInRoot(const Position&amp;, Node*);
+
</ins><span class="cx"> // comparision functions on Position
</span><span class="cx">     
</span><span class="cx"> int comparePositions(const Position&amp;, const Position&amp;);
</span><span class="lines">@@ -185,9 +188,7 @@
</span><span class="cx"> // -------------------------------------------------------------------------
</span><span class="cx">     
</span><span class="cx"> // Functions returning VisiblePosition
</span><del>-    
-VisiblePosition firstEditablePositionAfterPositionInRoot(const Position&amp;, Node*);
-VisiblePosition lastEditablePositionBeforePositionInRoot(const Position&amp;, Node*);
</del><ins>+
</ins><span class="cx"> VisiblePosition visiblePositionBeforeNode(Node*);
</span><span class="cx"> VisiblePosition visiblePositionAfterNode(Node*);
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>