Diff
Modified: trunk/LayoutTests/ChangeLog (93322 => 93323)
--- trunk/LayoutTests/ChangeLog 2011-08-18 18:09:51 UTC (rev 93322)
+++ trunk/LayoutTests/ChangeLog 2011-08-18 18:21:32 UTC (rev 93323)
@@ -1,3 +1,24 @@
+2011-08-17 Ryosuke Niwa <[email protected]>
+
+ Dump-as-markup conversion: editing/pasteboard/5368833.html
+ https://bugs.webkit.org/show_bug.cgi?id=66416
+
+ Reviewed by Kent Tamura.
+
+ Converted the test and also renamed the test to a more descriptive name.
+
+ * editing/pasteboard/5368833.html: Removed.
+ * editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt: Added.
+ * editing/pasteboard/paste-blockquote-and-paragraph-break.html: Copied from LayoutTests/editing/pasteboard/5368833.html.
+ * platform/chromium-linux/editing/pasteboard/5368833-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/5368833-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/5368833-expected.txt: Removed.
+ * platform/gtk/editing/pasteboard/5368833-expected.txt: Removed.
+ * platform/mac-leopard/editing/pasteboard/5368833-expected.png: Removed.
+ * platform/mac/editing/pasteboard/5368833-expected.png: Removed.
+ * platform/mac/editing/pasteboard/5368833-expected.txt: Removed.
+ * platform/qt/editing/pasteboard/5368833-expected.txt: Removed.
+
2011-08-18 Tony Chang <[email protected]>
Update chromium gpu expected results after r93275.
Deleted: trunk/LayoutTests/editing/pasteboard/5368833.html (93322 => 93323)
--- trunk/LayoutTests/editing/pasteboard/5368833.html 2011-08-18 18:09:51 UTC (rev 93322)
+++ trunk/LayoutTests/editing/pasteboard/5368833.html 2011-08-18 18:21:32 UTC (rev 93323)
@@ -1,23 +0,0 @@
-<style>
-blockquote {
- color: blue;
- border-left: 2px solid blue;
- padding-left: 5px;
- margin: 0px;
-}
-</style>
-
-<p>We copy and paste a blockquoted paragraph plus a paragraph break. The paragraph break shouldn't be inside the blockquote on paste.
-You should see 'hello' (blockquoted), 'world' (not quoted, black text), 'hello' (blockquoted), empty paragraph.</p>
-<div id="div" contenteditable="true"><br><blockquote id="blockquote" type="cite">hello<br></blockquote><br></div>
-
-<script>
-div = document.getElementById("div");
-blockquote = document.getElementById("blockquote");
-sel = window.getSelection();
-sel.setBaseAndExtent(blockquote, 0, div, 2);
-document.execCommand("Copy");
-sel.setPosition(div, 0);
-document.execCommand("Paste");
-document.execCommand("InsertHTML", false, "world");
-</script>
Added: trunk/LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt (0 => 93323)
--- trunk/LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break-expected.txt 2011-08-18 18:21:32 UTC (rev 93323)
@@ -0,0 +1,45 @@
+We copy and paste a blockquoted paragraph plus a paragraph break.
+The paragraph break shouldn't be inside the blockquote on paste.
+You should see 'hello' (blockquoted), 'world' (not quoted, black text), 'hello' (blockquoted), empty paragraph.
+See <rdar://problem/5368833<
+
+Before paste:
+| <br>
+| <blockquote>
+| id="blockquote"
+| type="cite"
+| "hello"
+| <br>
+| <br>
+
+After paste:
+| <blockquote>
+| id="blockquote"
+| type="cite"
+| "hello"
+| <br>
+| <div>
+| <#selection-caret>
+| <br>
+| <blockquote>
+| id="blockquote"
+| type="cite"
+| "hello"
+| <br>
+| <br>
+
+After inserting "world":
+| <blockquote>
+| id="blockquote"
+| type="cite"
+| "hello"
+| <br>
+| <div>
+| "world<#selection-caret>"
+| <br>
+| <blockquote>
+| id="blockquote"
+| type="cite"
+| "hello"
+| <br>
+| <br>
Copied: trunk/LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break.html (from rev 93245, trunk/LayoutTests/editing/pasteboard/5368833.html) (0 => 93323)
--- trunk/LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-blockquote-and-paragraph-break.html 2011-08-18 18:21:32 UTC (rev 93323)
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<head>
+<style>
+blockquote {
+ color: blue;
+ border-left: 2px solid blue;
+ padding-left: 5px;
+ margin: 0px;
+}
+</style>
+</head>
+<body>
+<p id="description">We copy and paste a blockquoted paragraph plus a paragraph break.
+The paragraph break shouldn't be inside the blockquote on paste.
+You should see 'hello' (blockquoted), 'world' (not quoted, black text), 'hello' (blockquoted), empty paragraph.
+See <rdar://problem/5368833<</p>
+<div id="div" contenteditable="true"><br><blockquote id="blockquote" type="cite">hello<br></blockquote><br></div>
+<script src=""
+<script>
+div = document.getElementById("div");
+blockquote = document.getElementById("blockquote");
+sel = window.getSelection();
+sel.setBaseAndExtent(blockquote, 0, div, 2);
+document.execCommand("Copy");
+sel.setPosition(div, 0);
+
+Markup.description(document.getElementById('description').textContent);
+
+Markup.dump(div, 'Before paste');
+document.execCommand("Paste");
+Markup.dump(div, 'After paste');
+document.execCommand("InsertHTML", false, "world");
+Markup.dump(div, 'After inserting "world"');
+</script>
+</body>
+</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/pasteboard/5368833-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/5368833-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/5368833-expected.txt (93322 => 93323)
--- trunk/LayoutTests/platform/chromium-win/editing/pasteboard/5368833-expected.txt 2011-08-18 18:09:51 UTC (rev 93322)
+++ trunk/LayoutTests/platform/chromium-win/editing/pasteboard/5368833-expected.txt 2011-08-18 18:21:32 UTC (rev 93323)
@@ -1,27 +0,0 @@
-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 784x40
- RenderText {#text} at (0,0) size 779x39
- text run at (0,0) width 425: "We copy and paste a blockquoted paragraph plus a paragraph break. "
- text run at (425,0) width 354: "The paragraph break shouldn't be inside the blockquote on"
- text run at (0,20) width 40: "paste. "
- text run at (40,20) width 662: "You should see 'hello' (blockquoted), 'world' (not quoted, black text), 'hello' (blockquoted), empty paragraph."
- RenderBlock {DIV} at (0,56) size 784x80
- RenderBlock {BLOCKQUOTE} at (0,0) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (7,0) size 28x19
- text run at (7,0) width 28: "hello"
- RenderBR {BR} at (35,15) size 0x0
- RenderBlock (anonymous) at (0,20) size 784x0
- RenderBlock {DIV} at (0,20) size 784x20
- RenderText {#text} at (0,0) size 35x19
- text run at (0,0) width 35: "world"
- RenderBlock {BLOCKQUOTE} at (0,40) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (7,0) size 28x19
- text run at (7,0) width 28: "hello"
- RenderBR {BR} at (35,15) size 0x0
- RenderBlock (anonymous) at (0,60) size 784x20
- RenderBR {BR} at (0,0) size 0x19
-caret: position 5 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/5368833-expected.txt (93322 => 93323)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/5368833-expected.txt 2011-08-18 18:09:51 UTC (rev 93322)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/5368833-expected.txt 2011-08-18 18:21:32 UTC (rev 93323)
@@ -1,27 +0,0 @@
-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 784x38
- RenderText {#text} at (0,0) size 784x38
- text run at (0,0) width 435: "We copy and paste a blockquoted paragraph plus a paragraph break. "
- text run at (435,0) width 349: "The paragraph break shouldn't be inside the blockquote"
- text run at (0,19) width 60: "on paste. "
- text run at (60,19) width 687: "You should see 'hello' (blockquoted), 'world' (not quoted, black text), 'hello' (blockquoted), empty paragraph."
- RenderBlock {DIV} at (0,54) size 784x76
- RenderBlock {BLOCKQUOTE} at (0,0) size 784x19 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (7,0) size 31x19
- text run at (7,0) width 31: "hello"
- RenderBR {BR} at (38,15) size 0x0
- RenderBlock (anonymous) at (0,19) size 784x0
- RenderBlock {DIV} at (0,19) size 784x19
- RenderText {#text} at (0,0) size 37x19
- text run at (0,0) width 37: "world"
- RenderBlock {BLOCKQUOTE} at (0,38) size 784x19 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (7,0) size 31x19
- text run at (7,0) width 31: "hello"
- RenderBR {BR} at (38,15) size 0x0
- RenderBlock (anonymous) at (0,57) size 784x19
- RenderBR {BR} at (0,0) size 0x19
-caret: position 5 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/5368833-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/5368833-expected.txt (93322 => 93323)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/5368833-expected.txt 2011-08-18 18:09:51 UTC (rev 93322)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/5368833-expected.txt 2011-08-18 18:21:32 UTC (rev 93323)
@@ -1,27 +0,0 @@
-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 784x36
- RenderText {#text} at (0,0) size 784x36
- text run at (0,0) width 435: "We copy and paste a blockquoted paragraph plus a paragraph break. "
- text run at (435,0) width 349: "The paragraph break shouldn't be inside the blockquote"
- text run at (0,18) width 60: "on paste. "
- text run at (60,18) width 687: "You should see 'hello' (blockquoted), 'world' (not quoted, black text), 'hello' (blockquoted), empty paragraph."
- RenderBlock {DIV} at (0,52) size 784x72
- RenderBlock {BLOCKQUOTE} at (0,0) size 784x18 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (7,0) size 31x18
- text run at (7,0) width 31: "hello"
- RenderBR {BR} at (38,14) size 0x0
- RenderBlock (anonymous) at (0,18) size 784x0
- RenderBlock {DIV} at (0,18) size 784x18
- RenderText {#text} at (0,0) size 37x18
- text run at (0,0) width 37: "world"
- RenderBlock {BLOCKQUOTE} at (0,36) size 784x18 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (7,0) size 31x18
- text run at (7,0) width 31: "hello"
- RenderBR {BR} at (38,14) size 0x0
- RenderBlock (anonymous) at (0,54) size 784x18
- RenderBR {BR} at (0,0) size 0x18
-caret: position 5 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/pasteboard/5368833-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/pasteboard/5368833-expected.txt (93322 => 93323)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/5368833-expected.txt 2011-08-18 18:09:51 UTC (rev 93322)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/5368833-expected.txt 2011-08-18 18:21:32 UTC (rev 93323)
@@ -1,28 +0,0 @@
-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 784x66
- RenderText {#text} at (0,0) size 781x66
- text run at (0,0) width 478: "We copy and paste a blockquoted paragraph plus a paragraph break. "
- text run at (478,0) width 303: "The paragraph break shouldn't be inside the"
- text run at (0,22) width 143: "blockquote on paste. "
- text run at (143,22) width 611: "You should see 'hello' (blockquoted), 'world' (not quoted, black text), 'hello' (blockquoted),"
- text run at (0,44) width 123: "empty paragraph."
- RenderBlock {DIV} at (0,82) size 784x88
- RenderBlock {BLOCKQUOTE} at (0,0) size 784x22 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (7,0) size 32x22
- text run at (7,0) width 32: "hello"
- RenderBR {BR} at (39,16) size 0x0
- RenderBlock (anonymous) at (0,22) size 784x0
- RenderBlock {DIV} at (0,22) size 784x22
- RenderText {#text} at (0,0) size 40x22
- text run at (0,0) width 40: "world"
- RenderBlock {BLOCKQUOTE} at (0,44) size 784x22 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (7,0) size 32x22
- text run at (7,0) width 32: "hello"
- RenderBR {BR} at (39,16) size 0x0
- RenderBlock (anonymous) at (0,66) size 784x22
- RenderBR {BR} at (0,0) size 0x22
-caret: position 5 of child 0 {#text} of child 1 {DIV} of child 2 {DIV} of body
