2011-05-26 Ryosuke Niwa <rniwa@webkit.org>

        Reviewed by Eric Seidel.

        editing/pasteboard/5027857.html should be renamed and converted to a dump-as-markup test
        https://bugs.webkit.org/show_bug.cgi?id=61602

        Renamed 5027857.html to paste-code-in-pre.html and converted it to a dump-as-markup test.

        * editing/pasteboard/5027857.html: Removed.
        * editing/pasteboard/paste-code-in-pre-expected.txt: Added.
        * editing/pasteboard/paste-code-in-pre.html: Copied from LayoutTests/editing/pasteboard/5027857.html.
        * platform/chromium-linux/editing/pasteboard/5027857-expected.png: Removed.
        * platform/chromium-win/editing/pasteboard/5027857-expected.png: Removed.
        * platform/chromium-win/editing/pasteboard/5027857-expected.txt: Removed.
        * platform/chromium-win/editing/pasteboard/paste-code-in-pre-expected.txt: Added.
        * platform/gtk/editing/pasteboard/5027857-expected.png: Removed.
        * platform/gtk/editing/pasteboard/5027857-expected.txt: Removed.
        * platform/mac-leopard/editing/pasteboard/5027857-expected.png: Removed.
        * platform/mac/editing/pasteboard/5027857-expected.png: Removed.
        * platform/mac/editing/pasteboard/5027857-expected.txt: Removed.
        * platform/qt/editing/pasteboard/5027857-expected.txt: Removed.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@87468 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cb7af41..6715131 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,26 @@
+2011-05-26  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        editing/pasteboard/5027857.html should be renamed and converted to a dump-as-markup test
+        https://bugs.webkit.org/show_bug.cgi?id=61602
+
+        Renamed 5027857.html to paste-code-in-pre.html and converted it to a dump-as-markup test.
+
+        * editing/pasteboard/5027857.html: Removed.
+        * editing/pasteboard/paste-code-in-pre-expected.txt: Added.
+        * editing/pasteboard/paste-code-in-pre.html: Copied from LayoutTests/editing/pasteboard/5027857.html.
+        * platform/chromium-linux/editing/pasteboard/5027857-expected.png: Removed.
+        * platform/chromium-win/editing/pasteboard/5027857-expected.png: Removed.
+        * platform/chromium-win/editing/pasteboard/5027857-expected.txt: Removed.
+        * platform/chromium-win/editing/pasteboard/paste-code-in-pre-expected.txt: Added.
+        * platform/gtk/editing/pasteboard/5027857-expected.png: Removed.
+        * platform/gtk/editing/pasteboard/5027857-expected.txt: Removed.
+        * platform/mac-leopard/editing/pasteboard/5027857-expected.png: Removed.
+        * platform/mac/editing/pasteboard/5027857-expected.png: Removed.
+        * platform/mac/editing/pasteboard/5027857-expected.txt: Removed.
+        * platform/qt/editing/pasteboard/5027857-expected.txt: Removed.
+
 2011-05-26  Annie Sullivan  <sullivan@chromium.org>
 
         Reviewed by Ryosuke Niwa.

diff --git a/LayoutTests/editing/pasteboard/5027857.html b/LayoutTests/editing/pasteboard/5027857.html
deleted file mode 100644 (file)
index 904d804..0000000
--- a/LayoutTests/editing/pasteboard/5027857.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<p>This tests a bug when copying HTML markup inside &lt;pre&gt; tags.  When pasted, this content would appear as the rendered form of that markup.  You should see markup in the editable region below.</p>
-<pre id="pre" contenteditable="true">&lt;input type='button'&gt;foo&lt;br&gt;bar&lt;b&gt;baz&lt;/b&gt;</pre>
-
-<script>
-var pre = document.getElementById("pre");
-pre.focus();
-document.execCommand("SelectAll");
-document.execCommand("Cut");
-document.execCommand("Paste");
-</script>

diff --git a/LayoutTests/editing/pasteboard/paste-code-in-pre-expected.txt b/LayoutTests/editing/pasteboard/paste-code-in-pre-expected.txt
new file mode 100644 (file)
index 0000000..ac8097b
--- /dev/null
+++ b/LayoutTests/editing/pasteboard/paste-code-in-pre-expected.txt
@@ -0,0 +1,12 @@
+This tests a bug when copying HTML markup inside <pre> tags. When pasted, this content would appear as the rendered form of that markup.
+You should see markup in the editable region below. See <rdar://5027857>.
+| <pre>
+|   contenteditable="true"
+|   id="pre"
+|   <span>
+|     class="Apple-style-span"
+|     style="font-family: Times; white-space: normal; "
+|     <pre>
+|       contenteditable="true"
+|       id="pre"
+|       "<input type='button'>foo<br>bar<b>baz</b><#selection-caret>"

diff --git a/LayoutTests/editing/pasteboard/paste-code-in-pre.html b/LayoutTests/editing/pasteboard/paste-code-in-pre.html
new file mode 100644 (file)
index 0000000..d55dfd8
--- /dev/null
+++ b/LayoutTests/editing/pasteboard/paste-code-in-pre.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<body>
+<p>This tests a bug when copying HTML markup inside &lt;pre&gt; tags. When pasted, this content would appear as the rendered form of that markup.
+You should see markup in the editable region below. See &lt;rdar://5027857&gt;.</p>
+<div><pre id="pre" contenteditable="true">&lt;input type='button'&gt;foo&lt;br&gt;bar&lt;b&gt;baz&lt;/b&gt;</pre></div>
+<script src="../../resources/dump-as-markup.js"></script>
+<script>
+
+var pre = document.getElementById("pre");
+pre.focus();
+document.execCommand("SelectAll");
+document.execCommand("Cut");
+document.execCommand("Paste");
+
+Markup.description(document.getElementsByTagName('p')[0].textContent);
+Markup.dump(pre.parentNode);
+
+</script>
+</body>
+</html>

diff --git a/LayoutTests/platform/chromium-linux/editing/pasteboard/5027857-expected.png b/LayoutTests/platform/chromium-linux/editing/pasteboard/5027857-expected.png
deleted file mode 100644 (file)
index c46e18e..0000000
Binary files a/LayoutTests/platform/chromium-linux/editing/pasteboard/5027857-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/5027857-expected.png b/LayoutTests/platform/chromium-win/editing/pasteboard/5027857-expected.png
deleted file mode 100644 (file)
index a483dd9..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/pasteboard/5027857-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/5027857-expected.txt b/LayoutTests/platform/chromium-win/editing/pasteboard/5027857-expected.txt
deleted file mode 100644 (file)
index 3fa63af..0000000
--- a/LayoutTests/platform/chromium-win/editing/pasteboard/5027857-expected.txt
+++ /dev/null
@@ -1,21 +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 784x579
-      RenderBlock {P} at (0,0) size 784x40
-        RenderText {#text} at (0,0) size 781x39
-          text run at (0,0) width 393: "This tests a bug when copying HTML markup inside <pre> tags. "
-          text run at (393,0) width 388: "When pasted, this content would appear as the rendered form of"
-          text run at (0,20) width 80: "that markup. "
-          text run at (80,20) width 316: "You should see markup in the editable region below."
-      RenderBlock {PRE} at (0,56) size 784x16
-        RenderBlock (anonymous) at (0,0) size 784x0
-          RenderInline {SPAN} at (0,0) size 0x0
-        RenderBlock (anonymous) at (0,0) size 784x16
-          RenderBlock {PRE} at (0,0) size 784x16
-            RenderText {#text} at (0,0) size 328x16
-              text run at (0,0) width 328: "<input type='button'>foo<br>bar<b>baz</b>"
-        RenderBlock (anonymous) at (0,29) size 784x0
-          RenderInline {SPAN} at (0,0) size 0x0
-caret: position 41 of child 0 {#text} of child 0 {PRE} of child 0 {SPAN} of child 2 {PRE} of body

diff --git a/LayoutTests/platform/chromium-win/editing/pasteboard/paste-code-in-pre-expected.txt b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-code-in-pre-expected.txt
new file mode 100644 (file)
index 0000000..22deea0
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/editing/pasteboard/paste-code-in-pre-expected.txt
@@ -0,0 +1,12 @@
+This tests a bug when copying HTML markup inside <pre> tags. When pasted, this content would appear as the rendered form of that markup.
+You should see markup in the editable region below. See <rdar://5027857>.
+| <pre>
+|   contenteditable="true"
+|   id="pre"
+|   <span>
+|     class="Apple-style-span"
+|     style="font-family: 'times new roman'; white-space: normal; "
+|     <pre>
+|       contenteditable="true"
+|       id="pre"
+|       "<input type='button'>foo<br>bar<b>baz</b><#selection-caret>"

diff --git a/LayoutTests/platform/gtk/editing/pasteboard/5027857-expected.png b/LayoutTests/platform/gtk/editing/pasteboard/5027857-expected.png
deleted file mode 100644 (file)
index 0f28a69..0000000
Binary files a/LayoutTests/platform/gtk/editing/pasteboard/5027857-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/gtk/editing/pasteboard/5027857-expected.txt b/LayoutTests/platform/gtk/editing/pasteboard/5027857-expected.txt
deleted file mode 100644 (file)
index 854734c..0000000
--- a/LayoutTests/platform/gtk/editing/pasteboard/5027857-expected.txt
+++ /dev/null
@@ -1,21 +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 784x579
-      RenderBlock {P} at (0,0) size 784x38
-        RenderText {#text} at (0,0) size 765x38
-          text run at (0,0) width 414: "This tests a bug when copying HTML markup inside <pre> tags. "
-          text run at (414,0) width 351: "When pasted, this content would appear as the rendered"
-          text run at (0,19) width 134: "form of that markup. "
-          text run at (134,19) width 333: "You should see markup in the editable region below."
-      RenderBlock {PRE} at (0,54) size 784x15
-        RenderBlock (anonymous) at (0,0) size 784x0
-          RenderInline {SPAN} at (0,0) size 0x0
-        RenderBlock (anonymous) at (0,0) size 784x15
-          RenderBlock {PRE} at (0,0) size 784x15
-            RenderText {#text} at (0,0) size 328x15
-              text run at (0,0) width 328: "<input type='button'>foo<br>bar<b>baz</b>"
-        RenderBlock (anonymous) at (0,28) size 784x0
-          RenderInline {SPAN} at (0,0) size 0x0
-caret: position 41 of child 0 {#text} of child 0 {PRE} of child 0 {SPAN} of child 2 {PRE} of body

diff --git a/LayoutTests/platform/mac-leopard/editing/pasteboard/5027857-expected.png b/LayoutTests/platform/mac-leopard/editing/pasteboard/5027857-expected.png
deleted file mode 100644 (file)
index f0a3cb2..0000000
Binary files a/LayoutTests/platform/mac-leopard/editing/pasteboard/5027857-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/mac/editing/pasteboard/5027857-expected.png b/LayoutTests/platform/mac/editing/pasteboard/5027857-expected.png
deleted file mode 100644 (file)
index 2829ee1..0000000
Binary files a/LayoutTests/platform/mac/editing/pasteboard/5027857-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/mac/editing/pasteboard/5027857-expected.txt b/LayoutTests/platform/mac/editing/pasteboard/5027857-expected.txt
deleted file mode 100644 (file)
index 422c6fb..0000000
--- a/LayoutTests/platform/mac/editing/pasteboard/5027857-expected.txt
+++ /dev/null
@@ -1,21 +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 784x579
-      RenderBlock {P} at (0,0) size 784x36
-        RenderText {#text} at (0,0) size 765x36
-          text run at (0,0) width 414: "This tests a bug when copying HTML markup inside <pre> tags. "
-          text run at (414,0) width 351: "When pasted, this content would appear as the rendered"
-          text run at (0,18) width 134: "form of that markup. "
-          text run at (134,18) width 333: "You should see markup in the editable region below."
-      RenderBlock {PRE} at (0,52) size 784x15
-        RenderBlock (anonymous) at (0,0) size 784x0
-          RenderInline {SPAN} at (0,0) size 0x0
-        RenderBlock (anonymous) at (0,0) size 784x15
-          RenderBlock {PRE} at (0,0) size 784x15
-            RenderText {#text} at (0,0) size 328x15
-              text run at (0,0) width 328: "<input type='button'>foo<br>bar<b>baz</b>"
-        RenderBlock (anonymous) at (0,28) size 784x0
-          RenderInline {SPAN} at (0,0) size 0x0
-caret: position 41 of child 0 {#text} of child 0 {PRE} of child 0 {SPAN} of child 2 {PRE} of body

diff --git a/LayoutTests/platform/qt/editing/pasteboard/5027857-expected.txt b/LayoutTests/platform/qt/editing/pasteboard/5027857-expected.txt
deleted file mode 100644 (file)
index 153c792..0000000
--- a/LayoutTests/platform/qt/editing/pasteboard/5027857-expected.txt
+++ /dev/null
@@ -1,21 +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 784x579
-      RenderBlock {P} at (0,0) size 784x44
-        RenderText {#text} at (0,0) size 758x44
-          text run at (0,0) width 442: "This tests a bug when copying HTML markup inside <pre> tags. "
-          text run at (442,0) width 316: "When pasted, this content would appear as the"
-          text run at (0,22) width 214: "rendered form of that markup. "
-          text run at (214,22) width 355: "You should see markup in the editable region below."
-      RenderBlock {PRE} at (0,60) size 784x17
-        RenderBlock (anonymous) at (0,0) size 784x0
-          RenderInline {SPAN} at (0,0) size 0x0
-        RenderBlock (anonymous) at (0,0) size 784x17
-          RenderBlock {PRE} at (0,0) size 784x17
-            RenderText {#text} at (0,0) size 255x17
-              text run at (0,0) width 255: "<input type='button'>foo<br>bar<b>baz</b>"
-        RenderBlock (anonymous) at (0,30) size 784x0
-          RenderInline {SPAN} at (0,0) size 0x0
-caret: position 41 of child 0 {#text} of child 0 {PRE} of child 0 {SPAN} of child 2 {PRE} of body