<!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>[180759] releases/WebKitGTK/webkit-2.8</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/180759">180759</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-27 09:27:51 -0800 (Fri, 27 Feb 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/180464">r180464</a> - Invalid assert in CompositeEditCommand::insertNodeAfter/insertNodeBefore
https://bugs.webkit.org/show_bug.cgi?id=141854

Reviewed by Ryosuke Niwa.

Inserting content before/after the body as the result of editing is a valid operation.
This assert was originally introduced to cover cases where edited content would get moved
out of body. However, asserting such operation properly is not possible atm.

Source/WebCore:

Test: editing/inserting/insert-as-body-sibling.html

* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::insertNodeBefore):
(WebCore::CompositeEditCommand::insertNodeAfter):

LayoutTests:

* editing/inserting/insert-as-body-sibling-expected.txt: Added.
* editing/inserting/insert-as-body-sibling.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreeditingCompositeEditCommandcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestseditinginsertinginsertasbodysiblingexpectedtxt">releases/WebKitGTK/webkit-2.8/LayoutTests/editing/inserting/insert-as-body-sibling-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestseditinginsertinginsertasbodysiblinghtml">releases/WebKitGTK/webkit-2.8/LayoutTests/editing/inserting/insert-as-body-sibling.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (180758 => 180759)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog        2015-02-27 17:22:45 UTC (rev 180758)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog        2015-02-27 17:27:51 UTC (rev 180759)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-02-20  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Invalid assert in CompositeEditCommand::insertNodeAfter/insertNodeBefore
+        https://bugs.webkit.org/show_bug.cgi?id=141854
+
+        Reviewed by Ryosuke Niwa.
+
+        Inserting content before/after the body as the result of editing is a valid operation.
+        This assert was originally introduced to cover cases where edited content would get moved
+        out of body. However, asserting such operation properly is not possible atm.
+
+        * editing/inserting/insert-as-body-sibling-expected.txt: Added.
+        * editing/inserting/insert-as-body-sibling.html: Added.
+
</ins><span class="cx"> 2015-02-20  Michael Saboff  &lt;msaboff@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         DFG JIT needs to check for stack overflow at the start of Program and Eval execution
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestseditinginsertinginsertasbodysiblingexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/editing/inserting/insert-as-body-sibling-expected.txt (0 => 180759)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/editing/inserting/insert-as-body-sibling-expected.txt                                (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/editing/inserting/insert-as-body-sibling-expected.txt        2015-02-27 17:27:51 UTC (rev 180759)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+
+Pass if no assert or crash in debug.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestseditinginsertinginsertasbodysiblinghtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/editing/inserting/insert-as-body-sibling.html (0 => 180759)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/editing/inserting/insert-as-body-sibling.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/editing/inserting/insert-as-body-sibling.html        2015-02-27 17:27:51 UTC (rev 180759)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;head&gt;
+&lt;title&gt;This tests if inserting content as body sibling triggers assertion.&lt;/title&gt;
+&lt;/head&gt;
+&lt;div&gt;Pass if no assert or crash in debug.&lt;/div&gt;
+&lt;script&gt;
+        if (window.testRunner)
+            testRunner.dumpAsText();
+
+          var iframe = document.createElement(&quot;iframe&quot;);
+          document.head.parentNode.insertBefore(iframe, document.head.nextSibling);
+          document.execCommand(&quot;SelectAll&quot;);
+          document.designMode = &quot;on&quot;;
+          document.execCommand(&quot;JustifyCenter&quot;, false, null);
+&lt;/script&gt;
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (180758 => 180759)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog        2015-02-27 17:22:45 UTC (rev 180758)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog        2015-02-27 17:27:51 UTC (rev 180759)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-02-20  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Invalid assert in CompositeEditCommand::insertNodeAfter/insertNodeBefore
+        https://bugs.webkit.org/show_bug.cgi?id=141854
+
+        Reviewed by Ryosuke Niwa.
+
+        Inserting content before/after the body as the result of editing is a valid operation.
+        This assert was originally introduced to cover cases where edited content would get moved
+        out of body. However, asserting such operation properly is not possible atm.
+
+        Test: editing/inserting/insert-as-body-sibling.html
+
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::insertNodeBefore):
+        (WebCore::CompositeEditCommand::insertNodeAfter):
+
</ins><span class="cx"> 2015-02-20  Dhi Aurrahman  &lt;diorahman@rockybars.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Language ranges containing asterisks must be quoted as strings
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/editing/CompositeEditCommand.cpp (180758 => 180759)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/editing/CompositeEditCommand.cpp        2015-02-27 17:22:45 UTC (rev 180758)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/editing/CompositeEditCommand.cpp        2015-02-27 17:27:51 UTC (rev 180759)
</span><span class="lines">@@ -322,7 +322,6 @@
</span><span class="cx"> 
</span><span class="cx"> void CompositeEditCommand::insertNodeBefore(PassRefPtr&lt;Node&gt; insertChild, PassRefPtr&lt;Node&gt; refChild, ShouldAssumeContentIsAlwaysEditable shouldAssumeContentIsAlwaysEditable)
</span><span class="cx"> {
</span><del>-    ASSERT(!refChild-&gt;hasTagName(bodyTag));
</del><span class="cx">     applyCommandToComposite(InsertNodeBeforeCommand::create(insertChild, refChild, shouldAssumeContentIsAlwaysEditable));
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -330,7 +329,6 @@
</span><span class="cx"> {
</span><span class="cx">     ASSERT(insertChild);
</span><span class="cx">     ASSERT(refChild);
</span><del>-    ASSERT(!refChild-&gt;hasTagName(bodyTag));
</del><span class="cx">     ContainerNode* parent = refChild-&gt;parentNode();
</span><span class="cx">     ASSERT(parent);
</span><span class="cx">     ASSERT(!parent-&gt;isShadowRoot());
</span></span></pre>
</div>
</div>

</body>
</html>