Diff
Modified: trunk/LayoutTests/ChangeLog (93317 => 93318)
--- trunk/LayoutTests/ChangeLog 2011-08-18 17:16:17 UTC (rev 93317)
+++ trunk/LayoutTests/ChangeLog 2011-08-18 17:20:29 UTC (rev 93318)
@@ -1,3 +1,24 @@
+2011-08-17 Ryosuke Niwa <rn...@webkit.org>
+
+ dump-as-markup conversion: editing/pasteboard/testcase-9507.html
+ https://bugs.webkit.org/show_bug.cgi?id=66448
+
+ Reviewed by Kent Tamura.
+
+ Converted the test.
+
+ * editing/pasteboard/testcase-9507-expected.txt: Added.
+ * editing/pasteboard/testcase-9507.html:
+ * platform/chromium-linux/editing/pasteboard/testcase-9507-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/testcase-9507-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/testcase-9507-expected.txt: Removed.
+ * platform/gtk/editing/pasteboard/testcase-9507-expected.png: Removed.
+ * platform/gtk/editing/pasteboard/testcase-9507-expected.txt: Removed.
+ * platform/mac-leopard/editing/pasteboard/testcase-9507-expected.png: Removed.
+ * platform/mac/editing/pasteboard/testcase-9507-expected.png: Removed.
+ * platform/mac/editing/pasteboard/testcase-9507-expected.txt: Removed.
+ * platform/qt/editing/pasteboard/testcase-9507-expected.txt: Removed.
+
2011-08-18 Andrey Kosyakov <ca...@chromium.org>
Web Inspector: [Extensions API] rename webInspector.resources to webInspector.network
Added: trunk/LayoutTests/editing/pasteboard/testcase-9507-expected.txt (0 => 93318)
--- trunk/LayoutTests/editing/pasteboard/testcase-9507-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/testcase-9507-expected.txt 2011-08-18 17:20:29 UTC (rev 93318)
@@ -0,0 +1,43 @@
+When copying some text, under certain circumstances, empty style (or font) tags are created. This test checks that there is no empty <font> tag after 'foo' and before 'bar'.
+
+After copy:
+| "
+"
+| <div>
+| class="editing"
+| id="test"
+| "
+<#selection-anchor>foo
+"
+| <div>
+| style="color: rgb(255, 0, 0);"
+| "
+"
+| <div>
+| "bar<#selection-focus>"
+| "
+"
+| "
+"
+| "
+"
+
+After paste:
+| "
+"
+| <div>
+| class="editing"
+| id="test"
+| "foo"
+| <div>
+| style="color: rgb(255, 0, 0); "
+| <div>
+| "bar<#selection-caret>"
+| <div>
+| style="color: rgb(255, 0, 0);"
+| "
+"
+| "
+"
+| "
+"
Modified: trunk/LayoutTests/editing/pasteboard/testcase-9507.html (93317 => 93318)
--- trunk/LayoutTests/editing/pasteboard/testcase-9507.html 2011-08-18 17:16:17 UTC (rev 93317)
+++ trunk/LayoutTests/editing/pasteboard/testcase-9507.html 2011-08-18 17:20:29 UTC (rev 93318)
@@ -1,11 +1,5 @@
-<html>
+<html>
<head>
-<script>
-if (window.layoutTestController)
- layoutTestController.dumpEditingCallbacks();
-</script>
-
-
<style>
.editing {
border: 2px solid red;
@@ -21,21 +15,12 @@
.scenario:first-line { font-weight: bold; margin-bottom: 16px;}
.expected-results:first-line { font-weight: bold }
</style>
-<script src="" language="_javascript_" type="text/_javascript_" ></script>
-
-<script>
-function editingTest() {
- setSelectionCommand(document.getElementById("test"),0,document.getElementById("test"),5);
- copyCommand();
- pasteCommand();
-}
-
-</script>
-
-<title>Editing Test</title>
-</head>
+<script src=""
+<script src=""
+<title>Editing Test</title>
+</head>
<body>
-When copying some text, under certain circumstances, empty style (or font) tags are created. This test checks that there is no empty <font> tag after 'foo' and before 'bar'.
+<p id="description">When copying some text, under certain circumstances, empty style (or font) tags are created. This test checks that there is no empty <font> tag after 'foo' and before 'bar'.</p>
<div contenteditable id="root">
<div id="test" class="editing">
foo
@@ -44,10 +29,17 @@
</div>
</div>
</div>
-
<script>
-editingTest();
-</script>
+Markup.description(document.getElementById('description').textContent);
+
+setSelectionCommand(document.getElementById("test"),0,document.getElementById("test"),5);
+copyCommand();
+Markup.dump('root', 'After copy');
+
+pasteCommand();
+Markup.dump('root', 'After paste');
+
+</script>
</body>
</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/pasteboard/testcase-9507-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/testcase-9507-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/testcase-9507-expected.txt (93317 => 93318)
--- trunk/LayoutTests/platform/chromium-win/editing/pasteboard/testcase-9507-expected.txt 2011-08-18 17:16:17 UTC (rev 93317)
+++ trunk/LayoutTests/platform/chromium-win/editing/pasteboard/testcase-9507-expected.txt 2011-08-18 17:20:29 UTC (rev 93318)
@@ -1,29 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > 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 749x39
- text run at (0,0) width 749: "When copying some text, under certain circumstances, empty style (or font) tags are created. This test checks that there is no"
- text run at (0,20) width 268: "empty <font> tag after 'foo' and before 'bar'."
- RenderBlock {DIV} at (0,40) size 784x60
- RenderBlock {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)]
- RenderBlock (anonymous) at (2,2) size 780x28
- RenderText {#text} at (0,0) size 32x27
- text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (2,30) size 780x28 [color=#FF0000]
- RenderBlock {DIV} at (0,0) size 780x28
- RenderText {#text} at (0,0) size 31x27
- text run at (0,0) width 31: "bar"
- RenderBlock (anonymous) at (2,58) size 780x0
- RenderBlock {DIV} at (2,58) size 780x0 [color=#FF0000]
-caret: position 3 of child 0 {#text} of child 0 {DIV} of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/testcase-9507-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/testcase-9507-expected.txt (93317 => 93318)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/testcase-9507-expected.txt 2011-08-18 17:16:17 UTC (rev 93317)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/testcase-9507-expected.txt 2011-08-18 17:20:29 UTC (rev 93318)
@@ -1,29 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > 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 780x38
- text run at (0,0) width 780: "When copying some text, under certain circumstances, empty style (or font) tags are created. This test checks that there is no"
- text run at (0,19) width 277: "empty <font> tag after 'foo' and before 'bar'."
- RenderBlock {DIV} at (0,38) size 784x60
- RenderBlock {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)]
- RenderBlock (anonymous) at (2,2) size 780x28
- RenderText {#text} at (0,0) size 32x28
- text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (2,30) size 780x28 [color=#FF0000]
- RenderBlock {DIV} at (0,0) size 780x28
- RenderText {#text} at (0,0) size 31x28
- text run at (0,0) width 31: "bar"
- RenderBlock (anonymous) at (2,58) size 780x0
- RenderBlock {DIV} at (2,58) size 780x0 [color=#FF0000]
-caret: position 3 of child 0 {#text} of child 0 {DIV} of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/testcase-9507-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/testcase-9507-expected.txt (93317 => 93318)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/testcase-9507-expected.txt 2011-08-18 17:16:17 UTC (rev 93317)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/testcase-9507-expected.txt 2011-08-18 17:20:29 UTC (rev 93318)
@@ -1,29 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > 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 780x36
- text run at (0,0) width 780: "When copying some text, under certain circumstances, empty style (or font) tags are created. This test checks that there is no"
- text run at (0,18) width 277: "empty <font> tag after 'foo' and before 'bar'."
- RenderBlock {DIV} at (0,36) size 784x60
- RenderBlock {DIV} at (0,0) size 784x60 [border: (2px solid #FF0000)]
- RenderBlock (anonymous) at (2,2) size 780x28
- RenderText {#text} at (0,0) size 32x28
- text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (2,30) size 780x28 [color=#FF0000]
- RenderBlock {DIV} at (0,0) size 780x28
- RenderText {#text} at (0,0) size 31x28
- text run at (0,0) width 31: "bar"
- RenderBlock (anonymous) at (2,58) size 780x0
- RenderBlock {DIV} at (2,58) size 780x0 [color=#FF0000]
-caret: position 3 of child 0 {#text} of child 0 {DIV} of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/pasteboard/testcase-9507-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/pasteboard/testcase-9507-expected.txt (93317 => 93318)
--- trunk/LayoutTests/platform/qt/editing/pasteboard/testcase-9507-expected.txt 2011-08-18 17:16:17 UTC (rev 93317)
+++ trunk/LayoutTests/platform/qt/editing/pasteboard/testcase-9507-expected.txt 2011-08-18 17:20:29 UTC (rev 93318)
@@ -1,29 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of DIV > BODY > HTML > #document to 3 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 1 of #text > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document givenAction:WebViewInsertActionPasted
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 3 of #text > DIV > DIV > DIV > DIV > BODY > HTML > #document to 3 of #text > DIV > 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 764x44
- text run at (0,0) width 764: "When copying some text, under certain circumstances, empty style (or font) tags are created. This test checks that"
- text run at (0,22) width 376: "there is no empty <font> tag after 'foo' and before 'bar'."
- RenderBlock {DIV} at (0,44) size 784x70
- RenderBlock {DIV} at (0,0) size 784x70 [border: (2px solid #FF0000)]
- RenderBlock (anonymous) at (2,2) size 780x33
- RenderText {#text} at (0,0) size 32x33
- text run at (0,0) width 32: "foo"
- RenderBlock {DIV} at (2,35) size 780x33 [color=#FF0000]
- RenderBlock {DIV} at (0,0) size 780x33
- RenderText {#text} at (0,0) size 36x33
- text run at (0,0) width 36: "bar"
- RenderBlock (anonymous) at (2,68) size 780x0
- RenderBlock {DIV} at (2,68) size 780x0 [color=#FF0000]
-caret: position 3 of child 0 {#text} of child 0 {DIV} of child 1 {DIV} of child 1 {DIV} of child 1 {DIV} of body
