Diff
Modified: trunk/LayoutTests/ChangeLog (86714 => 86715)
--- trunk/LayoutTests/ChangeLog 2011-05-17 22:49:36 UTC (rev 86714)
+++ trunk/LayoutTests/ChangeLog 2011-05-17 23:03:43 UTC (rev 86715)
@@ -1,3 +1,24 @@
+2011-05-17 Ryosuke Niwa <[email protected]>
+
+ Reviewed by Enrica Casucci.
+
+ editing/pasteboard/paste-text-012.html should be a dump-as-markup test
+ https://bugs.webkit.org/show_bug.cgi?id=60996
+
+ Converted the test.
+
+ * editing/pasteboard/paste-text-012-expected.txt: Added.
+ * editing/pasteboard/paste-text-012.html:
+ * platform/chromium-linux/editing/pasteboard/paste-text-012-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-text-012-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/paste-text-012-expected.txt: Removed.
+ * platform/gtk/editing/pasteboard/paste-text-012-expected.png: Removed.
+ * platform/gtk/editing/pasteboard/paste-text-012-expected.txt: Removed.
+ * platform/mac-leopard/editing/pasteboard/paste-text-012-expected.png: Removed.
+ * platform/mac/editing/pasteboard/paste-text-012-expected.png: Removed.
+ * platform/mac/editing/pasteboard/paste-text-012-expected.txt: Removed.
+ * platform/qt/editing/pasteboard/paste-text-012-expected.txt: Removed.
+
2011-05-17 Robert Hogan <[email protected]>
Rubber-stamped by Csaba Osztrogonac.
Added: trunk/LayoutTests/editing/pasteboard/paste-text-012-expected.txt (0 => 86715)
--- trunk/LayoutTests/editing/pasteboard/paste-text-012-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/paste-text-012-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
@@ -0,0 +1,9 @@
+See this bug: <rdar://problem/3918712> "Paste as Quotation" in Mail just pastes (<blockquote> tag seems to be lost).
+
+To manually test, copy everything in the first editable box and paste it in the second box. You should see "foo" and a new line inside a red box.
+
+foo
+foo
+
+execCopyCommand: <div id="test" class="editing"><div><blockquote>foo</blockquote></div></div> <div class="editing"></div>
+execPasteCommand: <div id="test" class="editing"><div><blockquote>foo</blockquote></div></div> <div class="editing"><div id="test" class="editing" style="border-top-width: 2px; border-right-width: 2px; border-bottom-width: 2px; border-left-width: 2px; border-top-style: solid; border-right-style: solid; border-bottom-style: solid; border-left-style: solid; border-top-color: red; border-right-color: red; border-bottom-color: red; border-left-color: red; padding-top: 12px; padding-right: 12px; padding-bottom: 12px; padding-left: 12px; font-size: 24px; "><div><blockquote>foo</blockquote></div><div><br></div></div></div>
Modified: trunk/LayoutTests/editing/pasteboard/paste-text-012.html (86714 => 86715)
--- trunk/LayoutTests/editing/pasteboard/paste-text-012.html 2011-05-17 22:49:36 UTC (rev 86714)
+++ trunk/LayoutTests/editing/pasteboard/paste-text-012.html 2011-05-17 23:03:43 UTC (rev 86715)
@@ -1,6 +1,7 @@
+<!DOCTYPE html>
<html>
<head>
-
+<script src=""
<style>
.editing {
border: 2px solid red;
@@ -8,8 +9,16 @@
font-size: 24px;
}
</style>
+</head>
+<body>
+<p>See this bug: <a href="" "Paste as Quotation" in Mail just pastes (<blockquote> tag seems to be lost).</p>
+<p>To manually test, copy everything in the first editable box and paste it in the second box.
+You should see "foo" and a new line inside a red box.</p>
+<div contenteditable id="root">
+<div id="test" class="editing"><div><blockquote>foo</blockquote></div></div>
+<div class="editing"></div>
+</div>
<script src="" language="_javascript_" type="text/_javascript_" ></script>
-
<script>
function editingTest() {
@@ -21,21 +30,8 @@
pasteCommand();
}
+if (window.layoutTestController)
+ runDumpAsTextEditingTest();
</script>
-
-<title>Editing Test</title>
-</head>
-<body contenteditable id="root">
-
-See this bug: <a href="" "Paste as Quotation" in Mail just pastes (<blockquote> tag seems to be lost).
-Should see two boxes with blockquoted "foo" text, followed by an empty box.<br>
-
-<div id="test" class="editing"><div><blockquote>foo</blockquote></div></div>
-<div class="editing"></div>
-
-<script>
-runEditingTest();
-</script>
-
</body>
</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/pasteboard/paste-text-012-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-text-012-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-text-012-expected.txt (86714 => 86715)
--- trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-text-012-expected.txt 2011-05-17 22:49:36 UTC (rev 86714)
+++ trunk/LayoutTests/platform/chromium-win/editing/pasteboard/paste-text-012-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
@@ -1,43 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 10 of BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-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 (anonymous) at (0,0) size 784x40
- RenderText {#text} at (0,0) size 80x19
- text run at (0,0) width 80: "See this bug: "
- RenderInline {A} at (0,0) size 164x19 [color=#0000EE]
- RenderText {#text} at (80,0) size 164x19
- text run at (80,0) width 164: "<rdar://problem/3918712>"
- RenderText {#text} at (244,0) size 784x39
- text run at (244,0) width 537: " \"Paste as Quotation\" in Mail just pastes (<blockquote> tag seems to be lost). Should see"
- text run at (781,0) width 3: " "
- text run at (0,20) width 401: "two boxes with blockquoted \"foo\" text, followed by an empty box."
- RenderBR {BR} at (401,35) size 0x0
- RenderBlock {DIV} at (0,40) size 784x104 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,38) size 756x28
- RenderBlock {BLOCKQUOTE} at (40,0) size 676x28
- RenderText {#text} at (0,0) size 32x27
- text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (0,144) size 784x160 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,14) size 756x132 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,38) size 728x28
- RenderBlock {BLOCKQUOTE} at (40,0) size 648x28
- RenderText {#text} at (0,0) size 32x27
- text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (14,90) size 728x28
- RenderBR {BR} at (0,0) size 0x27
- RenderBlock (anonymous) at (14,146) size 756x0
-caret: position 0 of child 0 {BR} of child 1 {DIV} of child 0 {DIV} of child 7 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-text-012-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-text-012-expected.txt (86714 => 86715)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-text-012-expected.txt 2011-05-17 22:49:36 UTC (rev 86714)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-text-012-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
@@ -1,43 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 10 of BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-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 (anonymous) at (0,0) size 784x38
- RenderText {#text} at (0,0) size 85x19
- text run at (0,0) width 85: "See this bug: "
- RenderInline {A} at (0,0) size 167x19 [color=#0000EE]
- RenderText {#text} at (85,0) size 167x19
- text run at (85,0) width 167: "<rdar://problem/3918712>"
- RenderText {#text} at (252,0) size 740x38
- text run at (252,0) width 484: " \"Paste as Quotation\" in Mail just pastes (<blockquote> tag seems to be lost)."
- text run at (736,0) width 4: " "
- text run at (0,19) width 496: "Should see two boxes with blockquoted \"foo\" text, followed by an empty box."
- RenderBR {BR} at (496,34) size 0x0
- RenderBlock {DIV} at (0,38) size 784x104 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,38) size 756x28
- RenderBlock {BLOCKQUOTE} at (40,0) size 676x28
- RenderText {#text} at (0,0) size 32x28
- text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (0,142) size 784x160 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,14) size 756x132 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,38) size 728x28
- RenderBlock {BLOCKQUOTE} at (40,0) size 648x28
- RenderText {#text} at (0,0) size 32x28
- text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (14,90) size 728x28
- RenderBR {BR} at (0,0) size 0x28
- RenderBlock (anonymous) at (14,146) size 756x0
-caret: position 0 of child 0 {BR} of child 1 {DIV} of child 0 {DIV} of child 7 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-text-012-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-text-012-expected.txt (86714 => 86715)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/paste-text-012-expected.txt 2011-05-17 22:49:36 UTC (rev 86714)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/paste-text-012-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
@@ -1,43 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 10 of BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-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 (anonymous) at (0,0) size 784x36
- RenderText {#text} at (0,0) size 85x18
- text run at (0,0) width 85: "See this bug: "
- RenderInline {A} at (0,0) size 167x18 [color=#0000EE]
- RenderText {#text} at (85,0) size 167x18
- text run at (85,0) width 167: "<rdar://problem/3918712>"
- RenderText {#text} at (252,0) size 740x36
- text run at (252,0) width 484: " \"Paste as Quotation\" in Mail just pastes (<blockquote> tag seems to be lost)."
- text run at (736,0) width 4: " "
- text run at (0,18) width 496: "Should see two boxes with blockquoted \"foo\" text, followed by an empty box."
- RenderBR {BR} at (496,32) size 0x0
- RenderBlock {DIV} at (0,36) size 784x104 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,38) size 756x28
- RenderBlock {BLOCKQUOTE} at (40,0) size 676x28
- RenderText {#text} at (0,0) size 32x28
- text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (0,140) size 784x160 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,14) size 756x132 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,38) size 728x28
- RenderBlock {BLOCKQUOTE} at (40,0) size 648x28
- RenderText {#text} at (0,0) size 32x28
- text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (14,90) size 728x28
- RenderBR {BR} at (0,0) size 0x28
- RenderBlock (anonymous) at (14,146) size 756x0
-caret: position 0 of child 0 {BR} of child 1 {DIV} of child 0 {DIV} of child 7 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/pasteboard/paste-text-012-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/pasteboard/paste-text-012-expected.txt (86714 => 86715)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/paste-text-012-expected.txt 2011-05-17 22:49:36 UTC (rev 86714)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/paste-text-012-expected.txt 2011-05-17 23:03:43 UTC (rev 86715)
@@ -1,43 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 10 of BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document toDOMRange:range from 0 of DIV > DIV > DIV > BODY > HTML > #document to 0 of DIV > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-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 (anonymous) at (0,0) size 784x44
- RenderText {#text} at (0,0) size 90x22
- text run at (0,0) width 90: "See this bug: "
- RenderInline {A} at (0,0) size 179x22 [color=#0000EE]
- RenderText {#text} at (90,0) size 179x22
- text run at (90,0) width 179: "<rdar://problem/3918712>"
- RenderText {#text} at (269,0) size 754x44
- text run at (269,0) width 481: " \"Paste as Quotation\" in Mail just pastes (<blockquote> tag seems to be"
- text run at (750,0) width 4: " "
- text run at (0,22) width 559: "lost). Should see two boxes with blockquoted \"foo\" text, followed by an empty box."
- RenderBR {BR} at (559,38) size 0x0
- RenderBlock {DIV} at (0,44) size 784x109 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,38) size 756x33
- RenderBlock {BLOCKQUOTE} at (40,0) size 676x33
- RenderText {#text} at (0,0) size 32x33
- text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (0,153) size 784x170 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,14) size 756x142 [border: (2px solid #FF0000)]
- RenderBlock {DIV} at (14,38) size 728x33
- RenderBlock {BLOCKQUOTE} at (40,0) size 648x33
- RenderText {#text} at (0,0) size 32x33
- text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (14,95) size 728x33
- RenderBR {BR} at (0,0) size 0x33
- RenderBlock (anonymous) at (14,156) size 756x0
-caret: position 0 of child 0 {BR} of child 1 {DIV} of child 0 {DIV} of child 7 {DIV} of body
Modified: trunk/LayoutTests/platform/qt-mac/Skipped (86714 => 86715)
--- trunk/LayoutTests/platform/qt-mac/Skipped 2011-05-17 22:49:36 UTC (rev 86714)
+++ trunk/LayoutTests/platform/qt-mac/Skipped 2011-05-17 23:03:43 UTC (rev 86715)
@@ -904,7 +904,6 @@
editing/pasteboard/paste-text-009.html
editing/pasteboard/paste-text-010.html
editing/pasteboard/paste-text-011.html
-editing/pasteboard/paste-text-012.html
editing/pasteboard/paste-text-013.html
editing/pasteboard/paste-text-014.html
editing/pasteboard/paste-text-015.html
