Diff
Modified: trunk/LayoutTests/ChangeLog (96075 => 96076)
--- trunk/LayoutTests/ChangeLog 2011-09-27 06:43:27 UTC (rev 96075)
+++ trunk/LayoutTests/ChangeLog 2011-09-27 06:55:34 UTC (rev 96076)
@@ -1,3 +1,24 @@
+2011-09-26 Ryosuke Niwa <[email protected]>
+
+ dump-as-markup conversion: editing/deleting/delete-to-end-of-paragraph.html
+ https://bugs.webkit.org/show_bug.cgi?id=68865
+
+ Reviewed by Kent Tamura.
+
+ Converted the test.
+
+ * editing/deleting/delete-to-end-of-paragraph-expected.txt: Added.
+ * editing/deleting/delete-to-end-of-paragraph.html:
+ * platform/chromium-linux/editing/deleting/delete-to-end-of-paragraph-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/delete-to-end-of-paragraph-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/delete-to-end-of-paragraph-expected.txt: Removed.
+ * platform/gtk/editing/deleting/delete-to-end-of-paragraph-expected.txt: Removed.
+ * platform/mac-leopard/editing/deleting/delete-to-end-of-paragraph-expected.png: Removed.
+ * platform/mac/editing/deleting/delete-to-end-of-paragraph-expected.png: Removed.
+ * platform/mac/editing/deleting/delete-to-end-of-paragraph-expected.txt: Removed.
+ * platform/qt/editing/deleting/delete-to-end-of-paragraph-expected.png: Removed.
+ * platform/qt/editing/deleting/delete-to-end-of-paragraph-expected.txt: Removed.
+
2011-09-26 Renata Hodovan <[email protected]>
[Qt] Skip two tests because they are failing after r96070.
Copied: trunk/LayoutTests/editing/deleting/delete-to-end-of-paragraph-expected.txt (from rev 96075, trunk/LayoutTests/platform/chromium-win/editing/deleting/delete-to-end-of-paragraph-expected.txt) (0 => 96076)
--- trunk/LayoutTests/editing/deleting/delete-to-end-of-paragraph-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/deleting/delete-to-end-of-paragraph-expected.txt 2011-09-27 06:55:34 UTC (rev 96076)
@@ -0,0 +1,18 @@
+EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 7 of BODY > HTML > #document
+EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 13 of #text > DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
+EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
+| <span>
+| style="font-size: medium; "
+| "<#selection-caret>four five six"
+| <br>
Modified: trunk/LayoutTests/editing/deleting/delete-to-end-of-paragraph.html (96075 => 96076)
--- trunk/LayoutTests/editing/deleting/delete-to-end-of-paragraph.html 2011-09-27 06:43:27 UTC (rev 96075)
+++ trunk/LayoutTests/editing/deleting/delete-to-end-of-paragraph.html 2011-09-27 06:55:34 UTC (rev 96076)
@@ -1,41 +1,31 @@
+<!DOCTYPE html>
<html>
<head>
-
<style>
.editing {
font-size: 24px;
width: 600px;
}
</style>
-<script src="" language="_javascript_" type="text/_javascript_" ></script>
-
-<script>
-
-function editingTest() {
- if (window.layoutTestController) {
-
- try {
- // test for 4570218 by using double deleteToEndOfParagraph
- layoutTestController.execCommand("DeleteToEndOfParagraph");
- layoutTestController.execCommand("DeleteToEndOfParagraph");
-
- } catch (ex) {
- document.write("Exception: " + ex.description);
- }
- } else {
- document.write("(cannot run interactively)");
- }
-}
-
-</script>
-
<title>Editing Test</title>
</head>
<body contenteditable id="root">
<div id="test" class="editing">one two three</div><div>four five six</div>
+<script src=""
<script>
-runEditingTest();
-</script>
+if (!window.layoutTestController)
+ document.write("(cannot run interactively)");
+else {
+ layoutTestController.dumpEditingCallbacks();
+
+ getSelection().setPosition(document.getElementById('test'), 0);
+ // test for 4570218 by using double deleteToEndOfParagraph
+ layoutTestController.execCommand("DeleteToEndOfParagraph");
+ layoutTestController.execCommand("DeleteToEndOfParagraph");
+ Markup.dump('test');
+}
+
+</script>
</body>
</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/deleting/delete-to-end-of-paragraph-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/delete-to-end-of-paragraph-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/delete-to-end-of-paragraph-expected.txt (96075 => 96076)
--- trunk/LayoutTests/platform/chromium-win/editing/deleting/delete-to-end-of-paragraph-expected.txt 2011-09-27 06:43:27 UTC (rev 96075)
+++ trunk/LayoutTests/platform/chromium-win/editing/deleting/delete-to-end-of-paragraph-expected.txt 2011-09-27 06:55:34 UTC (rev 96076)
@@ -1,23 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 5 of BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 13 of #text > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of 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 {DIV} at (0,0) size 600x20
- RenderInline {SPAN} at (0,0) size 69x19
- RenderText {#text} at (0,0) size 69x19
- text run at (0,0) width 69: "four five six"
-caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/deleting/delete-to-end-of-paragraph-expected.txt (96075 => 96076)
--- trunk/LayoutTests/platform/gtk/editing/deleting/delete-to-end-of-paragraph-expected.txt 2011-09-27 06:43:27 UTC (rev 96075)
+++ trunk/LayoutTests/platform/gtk/editing/deleting/delete-to-end-of-paragraph-expected.txt 2011-09-27 06:55:34 UTC (rev 96076)
@@ -1,23 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 5 of BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 13 of #text > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of 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 {DIV} at (0,0) size 600x19
- RenderInline {SPAN} at (0,0) size 76x19
- RenderText {#text} at (0,0) size 76x19
- text run at (0,0) width 76: "four five six"
-caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/delete-to-end-of-paragraph-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/delete-to-end-of-paragraph-expected.txt (96075 => 96076)
--- trunk/LayoutTests/platform/mac/editing/deleting/delete-to-end-of-paragraph-expected.txt 2011-09-27 06:43:27 UTC (rev 96075)
+++ trunk/LayoutTests/platform/mac/editing/deleting/delete-to-end-of-paragraph-expected.txt 2011-09-27 06:55:34 UTC (rev 96076)
@@ -1,23 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 5 of BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 13 of #text > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of 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 {DIV} at (0,0) size 600x18
- RenderInline {SPAN} at (0,0) size 76x18
- RenderText {#text} at (0,0) size 76x18
- text run at (0,0) width 76: "four five six"
-caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/deleting/delete-to-end-of-paragraph-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/delete-to-end-of-paragraph-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/delete-to-end-of-paragraph-expected.txt (96075 => 96076)
--- trunk/LayoutTests/platform/qt/editing/deleting/delete-to-end-of-paragraph-expected.txt 2011-09-27 06:43:27 UTC (rev 96075)
+++ trunk/LayoutTests/platform/qt/editing/deleting/delete-to-end-of-paragraph-expected.txt 2011-09-27 06:55:34 UTC (rev 96076)
@@ -1,23 +0,0 @@
-EDITING DELEGATE: shouldBeginEditingInDOMRange:range from 0 of BODY > HTML > #document to 5 of BODY > HTML > #document
-EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of #text > DIV > BODY > HTML > #document to 13 of #text > DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
-EDITING DELEGATE: shouldDeleteDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of DIV > BODY > HTML > #document
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
-EDITING DELEGATE: shouldChangeSelectedDOMRange:(null) toDOMRange:range from 0 of DIV > BODY > HTML > #document to 0 of 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 {DIV} at (0,0) size 600x22
- RenderInline {SPAN} at (0,0) size 79x22
- RenderText {#text} at (0,0) size 79x22
- text run at (0,0) width 79: "four five six"
-caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 1 {DIV} of body
