Diff
Modified: trunk/LayoutTests/ChangeLog (87774 => 87775)
--- trunk/LayoutTests/ChangeLog 2011-06-01 05:54:40 UTC (rev 87774)
+++ trunk/LayoutTests/ChangeLog 2011-06-01 06:18:43 UTC (rev 87775)
@@ -1,3 +1,23 @@
+2011-05-31 Annie Sullivan <[email protected]>
+
+ Reviewed by Ryosuke Niwa.
+
+ Convert editing/pasteboard/paste-blockquote-into-blockquote-2.html to dump-as-markup
+ https://bugs.webkit.org/show_bug.cgi?id=61682
+
+ Convert test to dump-as-markup and clean up HTML. Also update test description.
+
+ * editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt: Added.
+ * editing/pasteboard/paste-blockquote-into-blockquote-2.html:
+ * platform/chromium-linux/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt: Removed.
+ * platform/gtk/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt: Removed.
+ * platform/mac-leopard/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.png: Removed.
+ * platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.png: Removed.
+ * platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt: Removed.
+ * platform/qt/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt: Removed.
+
2011-05-31 Kinuko Yasuda <[email protected]>
Reviewed by Kent Tamura.
Added: trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt (0 => 87775)
--- trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt 2011-06-01 06:18:43 UTC (rev 87775)
@@ -0,0 +1,13 @@
+This tests pasting a nested blockquote into a blockquote. The text "One" should be singly-blockquoted, and the text "Two Three" should be doubly-blockquoted. However, currently "One Two" is singly-blockquoted and "Three" is doubly-blockquoted. See bug 61807.
+| <blockquote>
+| id="block"
+| type="cite"
+| "One"
+| "Two"
+| <span>
+| <blockquote>
+| type="cite"
+| <blockquote>
+| type="cite"
+| <div>
+| "Three<#selection-caret>"
Modified: trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-2.html (87774 => 87775)
--- trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-2.html 2011-06-01 05:54:40 UTC (rev 87774)
+++ trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-2.html 2011-06-01 06:18:43 UTC (rev 87775)
@@ -1,3 +1,6 @@
+<!DOCTYPE html>
+<html>
+<head>
<style>
blockquote {
color: blue;
@@ -6,14 +9,22 @@
padding: 0 0 0 20px;
}
</style>
+</head>
-<p>This tests pasting a nested blockquote into a blockquote. The first line below should be singly-blockquoted, and the second should be doubly-quoted.</p>
-<div contenteditable="true"><blockquote type='cite' id="block">One</blockquote></div>
+<body>
+<div contenteditable="true" id="editable"><blockquote type='cite' id="block">One</blockquote></div>
+<script src=""
<script>
var sel = window.getSelection();
var block = document.getElementById("block");
sel.setPosition(block, 3);
document.execCommand("InsertHTML", false, "<span><blockquote type='cite'><blockquote type='cite'><div>Two</div><div>Three</div></blockquote></blockquote></span>");
+Markup.description("This tests pasting a nested blockquote into a blockquote. "
+ + "The text \"One\" should be singly-blockquoted, and the text \"Two Three\" should be doubly-blockquoted. "
+ + "However, currently \"One Two\" is singly-blockquoted and \"Three\" is doubly-blockquoted. See bug 61807.");
+Markup.dump(editable);
</script>
+</body>
+</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt (87774 => 87775)
--- trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt 2011-06-01 05:54:40 UTC (rev 87774)
+++ trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt 2011-06-01 06:18:43 UTC (rev 87775)
@@ -1,26 +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 782x39
- text run at (0,0) width 782: "This tests pasting a nested blockquote into a blockquote. The first line below should be singly-blockquoted, and the second should"
- text run at (0,20) width 112: "be doubly-quoted."
- RenderBlock {DIV} at (0,56) size 784x40
- RenderBlock {BLOCKQUOTE} at (0,0) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (22,0) size 26x19
- text run at (22,0) width 26: "One"
- RenderText {#text} at (48,0) size 28x19
- text run at (48,0) width 28: "Two"
- RenderBlock (anonymous) at (0,20) size 784x0
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,20) size 784x20
- RenderBlock {BLOCKQUOTE} at (0,0) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderBlock {BLOCKQUOTE} at (22,0) size 762x20 [border: (2px solid #0000FF)]
- RenderBlock {DIV} at (22,0) size 740x20
- RenderText {#text} at (0,0) size 35x19
- text run at (0,0) width 35: "Three"
- RenderBlock (anonymous) at (0,40) size 784x0
- RenderInline {SPAN} at (0,0) size 0x0
-caret: position 5 of child 0 {#text} of child 0 {DIV} of child 0 {BLOCKQUOTE} of child 0 {BLOCKQUOTE} of child 1 {SPAN} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt (87774 => 87775)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt 2011-06-01 05:54:40 UTC (rev 87774)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt 2011-06-01 06:18:43 UTC (rev 87775)
@@ -1,26 +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 773x38
- text run at (0,0) width 773: "This tests pasting a nested blockquote into a blockquote. The first line below should be singly-blockquoted, and the second"
- text run at (0,19) width 161: "should be doubly-quoted."
- RenderBlock {DIV} at (0,54) size 784x38
- RenderBlock {BLOCKQUOTE} at (0,0) size 784x19 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (22,0) size 27x19
- text run at (22,0) width 27: "One"
- RenderText {#text} at (49,0) size 30x19
- text run at (49,0) width 30: "Two"
- RenderBlock (anonymous) at (0,19) size 784x0
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,19) size 784x19
- RenderBlock {BLOCKQUOTE} at (0,0) size 784x19 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderBlock {BLOCKQUOTE} at (22,0) size 762x19 [border: (2px solid #0000FF)]
- RenderBlock {DIV} at (22,0) size 740x19
- RenderText {#text} at (0,0) size 37x19
- text run at (0,0) width 37: "Three"
- RenderBlock (anonymous) at (0,38) size 784x0
- RenderInline {SPAN} at (0,0) size 0x0
-caret: position 5 of child 0 {#text} of child 0 {DIV} of child 0 {BLOCKQUOTE} of child 0 {BLOCKQUOTE} of child 1 {SPAN} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt (87774 => 87775)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt 2011-06-01 05:54:40 UTC (rev 87774)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt 2011-06-01 06:18:43 UTC (rev 87775)
@@ -1,26 +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 773x36
- text run at (0,0) width 773: "This tests pasting a nested blockquote into a blockquote. The first line below should be singly-blockquoted, and the second"
- text run at (0,18) width 161: "should be doubly-quoted."
- RenderBlock {DIV} at (0,52) size 784x36
- RenderBlock {BLOCKQUOTE} at (0,0) size 784x18 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (22,0) size 27x18
- text run at (22,0) width 27: "One"
- RenderText {#text} at (49,0) size 30x18
- text run at (49,0) width 30: "Two"
- RenderBlock (anonymous) at (0,18) size 784x0
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,18) size 784x18
- RenderBlock {BLOCKQUOTE} at (0,0) size 784x18 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderBlock {BLOCKQUOTE} at (22,0) size 762x18 [border: (2px solid #0000FF)]
- RenderBlock {DIV} at (22,0) size 740x18
- RenderText {#text} at (0,0) size 37x18
- text run at (0,0) width 37: "Three"
- RenderBlock (anonymous) at (0,36) size 784x0
- RenderInline {SPAN} at (0,0) size 0x0
-caret: position 5 of child 0 {#text} of child 0 {DIV} of child 0 {BLOCKQUOTE} of child 0 {BLOCKQUOTE} of child 1 {SPAN} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt (87774 => 87775)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt 2011-06-01 05:54:40 UTC (rev 87774)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-into-blockquote-2-expected.txt 2011-06-01 06:18:43 UTC (rev 87775)
@@ -1,26 +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 784x44
- RenderText {#text} at (0,0) size 773x44
- text run at (0,0) width 773: "This tests pasting a nested blockquote into a blockquote. The first line below should be singly-blockquoted, and the"
- text run at (0,22) width 222: "second should be doubly-quoted."
- RenderBlock {DIV} at (0,60) size 784x44
- RenderBlock {BLOCKQUOTE} at (0,0) size 784x22 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (22,0) size 28x22
- text run at (22,0) width 28: "One"
- RenderText {#text} at (50,0) size 31x22
- text run at (50,0) width 31: "Two"
- RenderBlock (anonymous) at (0,22) size 784x0
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBlock (anonymous) at (0,22) size 784x22
- RenderBlock {BLOCKQUOTE} at (0,0) size 784x22 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderBlock {BLOCKQUOTE} at (22,0) size 762x22 [border: (2px solid #0000FF)]
- RenderBlock {DIV} at (22,0) size 740x22
- RenderText {#text} at (0,0) size 41x22
- text run at (0,0) width 41: "Three"
- RenderBlock (anonymous) at (0,44) size 784x0
- RenderInline {SPAN} at (0,0) size 0x0
-caret: position 5 of child 0 {#text} of child 0 {DIV} of child 0 {BLOCKQUOTE} of child 0 {BLOCKQUOTE} of child 1 {SPAN} of child 2 {DIV} of body
