Diff
Modified: trunk/LayoutTests/ChangeLog (87492 => 87493)
--- trunk/LayoutTests/ChangeLog 2011-05-27 11:16:52 UTC (rev 87492)
+++ trunk/LayoutTests/ChangeLog 2011-05-27 11:22:55 UTC (rev 87493)
@@ -1,3 +1,24 @@
+2011-05-27 Ryosuke Niwa <rn...@webkit.org>
+
+ Reviewed by Kent Tamura.
+
+ Convert editing/pasteboard/paste-unrendered-select.html to a dump-as-markup test
+ https://bugs.webkit.org/show_bug.cgi?id=61616
+
+ Converted paste-unrendered-select.html to a dump-as-markup test.
+
+ * editing/pasteboard/paste-unrendered-select-expected.txt: Added.
+ * editing/pasteboard/paste-unrendered-select.html:
+ * platform/chromium-linux/editing/pasteboard/paste-unrendered-select-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-unrendered-select-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-unrendered-select-expected.txt: Removed.
+ * platform/gtk/editing/pasteboard/paste-unrendered-select-expected.png: Removed.
+ * platform/gtk/editing/pasteboard/paste-unrendered-select-expected.txt: Removed.
+ * platform/mac-leopard/editing/pasteboard/paste-unrendered-select-expected.png: Removed.
+ * platform/mac/editing/pasteboard/paste-unrendered-select-expected.png: Removed.
+ * platform/mac/editing/pasteboard/paste-unrendered-select-expected.txt: Removed.
+ * platform/qt/editing/pasteboard/paste-unrendered-select-expected.txt: Removed.
+
2011-05-27 Shishir Agrawal <shis...@chromium.org>
Reviewed by Tony Gentilcore.
Added: trunk/LayoutTests/editing/pasteboard/paste-unrendered-select-expected.txt (0 => 87493)
--- trunk/LayoutTests/editing/pasteboard/paste-unrendered-select-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-unrendered-select-expected.txt 2011-05-27 11:22:55 UTC (rev 87493)
@@ -0,0 +1,4 @@
+This tests copy/paste of an unrendered select. The options inside of it should not be pasted.
+| "Hello"
+| " "
+| "World<#selection-caret>"
Modified: trunk/LayoutTests/editing/pasteboard/paste-unrendered-select.html (87492 => 87493)
--- trunk/LayoutTests/editing/pasteboard/paste-unrendered-select.html 2011-05-27 11:16:52 UTC (rev 87492)
+++ trunk/LayoutTests/editing/pasteboard/paste-unrendered-select.html 2011-05-27 11:22:55 UTC (rev 87493)
@@ -1,7 +1,10 @@
+<!DOCTYPE html>
+<html>
+<body>
<p>This tests copy/paste of an unrendered select. The options inside of it should not be pasted.</p>
<div id="copy" contenteditable="true">Hello <span style="display:none;"><select><option>1</option></select></span> World</div>
<div id="paste" contenteditable="true"></div>
-
+<script src=""
<script>
var copy = document.getElementById("copy");
copy.focus();
@@ -11,4 +14,9 @@
var paste = document.getElementById("paste");
paste.focus();
document.execCommand("Paste");
+
+Markup.description(document.getElementsByTagName('p')[0].textContent);
+Markup.dump('paste');
</script>
+</body>
+</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-unrendered-select-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-unrendered-select-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-unrendered-select-expected.txt (87492 => 87493)
--- trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-unrendered-select-expected.txt 2011-05-27 11:16:52 UTC (rev 87492)
+++ trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-unrendered-select-expected.txt 2011-05-27 11:22:55 UTC (rev 87493)
@@ -1,22 +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 784x20
- RenderText {#text} at (0,0) size 547x19
- text run at (0,0) width 278: "This tests copy/paste of an unrendered select. "
- text run at (278,0) width 269: "The options inside of it should not be pasted."
- RenderBlock {DIV} at (0,36) size 784x20
- RenderText {#text} at (0,0) size 36x19
- text run at (0,0) width 36: "Hello "
- RenderText {#text} at (36,0) size 39x19
- text run at (36,0) width 39: "World"
- RenderBlock {DIV} at (0,56) size 784x20
- RenderText {#text} at (0,0) size 32x19
- text run at (0,0) width 32: "Hello"
- RenderText {#text} at (32,0) size 4x19
- text run at (32,0) width 4: " "
- RenderText {#text} at (36,0) size 39x19
- text run at (36,0) width 39: "World"
-caret: position 5 of child 2 {#text} of child 4 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-unrendered-select-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-unrendered-select-expected.txt (87492 => 87493)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-unrendered-select-expected.txt 2011-05-27 11:16:52 UTC (rev 87492)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-unrendered-select-expected.txt 2011-05-27 11:22:55 UTC (rev 87493)
@@ -1,22 +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 784x19
- RenderText {#text} at (0,0) size 570x19
- text run at (0,0) width 288: "This tests copy/paste of an unrendered select. "
- text run at (288,0) width 282: "The options inside of it should not be pasted."
- RenderBlock {DIV} at (0,35) size 784x19
- RenderText {#text} at (0,0) size 39x19
- text run at (0,0) width 39: "Hello "
- RenderText {#text} at (39,0) size 40x19
- text run at (39,0) width 40: "World"
- RenderBlock {DIV} at (0,54) size 784x19
- RenderText {#text} at (0,0) size 35x19
- text run at (0,0) width 35: "Hello"
- RenderText {#text} at (35,0) size 4x19
- text run at (35,0) width 4: " "
- RenderText {#text} at (39,0) size 40x19
- text run at (39,0) width 40: "World"
-caret: position 5 of child 2 {#text} of child 4 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-unrendered-select-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-unrendered-select-expected.txt (87492 => 87493)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/paste-unrendered-select-expected.txt 2011-05-27 11:16:52 UTC (rev 87492)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/paste-unrendered-select-expected.txt 2011-05-27 11:22:55 UTC (rev 87493)
@@ -1,22 +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 784x18
- RenderText {#text} at (0,0) size 570x18
- text run at (0,0) width 288: "This tests copy/paste of an unrendered select. "
- text run at (288,0) width 282: "The options inside of it should not be pasted."
- RenderBlock {DIV} at (0,34) size 784x18
- RenderText {#text} at (0,0) size 39x18
- text run at (0,0) width 39: "Hello "
- RenderText {#text} at (39,0) size 40x18
- text run at (39,0) width 40: "World"
- RenderBlock {DIV} at (0,52) size 784x18
- RenderText {#text} at (0,0) size 35x18
- text run at (0,0) width 35: "Hello"
- RenderText {#text} at (35,0) size 4x18
- text run at (35,0) width 4: " "
- RenderText {#text} at (39,0) size 40x18
- text run at (39,0) width 40: "World"
-caret: position 5 of child 2 {#text} of child 4 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/pasteboard/paste-unrendered-select-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/pasteboard/paste-unrendered-select-expected.txt (87492 => 87493)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/paste-unrendered-select-expected.txt 2011-05-27 11:16:52 UTC (rev 87492)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/paste-unrendered-select-expected.txt 2011-05-27 11:22:55 UTC (rev 87493)
@@ -1,22 +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 784x22
- RenderText {#text} at (0,0) size 608x22
- text run at (0,0) width 308: "This tests copy/paste of an unrendered select. "
- text run at (308,0) width 300: "The options inside of it should not be pasted."
- RenderBlock {DIV} at (0,38) size 784x22
- RenderText {#text} at (0,0) size 39x22
- text run at (0,0) width 39: "Hello "
- RenderText {#text} at (39,0) size 44x22
- text run at (39,0) width 44: "World"
- RenderBlock {DIV} at (0,60) size 784x22
- RenderText {#text} at (0,0) size 35x22
- text run at (0,0) width 35: "Hello"
- RenderText {#text} at (35,0) size 4x22
- text run at (35,0) width 4: " "
- RenderText {#text} at (39,0) size 44x22
- text run at (39,0) width 44: "World"
-caret: position 5 of child 2 {#text} of child 4 {DIV} of body
