<!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>[168460] 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/168460">168460</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2014-05-07 19:51:55 -0700 (Wed, 07 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Dragging text from one paragraph to another does not render as expected
https://bugs.webkit.org/show_bug.cgi?id=132633
Reviewed by Darin Adler and Ryosuke Niwa.
Source/WebCore:
When we are dragging and dropping into a content editable field, we detect
if we are trying to put a <p> into an existing <p>, and if so, split the
outer <p> and insert the new <p> as its sibling. However, the outer <p>
might not be editable, so we don't want to do any splitting and inserting
at that location.
Test: editing/pasteboard/drag-drop-paragraph-crasher.html
* editing/ReplaceSelectionCommand.cpp:
(WebCore::ReplaceSelectionCommand::makeInsertedContentRoundTrippableWithHTMLTreeBuilder):
LayoutTests:
The problem occurs when dragging text that includes a <p> into an editable
area that has a <p> as a parent.
* editing/pasteboard/drag-drop-paragraph-crasher-expected.txt: Added.
* editing/pasteboard/drag-drop-paragraph-crasher.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingReplaceSelectionCommandcpp">trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingpasteboarddragdropparagraphcrasherexpectedtxt">trunk/LayoutTests/editing/pasteboard/drag-drop-paragraph-crasher-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingpasteboarddragdropparagraphcrasherhtml">trunk/LayoutTests/editing/pasteboard/drag-drop-paragraph-crasher.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (168459 => 168460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-08 02:35:22 UTC (rev 168459)
+++ trunk/LayoutTests/ChangeLog 2014-05-08 02:51:55 UTC (rev 168460)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Dragging text from one paragraph to another does not render as expected
+ https://bugs.webkit.org/show_bug.cgi?id=132633
+
+ Reviewed by Darin Adler and Ryosuke Niwa.
+
+ The problem occurs when dragging text that includes a <p> into an editable
+ area that has a <p> as a parent.
+
+ * editing/pasteboard/drag-drop-paragraph-crasher-expected.txt: Added.
+ * editing/pasteboard/drag-drop-paragraph-crasher.html: Added.
+
</ins><span class="cx"> 2014-05-07 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Using a fill pattern much larger than actual canvas reliably segfaults browser
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboarddragdropparagraphcrasherexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/pasteboard/drag-drop-paragraph-crasher-expected.txt (0 => 168460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/drag-drop-paragraph-crasher-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/drag-drop-paragraph-crasher-expected.txt 2014-05-08 02:51:55 UTC (rev 168460)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+This tests text selection drag including a <p> tag, where its parent <p> tag is not editable.
+| "and drag it here<#selection-anchor>Select"
+| <p>
+| "me<#selection-focus>"
</ins></span></pre></div>
<a id="trunkLayoutTestseditingpasteboarddragdropparagraphcrasherhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/pasteboard/drag-drop-paragraph-crasher.html (0 => 168460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/drag-drop-paragraph-crasher.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/drag-drop-paragraph-crasher.html 2014-05-08 02:51:55 UTC (rev 168460)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<html>
+<body>
+<p>This tests text selection drag including a &lt;p&gt; tag, where its parent &lt;p&gt; tag is not editable.</p>
+To test this by hand, select the relevant text in this editable span:
+ <div id=source>Select
+ <p>me</p>
+ </div>
+ <p id=destination contenteditable>and drag it here</p>
+<br><br>If there is no crash, then the test passed.
+<script src="../../resources/dump-as-markup.js"></script>
+<script>
+function selectAllOfSource() {
+ var selection = window.getSelection();
+ var range = document.createRange();
+ range.selectNodeContents(document.getElementById("source"));
+ selection.removeAllRanges();
+ selection.addRange(range);
+}
+if (window.testRunner) {
+ Markup.description(document.querySelector('p').innerText);
+ selectAllOfSource();
+
+ eventSender.mouseMoveTo(source.offsetLeft + 10, source.offsetTop + source.offsetHeight / 2);
+ eventSender.mouseDown();
+ var destination = document.getElementById("destination");
+ eventSender.leapForward(500);
+ eventSender.mouseMoveTo(destination.offsetLeft + 700, destination.offsetTop + destination.offsetHeight / 2);
+ eventSender.mouseUp();
+
+ Markup.dump("destination");
+} else
+ Markup.noAutoDump();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (168459 => 168460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-05-08 02:35:22 UTC (rev 168459)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-05-08 02:51:55 UTC (rev 168460)
</span><span class="lines">@@ -114,6 +114,7 @@
</span><span class="cx"> platform/mac/editing/pasteboard/dataTransfer-set-data-file-url.html
</span><span class="cx"> platform/mac/editing/pasteboard/drag-selections-to-contenteditable.html
</span><span class="cx"> platform/mac/fast/forms/listbox-scrollbar-hit-test.html
</span><ins>+editing/pasteboard/drag-drop-paragraph-crasher.html
</ins><span class="cx">
</span><span class="cx"> # [WK2] [Mac] Spellcheck tests don't seem to work
</span><span class="cx"> webkit.org/b/105616 editing/spelling/context-menu-suggestions-multiword-selection.html
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168459 => 168460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-08 02:35:22 UTC (rev 168459)
+++ trunk/Source/WebCore/ChangeLog 2014-05-08 02:51:55 UTC (rev 168460)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-06 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Dragging text from one paragraph to another does not render as expected
+ https://bugs.webkit.org/show_bug.cgi?id=132633
+
+ Reviewed by Darin Adler and Ryosuke Niwa.
+
+ When we are dragging and dropping into a content editable field, we detect
+ if we are trying to put a <p> into an existing <p>, and if so, split the
+ outer <p> and insert the new <p> as its sibling. However, the outer <p>
+ might not be editable, so we don't want to do any splitting and inserting
+ at that location.
+
+ Test: editing/pasteboard/drag-drop-paragraph-crasher.html
+
+ * editing/ReplaceSelectionCommand.cpp:
+ (WebCore::ReplaceSelectionCommand::makeInsertedContentRoundTrippableWithHTMLTreeBuilder):
+
</ins><span class="cx"> 2014-05-07 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CoordinatedGraphics][WK2] Scale factor and scroll position is not being restored properly in a back/forward load
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingReplaceSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp (168459 => 168460)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2014-05-08 02:35:22 UTC (rev 168459)
+++ trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2014-05-08 02:51:55 UTC (rev 168460)
</span><span class="lines">@@ -629,8 +629,11 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (isProhibitedParagraphChild(toHTMLElement(node.get())->localName())) {
</span><del>- if (auto* paragraphElement = enclosingElementWithTag(positionInParentBeforeNode(node.get()), pTag))
- moveNodeOutOfAncestor(node, paragraphElement);
</del><ins>+ if (auto* paragraphElement = enclosingElementWithTag(positionInParentBeforeNode(node.get()), pTag)) {
+ auto* parent = paragraphElement->parentNode();
+ if (parent && parent->hasEditableStyle())
+ moveNodeOutOfAncestor(node, paragraphElement);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (isHeaderElement(node.get())) {
</span></span></pre>
</div>
</div>
</body>
</html>