Diff
Modified: trunk/LayoutTests/ChangeLog (150592 => 150593)
--- trunk/LayoutTests/ChangeLog 2013-05-23 17:49:45 UTC (rev 150592)
+++ trunk/LayoutTests/ChangeLog 2013-05-23 17:50:03 UTC (rev 150593)
@@ -1,3 +1,43 @@
+2013-05-23 Ryosuke Niwa <[email protected]>
+
+ Several editing tests that copy & paste slow down Mac WK2 EWS
+ https://bugs.webkit.org/show_bug.cgi?id=116681
+
+ Reviewed by Anders Carlsson.
+
+ Move editing tests that trigger copy and paste from execCommand into pasteboard.
+ Since NWRT uses a single instance of WebKitTestRunner to run tests in single directory,
+ this should mitigate the issue for now.
+
+ In the long term, we should really mock out the clipboard in WebKitTestRunner.
+
+ * editing/execCommand/4128080-2-expected.txt: Removed.
+ * editing/execCommand/4128080-2.html: Removed.
+ * editing/execCommand/5939887-expected.txt: Removed.
+ * editing/execCommand/5939887.html: Removed.
+ * editing/execCommand/copy-without-selection-expected.txt: Removed.
+ * editing/execCommand/copy-without-selection.html: Removed.
+ * editing/execCommand/paste-2.html: Removed.
+ * editing/pasteboard/copy-cut-paste-events-fired-when-disabled-expected.txt: Copied from LayoutTests/editing/execCommand/5939887-expected.txt.
+ * editing/pasteboard/copy-cut-paste-events-fired-when-disabled.html: Copied from LayoutTests/editing/execCommand/5939887.html.
+ * editing/pasteboard/copy-inside-h1-preserves-h1-expected.txt: Copied from LayoutTests/editing/execCommand/4128080-2-expected.txt.
+ * editing/pasteboard/copy-inside-h1-preserves-h1.html: Copied from LayoutTests/editing/execCommand/4128080-2.html.
+ * editing/pasteboard/copy-without-selection-expected.txt: Copied from LayoutTests/editing/execCommand/copy-without-selection-expected.txt.
+ * editing/pasteboard/copy-without-selection.html: Copied from LayoutTests/editing/execCommand/copy-without-selection.html.
+ * editing/pasteboard/paste-2.html: Copied from LayoutTests/editing/execCommand/paste-2.html.
+ * platform/gtk/editing/execCommand/paste-2-expected.png: Removed.
+ * platform/gtk/editing/execCommand/paste-2-expected.txt: Removed.
+ * platform/gtk/editing/pasteboard/paste-2-expected.png: Copied from LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.png.
+ * platform/gtk/editing/pasteboard/paste-2-expected.txt: Copied from LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.txt.
+ * platform/mac/editing/execCommand/paste-2-expected.png: Removed.
+ * platform/mac/editing/execCommand/paste-2-expected.txt: Removed.
+ * platform/mac/editing/pasteboard/paste-2-expected.png: Copied from LayoutTests/platform/mac/editing/execCommand/paste-2-expected.png.
+ * platform/mac/editing/pasteboard/paste-2-expected.txt: Copied from LayoutTests/platform/mac/editing/execCommand/paste-2-expected.txt.
+ * platform/qt/editing/execCommand/paste-2-expected.png: Removed.
+ * platform/qt/editing/execCommand/paste-2-expected.txt: Removed.
+ * platform/qt/editing/pasteboard/paste-2-expected.png: Copied from LayoutTests/platform/qt/editing/execCommand/paste-2-expected.png.
+ * platform/qt/editing/pasteboard/paste-2-expected.txt: Copied from LayoutTests/platform/qt/editing/execCommand/paste-2-expected.txt.
+
2013-05-23 Christophe Dumez <[email protected]>
Unreviewed, rolling out r150586.
Deleted: trunk/LayoutTests/editing/execCommand/4128080-2-expected.txt (150592 => 150593)
--- trunk/LayoutTests/editing/execCommand/4128080-2-expected.txt 2013-05-23 17:49:45 UTC (rev 150592)
+++ trunk/LayoutTests/editing/execCommand/4128080-2-expected.txt 2013-05-23 17:50:03 UTC (rev 150593)
@@ -1 +0,0 @@
-Success
Deleted: trunk/LayoutTests/editing/execCommand/4128080-2.html (150592 => 150593)
--- trunk/LayoutTests/editing/execCommand/4128080-2.html 2013-05-23 17:49:45 UTC (rev 150592)
+++ trunk/LayoutTests/editing/execCommand/4128080-2.html 2013-05-23 17:50:03 UTC (rev 150593)
@@ -1,27 +0,0 @@
-<div id="description">This tests to make sure that copying and pasting a paragraph or less of content inside a header preserves the header element. To run it manually, Paste, then inspect the pasted content and verify that it's in an H1 element.</div>
-<div id="copy"><h1>foo</h1></div>
-<div id="paste" contentEditable="true"></div>
-
-<script>
-
-if (window.testRunner)
- window.testRunner.dumpAsText();
-
-// Test 2: Verify that a header at the end of inserted content is preserved.
-copy = document.getElementById("copy");
-window.getSelection().setBaseAndExtent(copy, 0, copy, copy.childNodes.length);
-document.execCommand("Copy");
-
-paste = document.getElementById("paste");
-window.getSelection().setPosition(paste, 0);
-document.execCommand("Paste");
-
-expected = "<h1>foo</h1>";
-actual = paste.innerHTML;
-
-if (window.testRunner && actual == expected)
- document.body.innerText = "Success";
-else
- document.body.innerText = "Failure. Found: " + actual + ", but expected: " + expected;
-
-</script>
Deleted: trunk/LayoutTests/editing/execCommand/5939887-expected.txt (150592 => 150593)
--- trunk/LayoutTests/editing/execCommand/5939887-expected.txt 2013-05-23 17:49:45 UTC (rev 150592)
+++ trunk/LayoutTests/editing/execCommand/5939887-expected.txt 2013-05-23 17:50:03 UTC (rev 150593)
@@ -1,4 +0,0 @@
-This tests to see if Copy, Cut, and Paste fire oncopy, oncut and onpaste even when those operations are disabled. Since they are disabled they can't be performed from the Edit menu, they need to be explicitly performed via execCommand or -[WebView copy:].
-oncopy fired
-oncut fired
-onpaste fired
Deleted: trunk/LayoutTests/editing/execCommand/5939887.html (150592 => 150593)
--- trunk/LayoutTests/editing/execCommand/5939887.html 2013-05-23 17:49:45 UTC (rev 150592)
+++ trunk/LayoutTests/editing/execCommand/5939887.html 2013-05-23 17:50:03 UTC (rev 150593)
@@ -1,18 +0,0 @@
-<body _oncopy_="log('oncopy fired'); return false;" _oncut_="log('oncut fired'); return false" _onpaste_="log('onpaste fired'); return false">
-This tests to see if Copy, Cut, and Paste fire oncopy, oncut and onpaste even when those operations are disabled. Since they are disabled they can't be performed from the Edit menu, they need to be explicitly performed via execCommand or -[WebView copy:].
-<ul id="console"></ul>
-<script>
-function log(msg) {
- console = document.getElementById("console");
- li = document.createElement("li");
- text = document.createTextNode(msg);
- console.appendChild(li);
- li.appendChild(text);
-}
-if (window.testRunner)
- window.testRunner.dumpAsText();
-document.execCommand("Copy");
-document.execCommand("Cut");
-document.execCommand("Paste");
-</script>
-</body>
Deleted: trunk/LayoutTests/editing/execCommand/copy-without-selection-expected.txt (150592 => 150593)
--- trunk/LayoutTests/editing/execCommand/copy-without-selection-expected.txt 2013-05-23 17:49:45 UTC (rev 150592)
+++ trunk/LayoutTests/editing/execCommand/copy-without-selection-expected.txt 2013-05-23 17:50:03 UTC (rev 150593)
@@ -1 +0,0 @@
-SUCCESS
Deleted: trunk/LayoutTests/editing/execCommand/copy-without-selection.html (150592 => 150593)
--- trunk/LayoutTests/editing/execCommand/copy-without-selection.html 2013-05-23 17:49:45 UTC (rev 150592)
+++ trunk/LayoutTests/editing/execCommand/copy-without-selection.html 2013-05-23 17:50:03 UTC (rev 150593)
@@ -1,35 +0,0 @@
-<html>
-<script src=""
-<script>
-
-function mycopy(event)
-{
- event.clipboardData.setData('text/plain', "SUCCESS");
- event.preventDefault();
-}
-
-function mypaste(event)
-{
- var clip = event.clipboardData.getData('text/plain');
- document.getElementById('result').innerHTML = clip;
- event.preventDefault();
-}
-
-function test()
-{
- execCopyCommand();
- var e = document.getElementById('result');
- setSelectionCommand(e, 0, e, 0);
- execPasteCommand();
-
- if (window.testRunner)
- testRunner.dumpAsText();
-}
-
-</script>
-<body _onload_='test()' _onbeforecopy_='event.preventDefault()' _oncopy_='mycopy(event)' _onbeforepaste_='event.preventDefault()' _onpaste_='mypaste(event)'>
-
-<div id='result' contenteditable='true'>FAILURE</div>
-
-</body>
-</html>
Deleted: trunk/LayoutTests/editing/execCommand/paste-2.html (150592 => 150593)
--- trunk/LayoutTests/editing/execCommand/paste-2.html 2013-05-23 17:49:45 UTC (rev 150592)
+++ trunk/LayoutTests/editing/execCommand/paste-2.html 2013-05-23 17:50:03 UTC (rev 150593)
@@ -1,24 +0,0 @@
-<script>
-if (window.testRunner)
- testRunner.dumpEditingCallbacks();
-
-function runTest() {
- var frame = frames[0];
- var sel = frame.getSelection();
- var doc = frame.document;
-
- sel.setPosition(doc.body, 0);
- doc.execCommand("InsertText", false, "foo bar baz");
- sel.modify("extend", "backward", "word");
- doc.execCommand("Copy");
- doc.execCommand("Delete");
- doc.execCommand("Paste");
- if (window.testRunner)
- window.testRunner.notifyDone();
-}
-
-if (window.testRunner)
- window.testRunner.waitUntilDone();
-</script>
-<p>This tests copy/delete/paste inside an editable iframe. You should see 'foo bar baz' below.</p>
-<iframe src="" _onload_="runTest();"></iframe>
Copied: trunk/LayoutTests/editing/pasteboard/copy-cut-paste-events-fired-when-disabled-expected.txt (from rev 150560, trunk/LayoutTests/editing/execCommand/5939887-expected.txt) (0 => 150593)
--- trunk/LayoutTests/editing/pasteboard/copy-cut-paste-events-fired-when-disabled-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/copy-cut-paste-events-fired-when-disabled-expected.txt 2013-05-23 17:50:03 UTC (rev 150593)
@@ -0,0 +1,4 @@
+This tests to see if Copy, Cut, and Paste fire oncopy, oncut and onpaste even when those operations are disabled. Since they are disabled they can't be performed from the Edit menu, they need to be explicitly performed via execCommand or -[WebView copy:].
+oncopy fired
+oncut fired
+onpaste fired
Copied: trunk/LayoutTests/editing/pasteboard/copy-cut-paste-events-fired-when-disabled.html (from rev 150560, trunk/LayoutTests/editing/execCommand/5939887.html) (0 => 150593)
--- trunk/LayoutTests/editing/pasteboard/copy-cut-paste-events-fired-when-disabled.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/copy-cut-paste-events-fired-when-disabled.html 2013-05-23 17:50:03 UTC (rev 150593)
@@ -0,0 +1,18 @@
+<body _oncopy_="log('oncopy fired'); return false;" _oncut_="log('oncut fired'); return false" _onpaste_="log('onpaste fired'); return false">
+This tests to see if Copy, Cut, and Paste fire oncopy, oncut and onpaste even when those operations are disabled. Since they are disabled they can't be performed from the Edit menu, they need to be explicitly performed via execCommand or -[WebView copy:].
+<ul id="console"></ul>
+<script>
+function log(msg) {
+ console = document.getElementById("console");
+ li = document.createElement("li");
+ text = document.createTextNode(msg);
+ console.appendChild(li);
+ li.appendChild(text);
+}
+if (window.testRunner)
+ window.testRunner.dumpAsText();
+document.execCommand("Copy");
+document.execCommand("Cut");
+document.execCommand("Paste");
+</script>
+</body>
Copied: trunk/LayoutTests/editing/pasteboard/copy-inside-h1-preserves-h1-expected.txt (from rev 150560, trunk/LayoutTests/editing/execCommand/4128080-2-expected.txt) (0 => 150593)
--- trunk/LayoutTests/editing/pasteboard/copy-inside-h1-preserves-h1-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/copy-inside-h1-preserves-h1-expected.txt 2013-05-23 17:50:03 UTC (rev 150593)
@@ -0,0 +1 @@
+Success
Copied: trunk/LayoutTests/editing/pasteboard/copy-inside-h1-preserves-h1.html (from rev 150560, trunk/LayoutTests/editing/execCommand/4128080-2.html) (0 => 150593)
--- trunk/LayoutTests/editing/pasteboard/copy-inside-h1-preserves-h1.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/copy-inside-h1-preserves-h1.html 2013-05-23 17:50:03 UTC (rev 150593)
@@ -0,0 +1,27 @@
+<div id="description">This tests to make sure that copying and pasting a paragraph or less of content inside a header preserves the header element. To run it manually, Paste, then inspect the pasted content and verify that it's in an H1 element.</div>
+<div id="copy"><h1>foo</h1></div>
+<div id="paste" contentEditable="true"></div>
+
+<script>
+
+if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+// Test 2: Verify that a header at the end of inserted content is preserved.
+copy = document.getElementById("copy");
+window.getSelection().setBaseAndExtent(copy, 0, copy, copy.childNodes.length);
+document.execCommand("Copy");
+
+paste = document.getElementById("paste");
+window.getSelection().setPosition(paste, 0);
+document.execCommand("Paste");
+
+expected = "<h1>foo</h1>";
+actual = paste.innerHTML;
+
+if (window.testRunner && actual == expected)
+ document.body.innerText = "Success";
+else
+ document.body.innerText = "Failure. Found: " + actual + ", but expected: " + expected;
+
+</script>
Copied: trunk/LayoutTests/editing/pasteboard/copy-without-selection-expected.txt (from rev 150560, trunk/LayoutTests/editing/execCommand/copy-without-selection-expected.txt) (0 => 150593)
--- trunk/LayoutTests/editing/pasteboard/copy-without-selection-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/copy-without-selection-expected.txt 2013-05-23 17:50:03 UTC (rev 150593)
@@ -0,0 +1 @@
+SUCCESS
Copied: trunk/LayoutTests/editing/pasteboard/copy-without-selection.html (from rev 150560, trunk/LayoutTests/editing/execCommand/copy-without-selection.html) (0 => 150593)
--- trunk/LayoutTests/editing/pasteboard/copy-without-selection.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/copy-without-selection.html 2013-05-23 17:50:03 UTC (rev 150593)
@@ -0,0 +1,35 @@
+<html>
+<script src=""
+<script>
+
+function mycopy(event)
+{
+ event.clipboardData.setData('text/plain', "SUCCESS");
+ event.preventDefault();
+}
+
+function mypaste(event)
+{
+ var clip = event.clipboardData.getData('text/plain');
+ document.getElementById('result').innerHTML = clip;
+ event.preventDefault();
+}
+
+function test()
+{
+ execCopyCommand();
+ var e = document.getElementById('result');
+ setSelectionCommand(e, 0, e, 0);
+ execPasteCommand();
+
+ if (window.testRunner)
+ testRunner.dumpAsText();
+}
+
+</script>
+<body _onload_='test()' _onbeforecopy_='event.preventDefault()' _oncopy_='mycopy(event)' _onbeforepaste_='event.preventDefault()' _onpaste_='mypaste(event)'>
+
+<div id='result' contenteditable='true'>FAILURE</div>
+
+</body>
+</html>
Copied: trunk/LayoutTests/editing/pasteboard/paste-2.html (from rev 150560, trunk/LayoutTests/editing/execCommand/paste-2.html) (0 => 150593)
--- trunk/LayoutTests/editing/pasteboard/paste-2.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-2.html 2013-05-23 17:50:03 UTC (rev 150593)
@@ -0,0 +1,24 @@
+<script>
+if (window.testRunner)
+ testRunner.dumpEditingCallbacks();
+
+function runTest() {
+ var frame = frames[0];
+ var sel = frame.getSelection();
+ var doc = frame.document;
+
+ sel.setPosition(doc.body, 0);
+ doc.execCommand("InsertText", false, "foo bar baz");
+ sel.modify("extend", "backward", "word");
+ doc.execCommand("Copy");
+ doc.execCommand("Delete");
+ doc.execCommand("Paste");
+ if (window.testRunner)
+ window.testRunner.notifyDone();
+}
+
+if (window.testRunner)
+ window.testRunner.waitUntilDone();
+</script>
+<p>This tests copy/delete/paste inside an editable iframe. You should see 'foo bar baz' below.</p>
+<iframe src="" _onload_="runTest();"></iframe>
Deleted: trunk/LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.txt (150592 => 150593)
--- trunk/LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.txt 2013-05-23 17:49:45 UTC (rev 150592)
+++ trunk/LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.txt 2013-05-23 17:50:03 UTC (rev 150593)
@@ -1,34 +0,0 @@
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of BODY > HTML > #document to 0 of BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 8 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x17
- RenderText {#text} at (0,0) size 562x17
- text run at (0,0) width 336: "This tests copy/delete/paste inside an editable iframe. "
- text run at (336,0) width 226: "You should see 'foo bar baz' below."
- RenderBlock (anonymous) at (0,33) size 784x154
- RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
- layer at (0,0) size 300x150
- RenderView at (0,0) size 300x150
- layer at (0,0) size 300x150
- RenderBlock {HTML} at (0,0) size 300x150
- RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
- RenderText {#text} at (0,0) size 71x17
- text run at (0,0) width 71: "foo bar baz"
- RenderText {#text} at (0,0) size 0x0
Copied: trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.png (from rev 150560, trunk/LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.png)
(Binary files differ)
Copied: trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt (from rev 150560, trunk/LayoutTests/platform/gtk/editing/execCommand/paste-2-expected.txt) (0 => 150593)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt 2013-05-23 17:50:03 UTC (rev 150593)
@@ -0,0 +1,34 @@
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of BODY > HTML > #document to 0 of BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 8 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x17
+ RenderText {#text} at (0,0) size 562x17
+ text run at (0,0) width 336: "This tests copy/delete/paste inside an editable iframe. "
+ text run at (336,0) width 226: "You should see 'foo bar baz' below."
+ RenderBlock (anonymous) at (0,33) size 784x154
+ RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
+ layer at (0,0) size 300x150
+ RenderView at (0,0) size 300x150
+ layer at (0,0) size 300x150
+ RenderBlock {HTML} at (0,0) size 300x150
+ RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
+ RenderText {#text} at (0,0) size 71x17
+ text run at (0,0) width 71: "foo bar baz"
+ RenderText {#text} at (0,0) size 0x0
Deleted: trunk/LayoutTests/platform/mac/editing/execCommand/paste-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/execCommand/paste-2-expected.txt (150592 => 150593)
--- trunk/LayoutTests/platform/mac/editing/execCommand/paste-2-expected.txt 2013-05-23 17:49:45 UTC (rev 150592)
+++ trunk/LayoutTests/platform/mac/editing/execCommand/paste-2-expected.txt 2013-05-23 17:50:03 UTC (rev 150593)
@@ -1,34 +0,0 @@
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of BODY > HTML > #document to 0 of BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 8 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 562x18
- text run at (0,0) width 336: "This tests copy/delete/paste inside an editable iframe. "
- text run at (336,0) width 226: "You should see 'foo bar baz' below."
- RenderBlock (anonymous) at (0,34) size 784x154
- RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
- layer at (0,0) size 300x150
- RenderView at (0,0) size 300x150
- layer at (0,0) size 300x150
- RenderBlock {HTML} at (0,0) size 300x150
- RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
- RenderText {#text} at (0,0) size 71x18
- text run at (0,0) width 71: "foo bar baz"
- RenderText {#text} at (0,0) size 0x0
Copied: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.png (from rev 150560, trunk/LayoutTests/platform/mac/editing/execCommand/paste-2-expected.png)
(Binary files differ)
Copied: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.txt (from rev 150560, trunk/LayoutTests/platform/mac/editing/execCommand/paste-2-expected.txt) (0 => 150593)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.txt 2013-05-23 17:50:03 UTC (rev 150593)
@@ -0,0 +1,34 @@
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of BODY > HTML > #document to 0 of BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 8 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 562x18
+ text run at (0,0) width 336: "This tests copy/delete/paste inside an editable iframe. "
+ text run at (336,0) width 226: "You should see 'foo bar baz' below."
+ RenderBlock (anonymous) at (0,34) size 784x154
+ RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
+ layer at (0,0) size 300x150
+ RenderView at (0,0) size 300x150
+ layer at (0,0) size 300x150
+ RenderBlock {HTML} at (0,0) size 300x150
+ RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
+ RenderText {#text} at (0,0) size 71x18
+ text run at (0,0) width 71: "foo bar baz"
+ RenderText {#text} at (0,0) size 0x0
Deleted: trunk/LayoutTests/platform/qt/editing/execCommand/paste-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/execCommand/paste-2-expected.txt (150592 => 150593)
--- trunk/LayoutTests/platform/qt/editing/execCommand/paste-2-expected.txt 2013-05-23 17:49:45 UTC (rev 150592)
+++ trunk/LayoutTests/platform/qt/editing/execCommand/paste-2-expected.txt 2013-05-23 17:50:03 UTC (rev 150593)
@@ -1,34 +0,0 @@
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of BODY > HTML > #document to 0 of BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 8 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-layer at (0,0) size 800x600
- RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
- RenderBlock {HTML} at (0,0) size 800x600
- RenderBody {BODY} at (8,8) size 784x584
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 539x19
- text run at (0,0) width 322: "This tests copy/delete/paste inside an editable iframe. "
- text run at (322,0) width 217: "You should see 'foo bar baz' below."
- RenderBlock (anonymous) at (0,35) size 784x154
- RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
- layer at (0,0) size 300x150
- RenderView at (0,0) size 300x150
- layer at (0,0) size 300x150
- RenderBlock {HTML} at (0,0) size 300x150
- RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
- RenderText {#text} at (0,0) size 69x19
- text run at (0,0) width 69: "foo bar baz"
- RenderText {#text} at (0,0) size 0x0
Copied: trunk/LayoutTests/platform/qt/editing/pasteboard/paste-2-expected.png (from rev 150560, trunk/LayoutTests/platform/qt/editing/execCommand/paste-2-expected.png)
(Binary files differ)
Copied: trunk/LayoutTests/platform/qt/editing/pasteboard/paste-2-expected.txt (from rev 150560, trunk/LayoutTests/platform/qt/editing/execCommand/paste-2-expected.txt) (0 => 150593)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/paste-2-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/paste-2-expected.txt 2013-05-23 17:50:03 UTC (rev 150593)
@@ -0,0 +1,34 @@
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of BODY > HTML > #document to 0 of BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 8 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+ RenderBlock {HTML} at (0,0) size 800x600
+ RenderBody {BODY} at (8,8) size 784x584
+ RenderBlock {P} at (0,0) size 784x19
+ RenderText {#text} at (0,0) size 539x19
+ text run at (0,0) width 322: "This tests copy/delete/paste inside an editable iframe. "
+ text run at (322,0) width 217: "You should see 'foo bar baz' below."
+ RenderBlock (anonymous) at (0,35) size 784x154
+ RenderPartObject {IFRAME} at (0,0) size 304x154 [border: (2px inset #000000)]
+ layer at (0,0) size 300x150
+ RenderView at (0,0) size 300x150
+ layer at (0,0) size 300x150
+ RenderBlock {HTML} at (0,0) size 300x150
+ RenderBody {BODY} at (8,8) size 284x134 [bgcolor=#FFFFE0]
+ RenderText {#text} at (0,0) size 69x19
+ text run at (0,0) width 69: "foo bar baz"
+ RenderText {#text} at (0,0) size 0x0
