<!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>[198433] branches/safari-601-branch</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/198433">198433</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2016-03-18 11:32:11 -0700 (Fri, 18 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192285">r192285</a>.

Source/WebCore:

* dom/ContainerNode.cpp:
(WebCore::ContainerNode::ensurePreInsertionValidity): Added.
* dom/ContainerNode.h:

    2015-11-10  Pranjal Jumde  &lt;pjumde@apple.com&gt;

    Fixed crash loading Mozilla layout test editor/libeditor/crashtests/431086-1.xhtml.
    https://bugs.webkit.org/show_bug.cgi?id=150252
    &lt;rdar://problem/23149470&gt;

    Reviewed by Brent Fulgham.

    * Source/WebCore/editing/ios/EditorIOS.mm
    * Source/WebCore/editing/mac/EditorMac.mm
      In Editor::fontForSelection moved the node removal code, so that the
      node is only removed if style is not NULL.
    * Source/WebCore/editing/cocoa/EditorCocoa.mm
      In Editor::styleForSelectionStart checking if the parentNode can 
      accept the styleElement node.

LayoutTests:

    2015-11-10  Pranjal Jumde  &lt;pjumde@apple.com&gt;

    Fixed crash loading Mozilla layout test editor/libeditor/crashtests/431086-1.xhtml.
    https://bugs.webkit.org/show_bug.cgi?id=150252
    &lt;rdar://problem/23149470&gt;

    Reviewed by Brent Fulgham.

    * LayoutTests/editing/execCommand/150252.xhtml
    * LayoutTests/editing/execCommand/150252-expected.txt</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoredomContainerNodecpp">branches/safari-601-branch/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoredomContainerNodeh">branches/safari-601-branch/Source/WebCore/dom/ContainerNode.h</a></li>
<li><a href="#branchessafari601branchSourceWebCoreeditingcocoaEditorCocoamm">branches/safari-601-branch/Source/WebCore/editing/cocoa/EditorCocoa.mm</a></li>
<li><a href="#branchessafari601branchSourceWebCoreeditingiosEditorIOSmm">branches/safari-601-branch/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
<li><a href="#branchessafari601branchSourceWebCoreeditingmacEditorMacmm">branches/safari-601-branch/Source/WebCore/editing/mac/EditorMac.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestseditingexecCommand150252expectedtxt">branches/safari-601-branch/LayoutTests/editing/execCommand/150252-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestseditingexecCommand150252xhtml">branches/safari-601-branch/LayoutTests/editing/execCommand/150252.xhtml</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (198432 => 198433)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog        2016-03-18 18:22:56 UTC (rev 198432)
+++ branches/safari-601-branch/LayoutTests/ChangeLog        2016-03-18 18:32:11 UTC (rev 198433)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-03-18  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+        Merge r192285.
+
+    2015-11-10  Pranjal Jumde  &lt;pjumde@apple.com&gt;
+
+            Fixed crash loading Mozilla layout test editor/libeditor/crashtests/431086-1.xhtml.
+            https://bugs.webkit.org/show_bug.cgi?id=150252
+            &lt;rdar://problem/23149470&gt;
+
+            Reviewed by Brent Fulgham.
+
+            * LayoutTests/editing/execCommand/150252.xhtml
+            * LayoutTests/editing/execCommand/150252-expected.txt
+
</ins><span class="cx"> 2016-03-18  Babak Shafiei  &lt;bshafiei@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r198377.
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestseditingexecCommand150252expectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/editing/execCommand/150252-expected.txt (0 => 198433)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/editing/execCommand/150252-expected.txt                                (rev 0)
+++ branches/safari-601-branch/LayoutTests/editing/execCommand/150252-expected.txt        2016-03-18 18:32:11 UTC (rev 198433)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+This test passes if it doesn't crash. https://bugs.webkit.org/show_bug.cgi?id=150252
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestseditingexecCommand150252xhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/editing/execCommand/150252.xhtml (0 => 198433)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/editing/execCommand/150252.xhtml                                (rev 0)
+++ branches/safari-601-branch/LayoutTests/editing/execCommand/150252.xhtml        2016-03-18 18:32:11 UTC (rev 198433)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+&lt;div id=&quot;150252&quot; xmlns=&quot;http://www.w3.org/1999/xhtml&quot;&gt;
+
+&lt;script type=&quot;text/javascript&quot;&gt;
+
+function boom()
+{
+  if (window.testRunner)
+    testRunner.dumpAsText();
+
+  var r = document.documentElement;
+  r.style.position = &quot;absolute&quot;;
+  r.contentEditable = &quot;true&quot;;
+  r.focus();
+  r.contentEditable = &quot;false&quot;;
+  r.focus();
+  r.contentEditable = &quot;true&quot;;
+  document.execCommand(&quot;subscript&quot;, false, null);
+  r.contentEditable = &quot;false&quot;;
+  document.getElementById(&quot;150252&quot;).innerHTML = &quot;This test passes if it doesn't crash. https://bugs.webkit.org/show_bug.cgi?id=150252&quot;;
+}
+
+window.addEventListener(&quot;load&quot;, boom, false);
+
+&lt;/script&gt;
+
+&lt;/div&gt;
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (198432 => 198433)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog        2016-03-18 18:22:56 UTC (rev 198432)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog        2016-03-18 18:32:11 UTC (rev 198433)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-03-18  Brent Fulgham  &lt;bfulgham@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r192285.
+
+        * dom/ContainerNode.cpp:
+        (WebCore::ContainerNode::ensurePreInsertionValidity): Added.
+        * dom/ContainerNode.h:
+
+    2015-11-10  Pranjal Jumde  &lt;pjumde@apple.com&gt;
+
+            Fixed crash loading Mozilla layout test editor/libeditor/crashtests/431086-1.xhtml.
+            https://bugs.webkit.org/show_bug.cgi?id=150252
+            &lt;rdar://problem/23149470&gt;
+
+            Reviewed by Brent Fulgham.
+
+            * Source/WebCore/editing/ios/EditorIOS.mm
+            * Source/WebCore/editing/mac/EditorMac.mm
+              In Editor::fontForSelection moved the node removal code, so that the
+              node is only removed if style is not NULL.
+            * Source/WebCore/editing/cocoa/EditorCocoa.mm
+              In Editor::styleForSelectionStart checking if the parentNode can 
+              accept the styleElement node.
+
+2016-03-18  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
</ins><span class="cx">         Unreviewed build fix.
</span><span class="cx"> 
</span><span class="cx">         Get rid of infinitely recursive 'draw' implementation.
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/dom/ContainerNode.cpp (198432 => 198433)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/dom/ContainerNode.cpp        2016-03-18 18:22:56 UTC (rev 198432)
+++ branches/safari-601-branch/Source/WebCore/dom/ContainerNode.cpp        2016-03-18 18:32:11 UTC (rev 198433)
</span><span class="lines">@@ -222,6 +222,12 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool ContainerNode::ensurePreInsertionValidity(Node&amp; newChild, Node* refChild, ExceptionCode&amp; ec)
+{
+    ec = checkAcceptChild(this, &amp;newChild, refChild);
+    return !ec;
+}
+
</ins><span class="cx"> static inline bool checkAddChild(ContainerNode* newParent, Node* newChild, ExceptionCode&amp; ec)
</span><span class="cx"> {
</span><span class="cx">     ec = checkAcceptChild(newParent, newChild, 0);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/dom/ContainerNode.h (198432 => 198433)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/dom/ContainerNode.h        2016-03-18 18:22:56 UTC (rev 198432)
+++ branches/safari-601-branch/Source/WebCore/dom/ContainerNode.h        2016-03-18 18:32:11 UTC (rev 198433)
</span><span class="lines">@@ -153,6 +153,8 @@
</span><span class="cx">     Element* lastElementChild() const;
</span><span class="cx">     unsigned childElementCount() const;
</span><span class="cx"> 
</span><ins>+    bool ensurePreInsertionValidity(Node&amp; newChild, Node* refChild, ExceptionCode&amp;);
+
</ins><span class="cx"> protected:
</span><span class="cx">     explicit ContainerNode(Document&amp;, ConstructionType = CreateContainer);
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreeditingcocoaEditorCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/editing/cocoa/EditorCocoa.mm (198432 => 198433)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/editing/cocoa/EditorCocoa.mm        2016-03-18 18:22:56 UTC (rev 198432)
+++ branches/safari-601-branch/Source/WebCore/editing/cocoa/EditorCocoa.mm        2016-03-18 18:32:11 UTC (rev 198433)
</span><span class="lines">@@ -63,8 +63,13 @@
</span><span class="cx"> 
</span><span class="cx">     styleElement-&gt;appendChild(frame-&gt;document()-&gt;createEditingTextNode(&quot;&quot;), ASSERT_NO_EXCEPTION);
</span><span class="cx"> 
</span><del>-    position.deprecatedNode()-&gt;parentNode()-&gt;appendChild(styleElement, ASSERT_NO_EXCEPTION);
</del><ins>+    ContainerNode* parentNode = position.deprecatedNode()-&gt;parentNode();
</ins><span class="cx"> 
</span><ins>+    if (!parentNode-&gt;ensurePreInsertionValidity(*styleElement, nullptr, IGNORE_EXCEPTION))
+        return nullptr;
+
+    parentNode-&gt;appendChild(styleElement, ASSERT_NO_EXCEPTION);
+
</ins><span class="cx">     nodeToRemove = styleElement.get();
</span><span class="cx"> 
</span><span class="cx">     frame-&gt;document()-&gt;updateStyleIfNeeded();
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/editing/ios/EditorIOS.mm (198432 => 198433)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/editing/ios/EditorIOS.mm        2016-03-18 18:22:56 UTC (rev 198432)
+++ branches/safari-601-branch/Source/WebCore/editing/ios/EditorIOS.mm        2016-03-18 18:32:11 UTC (rev 198433)
</span><span class="lines">@@ -192,13 +192,10 @@
</span><span class="cx">         RenderStyle* style = styleForSelectionStart(&amp;m_frame, nodeToRemove); // sets nodeToRemove
</span><span class="cx"> 
</span><span class="cx">         const Font* result = nullptr;
</span><del>-        if (style)
</del><ins>+        if (style) {
</ins><span class="cx">             result = &amp;style-&gt;fontCascade().primaryFont();
</span><del>-
-        if (nodeToRemove) {
-            ExceptionCode ec;
-            nodeToRemove-&gt;remove(ec);
-            ASSERT(!ec);
</del><ins>+            if (nodeToRemove)
+                nodeToRemove-&gt;remove(ASSERT_NO_EXCEPTION);
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         return result;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/editing/mac/EditorMac.mm (198432 => 198433)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/editing/mac/EditorMac.mm        2016-03-18 18:22:56 UTC (rev 198432)
+++ branches/safari-601-branch/Source/WebCore/editing/mac/EditorMac.mm        2016-03-18 18:32:11 UTC (rev 198433)
</span><span class="lines">@@ -118,12 +118,11 @@
</span><span class="cx">         RenderStyle* style = styleForSelectionStart(&amp;m_frame, nodeToRemove); // sets nodeToRemove
</span><span class="cx"> 
</span><span class="cx">         const Font* result = nullptr;
</span><del>-        if (style)
</del><ins>+        if (style) {
</ins><span class="cx">             result = &amp;style-&gt;fontCascade().primaryFont();
</span><del>-
-        if (nodeToRemove)
-            nodeToRemove-&gt;remove(ASSERT_NO_EXCEPTION);
-
</del><ins>+            if (nodeToRemove)
+                nodeToRemove-&gt;remove(ASSERT_NO_EXCEPTION);
+        }
</ins><span class="cx">         return result;
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>