Diff
Modified: trunk/LayoutTests/ChangeLog (88839 => 88840)
--- trunk/LayoutTests/ChangeLog 2011-06-14 18:45:33 UTC (rev 88839)
+++ trunk/LayoutTests/ChangeLog 2011-06-14 18:48:55 UTC (rev 88840)
@@ -1,3 +1,25 @@
+2011-06-14 Wyatt Carss <[email protected]>
+
+ Reviewed by Ryosuke Niwa.
+
+ dump-as-text conversion: editing/deleting/5300379.html
+ https://bugs.webkit.org/show_bug.cgi?id=62620
+
+ Converted from pixel test to dump-as-text. This tests that delete backward
+ by word does not hang inside an empty div, and that delete backward by word
+ deletes exactly one word.
+
+ * editing/deleting/5300379-expected.txt: Added.
+ * editing/deleting/5300379.html:
+ * platform/chromium-win/editing/deleting/5300379-expected.txt: Removed.
+ * platform/chromium-win/editing/deleting/5300379-expected.png: Removed.
+ * platform/gtk/editing/deleting/5300379-expected.txt: Removed.
+ * platform/gtk/editing/deleting/5300379-expected.png: Removed.
+ * platform/mac/editing/deleting/5300379-expected.txt: Removed.
+ * platform/mac/editing/deleting/5300379-expected.png: Removed.
+ * platform/qt/editing/deleting/5300379-expected.txt: Removed.
+ * platform/qt/editing/deleting/5300379-expected.png: Removed.
+
2011-06-14 Qi Zhang <[email protected]>
Reviewed by Laszlo Gombos.
Added: trunk/LayoutTests/editing/deleting/5300379-expected.txt (0 => 88840)
--- trunk/LayoutTests/editing/deleting/5300379-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/deleting/5300379-expected.txt 2011-06-14 18:48:55 UTC (rev 88840)
@@ -0,0 +1,3 @@
+Success
+This tests that deleting backward by word in an empty div doesn't hang, and that it deletes exactly one word. You should see 'Success' above.
+
Modified: trunk/LayoutTests/editing/deleting/5300379.html (88839 => 88840)
--- trunk/LayoutTests/editing/deleting/5300379.html 2011-06-14 18:45:33 UTC (rev 88839)
+++ trunk/LayoutTests/editing/deleting/5300379.html 2011-06-14 18:48:55 UTC (rev 88840)
@@ -1,8 +1,8 @@
<div></div>
<div contenteditable="true" id="div"></div>
<div></div>
+<script>
-<script>
div = document.getElementById("div");
sel = window.getSelection();
sel.setPosition(div, 0);
@@ -13,6 +13,8 @@
// Delete 'FAIL' with deleteWordBackward: to verify that it's not a no-op.
layoutTestController.execCommand("DeleteWordBackward");
layoutTestController.execCommand("DeleteBackward");
+ document.execCommand("InsertText", false, "\nThis tests that deleting backward by word in an empty div doesn't hang, and that it deletes exactly one word. You should see 'Success' above.");
+ window.layoutTestController.dumpAsText();
} else {
document.execCommand("InsertText", false, "To run this test manually. Delete all this text and then option-delete. Safari shouldn't hang.");
}
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/deleting/5300379-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/5300379-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/5300379-expected.txt (88839 => 88840)
--- trunk/LayoutTests/platform/chromium-win/editing/deleting/5300379-expected.txt 2011-06-14 18:45:33 UTC (rev 88839)
+++ trunk/LayoutTests/platform/chromium-win/editing/deleting/5300379-expected.txt 2011-06-14 18:48:55 UTC (rev 88840)
@@ -1,11 +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 {DIV} at (0,0) size 784x0
- RenderBlock {DIV} at (0,0) size 784x20
- RenderText {#text} at (0,0) size 49x19
- text run at (0,0) width 49: "Success"
- RenderBlock {DIV} at (0,20) size 784x0
-caret: position 7 of child 0 {#text} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/deleting/5300379-expected.txt (88839 => 88840)
--- trunk/LayoutTests/platform/gtk/editing/deleting/5300379-expected.txt 2011-06-14 18:45:33 UTC (rev 88839)
+++ trunk/LayoutTests/platform/gtk/editing/deleting/5300379-expected.txt 2011-06-14 18:48:55 UTC (rev 88840)
@@ -1,11 +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 {DIV} at (0,0) size 784x0
- RenderBlock {DIV} at (0,0) size 784x19
- RenderText {#text} at (0,0) size 50x19
- text run at (0,0) width 50: "Success"
- RenderBlock {DIV} at (0,19) size 784x0
-caret: position 7 of child 0 {#text} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/5300379-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/5300379-expected.txt (88839 => 88840)
--- trunk/LayoutTests/platform/mac/editing/deleting/5300379-expected.txt 2011-06-14 18:45:33 UTC (rev 88839)
+++ trunk/LayoutTests/platform/mac/editing/deleting/5300379-expected.txt 2011-06-14 18:48:55 UTC (rev 88840)
@@ -1,11 +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 {DIV} at (0,0) size 784x0
- RenderBlock {DIV} at (0,0) size 784x18
- RenderText {#text} at (0,0) size 50x18
- text run at (0,0) width 50: "Success"
- RenderBlock {DIV} at (0,18) size 784x0
-caret: position 7 of child 0 {#text} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/deleting/5300379-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/5300379-expected.txt (88839 => 88840)
--- trunk/LayoutTests/platform/qt/editing/deleting/5300379-expected.txt 2011-06-14 18:45:33 UTC (rev 88839)
+++ trunk/LayoutTests/platform/qt/editing/deleting/5300379-expected.txt 2011-06-14 18:48:55 UTC (rev 88840)
@@ -1,11 +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 {DIV} at (0,0) size 784x0
- RenderBlock {DIV} at (0,0) size 784x22
- RenderText {#text} at (0,0) size 51x22
- text run at (0,0) width 51: "Success"
- RenderBlock {DIV} at (0,22) size 784x0
-caret: position 7 of child 0 {#text} of child 2 {DIV} of body