<!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>[198434] branches/safari-601.1.46-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/198434">198434</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-03-18 11:37:12 -0700 (Fri, 18 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/192285">r192285</a>. rdar://problem/25234895</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoredomContainerNodecpp">branches/safari-601.1.46-branch/Source/WebCore/dom/ContainerNode.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCoredomContainerNodeh">branches/safari-601.1.46-branch/Source/WebCore/dom/ContainerNode.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreeditingcocoaEditorCocoamm">branches/safari-601.1.46-branch/Source/WebCore/editing/cocoa/EditorCocoa.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreeditingiosEditorIOSmm">branches/safari-601.1.46-branch/Source/WebCore/editing/ios/EditorIOS.mm</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreeditingmacEditorMacmm">branches/safari-601.1.46-branch/Source/WebCore/editing/mac/EditorMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestseditingexecCommand150252expectedtxt">branches/safari-601.1.46-branch/LayoutTests/editing/execCommand/150252-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestseditingexecCommand150252xhtml">branches/safari-601.1.46-branch/LayoutTests/editing/execCommand/150252.xhtml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (198433 => 198434)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-03-18 18:32:11 UTC (rev 198433)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-03-18 18:37:12 UTC (rev 198434)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2016-03-18 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192285.
+
+ 2015-11-10 Pranjal Jumde <pjumde@apple.com>
+
+ Fixed crash loading Mozilla layout test editor/libeditor/crashtests/431086-1.xhtml.
+ https://bugs.webkit.org/show_bug.cgi?id=150252
+ <rdar://problem/23149470>
+
+ Reviewed by Brent Fulgham.
+
+ * LayoutTests/editing/execCommand/150252.xhtml
+ * LayoutTests/editing/execCommand/150252-expected.txt
+
+2016-03-18 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r198377.
</span><span class="cx">
</span><span class="cx"> 2016-03-17 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestseditingexecCommand150252expectedtxtfromrev198433branchessafari601branchLayoutTestseditingexecCommand150252expectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/editing/execCommand/150252-expected.txt (from rev 198433, branches/safari-601-branch/LayoutTests/editing/execCommand/150252-expected.txt) (0 => 198434)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/editing/execCommand/150252-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/editing/execCommand/150252-expected.txt 2016-03-18 18:37:12 UTC (rev 198434)
</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="branchessafari601146branchLayoutTestseditingexecCommand150252xhtmlfromrev198433branchessafari601branchLayoutTestseditingexecCommand150252xhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/editing/execCommand/150252.xhtml (from rev 198433, branches/safari-601-branch/LayoutTests/editing/execCommand/150252.xhtml) (0 => 198434)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/editing/execCommand/150252.xhtml (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/editing/execCommand/150252.xhtml 2016-03-18 18:37:12 UTC (rev 198434)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<div id="150252" xmlns="http://www.w3.org/1999/xhtml">
+
+<script type="text/javascript">
+
+function boom()
+{
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ var r = document.documentElement;
+ r.style.position = "absolute";
+ r.contentEditable = "true";
+ r.focus();
+ r.contentEditable = "false";
+ r.focus();
+ r.contentEditable = "true";
+ document.execCommand("subscript", false, null);
+ r.contentEditable = "false";
+ document.getElementById("150252").innerHTML = "This test passes if it doesn't crash. https://bugs.webkit.org/show_bug.cgi?id=150252";
+}
+
+window.addEventListener("load", boom, false);
+
+</script>
+
+</div>
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (198433 => 198434)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-03-18 18:32:11 UTC (rev 198433)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-03-18 18:37:12 UTC (rev 198434)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2016-03-18 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192285.
+
+ * dom/ContainerNode.cpp:
+ (WebCore::ContainerNode::ensurePreInsertionValidity): Added.
+ * dom/ContainerNode.h:
+
+ 2015-11-10 Pranjal Jumde <pjumde@apple.com>
+
+ Fixed crash loading Mozilla layout test editor/libeditor/crashtests/431086-1.xhtml.
+ https://bugs.webkit.org/show_bug.cgi?id=150252
+ <rdar://problem/23149470>
+
+ 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 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r198377.
</span><span class="cx">
</span><span class="cx"> 2016-03-17 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoredomContainerNodecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/ContainerNode.cpp (198433 => 198434)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/dom/ContainerNode.cpp 2016-03-18 18:32:11 UTC (rev 198433)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/ContainerNode.cpp 2016-03-18 18:37:12 UTC (rev 198434)
</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& newChild, Node* refChild, ExceptionCode& ec)
+{
+ ec = checkAcceptChild(this, &newChild, refChild);
+ return !ec;
+}
+
</ins><span class="cx"> static inline bool checkAddChild(ContainerNode* newParent, Node* newChild, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> ec = checkAcceptChild(newParent, newChild, 0);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/dom/ContainerNode.h (198433 => 198434)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/dom/ContainerNode.h 2016-03-18 18:32:11 UTC (rev 198433)
+++ branches/safari-601.1.46-branch/Source/WebCore/dom/ContainerNode.h 2016-03-18 18:37:12 UTC (rev 198434)
</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& newChild, Node* refChild, ExceptionCode&);
+
</ins><span class="cx"> protected:
</span><span class="cx"> explicit ContainerNode(Document&, ConstructionType = CreateContainer);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreeditingcocoaEditorCocoamm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/editing/cocoa/EditorCocoa.mm (198433 => 198434)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/editing/cocoa/EditorCocoa.mm 2016-03-18 18:32:11 UTC (rev 198433)
+++ branches/safari-601.1.46-branch/Source/WebCore/editing/cocoa/EditorCocoa.mm 2016-03-18 18:37:12 UTC (rev 198434)
</span><span class="lines">@@ -63,8 +63,13 @@
</span><span class="cx">
</span><span class="cx"> styleElement->appendChild(frame->document()->createEditingTextNode(""), ASSERT_NO_EXCEPTION);
</span><span class="cx">
</span><del>- position.deprecatedNode()->parentNode()->appendChild(styleElement, ASSERT_NO_EXCEPTION);
</del><ins>+ ContainerNode* parentNode = position.deprecatedNode()->parentNode();
</ins><span class="cx">
</span><ins>+ if (!parentNode->ensurePreInsertionValidity(*styleElement, nullptr, IGNORE_EXCEPTION))
+ return nullptr;
+
+ parentNode->appendChild(styleElement, ASSERT_NO_EXCEPTION);
+
</ins><span class="cx"> nodeToRemove = styleElement.get();
</span><span class="cx">
</span><span class="cx"> frame->document()->updateStyleIfNeeded();
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreeditingiosEditorIOSmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/editing/ios/EditorIOS.mm (198433 => 198434)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/editing/ios/EditorIOS.mm 2016-03-18 18:32:11 UTC (rev 198433)
+++ branches/safari-601.1.46-branch/Source/WebCore/editing/ios/EditorIOS.mm 2016-03-18 18:37:12 UTC (rev 198434)
</span><span class="lines">@@ -192,13 +192,10 @@
</span><span class="cx"> RenderStyle* style = styleForSelectionStart(&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 = &style->fontCascade().primaryFont();
</span><del>-
- if (nodeToRemove) {
- ExceptionCode ec;
- nodeToRemove->remove(ec);
- ASSERT(!ec);
</del><ins>+ if (nodeToRemove)
+ nodeToRemove->remove(ASSERT_NO_EXCEPTION);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return result;
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreeditingmacEditorMacmm"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/editing/mac/EditorMac.mm (198433 => 198434)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/editing/mac/EditorMac.mm 2016-03-18 18:32:11 UTC (rev 198433)
+++ branches/safari-601.1.46-branch/Source/WebCore/editing/mac/EditorMac.mm 2016-03-18 18:37:12 UTC (rev 198434)
</span><span class="lines">@@ -118,12 +118,11 @@
</span><span class="cx"> RenderStyle* style = styleForSelectionStart(&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 = &style->fontCascade().primaryFont();
</span><del>-
- if (nodeToRemove)
- nodeToRemove->remove(ASSERT_NO_EXCEPTION);
-
</del><ins>+ if (nodeToRemove)
+ nodeToRemove->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>