Diff
Modified: trunk/LayoutTests/ChangeLog (86816 => 86817)
--- trunk/LayoutTests/ChangeLog 2011-05-19 03:21:04 UTC (rev 86816)
+++ trunk/LayoutTests/ChangeLog 2011-05-19 04:02:52 UTC (rev 86817)
@@ -1,3 +1,23 @@
+2011-05-18 Ryosuke Niwa <[email protected]>
+
+ Reviewed by Kent Tamura.
+
+ editing/pasteboard/paste-blockquote-into-blockquote-3.html should be a dump-as-markup test
+ https://bugs.webkit.org/show_bug.cgi?id=61102
+
+ Converted the test.
+
+ * editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt: Added.
+ * editing/pasteboard/paste-blockquote-into-blockquote-3.html:
+ * platform/chromium-linux/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt: Removed.
+ * platform/gtk/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt: Removed.
+ * platform/mac-leopard/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png: Removed.
+ * platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png: Removed.
+ * platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt: Removed.
+ * platform/qt/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt: Removed.
+
2011-05-18 Justin Schuh <[email protected]>
Unreviewed.
Added: trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt (0 => 86817)
--- trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt 2011-05-19 04:02:52 UTC (rev 86817)
@@ -0,0 +1,19 @@
+This tests pasting a blockquote into a blockquote. Nothing below should be double-blockquoted.
+| "
+ "
+| <blockquote>
+| type="cite"
+| "one"
+| <br>
+| "two"
+| <br>
+| "three"
+| <br>
+| id="endContent"
+| "two<#selection-caret>"
+| <br>
+| <blockquote>
+| type="cite"
+| <br>
+| "
+ "
Modified: trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3.html (86816 => 86817)
--- trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3.html 2011-05-19 03:21:04 UTC (rev 86816)
+++ trunk/LayoutTests/editing/pasteboard/paste-blockquote-into-blockquote-3.html 2011-05-19 04:02:52 UTC (rev 86817)
@@ -1,30 +1,34 @@
+<!DOCTYPE html>
<html>
<head>
- <style>
+<script src=""
+<style>
blockquote {
color: blue;
border-left: 2px solid blue;
margin: 0px;
padding: 0 0 0 20px;
}
- </style>
+</style>
</head>
<body contenteditable>
-
<div>
+<p>This tests pasting a blockquote into a blockquote. Nothing below should be double-blockquoted.</p>
<div>
- <p>This tests pasting a blockquote into a blockquote. Nothing below should be double-blockquoted.</p>
<blockquote type="cite">one<br>two<br>three<br id="endContent"><br><br></blockquote>
</div>
<br>
</div>
+<script>
-<script>
var sel = window.getSelection();
var endContent = document.getElementById("endContent");
sel.setPosition(endContent, 1);
document.execCommand("InsertHTML", false, "<blockquote type='cite'><div>two</div></blockquote>");
+
+Markup.description(document.getElementsByTagName('p')[0].innerText);
+Markup.dump(document.getElementsByTagName('div')[1]);
+
</script>
-
</body>
</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt (86816 => 86817)
--- trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt 2011-05-19 03:21:04 UTC (rev 86816)
+++ trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt 2011-05-19 04:02:52 UTC (rev 86817)
@@ -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 {DIV} at (0,0) size 784x156
- RenderBlock {DIV} at (0,0) size 784x136
- RenderBlock {P} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 584x19
- text run at (0,0) width 584: "This tests pasting a blockquote into a blockquote. Nothing below should be double-blockquoted."
- RenderBlock {BLOCKQUOTE} at (0,36) size 784x80 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (22,0) size 22x19
- text run at (22,0) width 22: "one"
- RenderBR {BR} at (44,15) size 0x0
- RenderText {#text} at (22,20) size 23x19
- text run at (22,20) width 23: "two"
- RenderBR {BR} at (45,35) size 0x0
- RenderText {#text} at (22,40) size 30x19
- text run at (22,40) width 30: "three"
- RenderBR {BR} at (52,55) size 0x0
- RenderText {#text} at (22,60) size 23x19
- text run at (22,60) width 23: "two"
- RenderBlock (anonymous) at (0,116) size 784x0
- RenderBlock {BLOCKQUOTE} at (0,116) size 784x20 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderBR {BR} at (22,0) size 0x19
- RenderBlock (anonymous) at (0,136) size 784x20
- RenderBR {BR} at (0,0) size 0x19
-caret: position 3 of child 6 {#text} of child 3 {BLOCKQUOTE} of child 1 {DIV} of child 1 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt (86816 => 86817)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt 2011-05-19 03:21:04 UTC (rev 86816)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt 2011-05-19 04:02:52 UTC (rev 86817)
@@ -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 {DIV} at (0,0) size 784x149
- RenderBlock {DIV} at (0,0) size 784x130
- RenderBlock {P} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 608x19
- text run at (0,0) width 608: "This tests pasting a blockquote into a blockquote. Nothing below should be double-blockquoted."
- RenderBlock {BLOCKQUOTE} at (0,35) size 784x76 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (22,0) size 23x19
- text run at (22,0) width 23: "one"
- RenderBR {BR} at (45,15) size 0x0
- RenderText {#text} at (22,19) size 24x19
- text run at (22,19) width 24: "two"
- RenderBR {BR} at (46,34) size 0x0
- RenderText {#text} at (22,38) size 31x19
- text run at (22,38) width 31: "three"
- RenderBR {BR} at (53,53) size 0x0
- RenderText {#text} at (22,57) size 24x19
- text run at (22,57) width 24: "two"
- RenderBlock (anonymous) at (0,111) size 784x0
- RenderBlock {BLOCKQUOTE} at (0,111) size 784x19 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderBR {BR} at (22,0) size 0x19
- RenderBlock (anonymous) at (0,130) size 784x19
- RenderBR {BR} at (0,0) size 0x19
-caret: position 3 of child 6 {#text} of child 3 {BLOCKQUOTE} of child 1 {DIV} of child 1 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt (86816 => 86817)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt 2011-05-19 03:21:04 UTC (rev 86816)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt 2011-05-19 04:02:52 UTC (rev 86817)
@@ -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 {DIV} at (0,0) size 784x142
- RenderBlock {DIV} at (0,0) size 784x124
- RenderBlock {P} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 608x18
- text run at (0,0) width 608: "This tests pasting a blockquote into a blockquote. Nothing below should be double-blockquoted."
- RenderBlock {BLOCKQUOTE} at (0,34) size 784x72 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (22,0) size 23x18
- text run at (22,0) width 23: "one"
- RenderBR {BR} at (45,14) size 0x0
- RenderText {#text} at (22,18) size 24x18
- text run at (22,18) width 24: "two"
- RenderBR {BR} at (46,32) size 0x0
- RenderText {#text} at (22,36) size 31x18
- text run at (22,36) width 31: "three"
- RenderBR {BR} at (53,50) size 0x0
- RenderText {#text} at (22,54) size 24x18
- text run at (22,54) width 24: "two"
- RenderBlock (anonymous) at (0,106) size 784x0
- RenderBlock {BLOCKQUOTE} at (0,106) size 784x18 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderBR {BR} at (22,0) size 0x18
- RenderBlock (anonymous) at (0,124) size 784x18
- RenderBR {BR} at (0,0) size 0x18
-caret: position 3 of child 6 {#text} of child 3 {BLOCKQUOTE} of child 1 {DIV} of child 1 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt (86816 => 86817)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt 2011-05-19 03:21:04 UTC (rev 86816)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/paste-blockquote-into-blockquote-3-expected.txt 2011-05-19 04:02:52 UTC (rev 86817)
@@ -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 {DIV} at (0,0) size 784x170
- RenderBlock {DIV} at (0,0) size 784x148
- RenderBlock {P} at (0,0) size 784x22
- RenderText {#text} at (0,0) size 647x22
- text run at (0,0) width 647: "This tests pasting a blockquote into a blockquote. Nothing below should be double-blockquoted."
- RenderBlock {BLOCKQUOTE} at (0,38) size 784x88 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderText {#text} at (22,0) size 24x22
- text run at (22,0) width 24: "one"
- RenderBR {BR} at (46,16) size 0x0
- RenderText {#text} at (22,22) size 25x22
- text run at (22,22) width 25: "two"
- RenderBR {BR} at (47,38) size 0x0
- RenderText {#text} at (22,44) size 35x22
- text run at (22,44) width 35: "three"
- RenderBR {BR} at (57,60) size 0x0
- RenderText {#text} at (22,66) size 25x22
- text run at (22,66) width 25: "two"
- RenderBlock (anonymous) at (0,126) size 784x0
- RenderBlock {BLOCKQUOTE} at (0,126) size 784x22 [color=#0000FF] [border: (2px solid #0000FF)]
- RenderBR {BR} at (22,0) size 0x22
- RenderBlock (anonymous) at (0,148) size 784x22
- RenderBR {BR} at (0,0) size 0x22
-caret: position 3 of child 6 {#text} of child 3 {BLOCKQUOTE} of child 1 {DIV} of child 1 {DIV} of body
