Diff
Modified: trunk/LayoutTests/ChangeLog (95002 => 95003)
--- trunk/LayoutTests/ChangeLog 2011-09-13 03:12:01 UTC (rev 95002)
+++ trunk/LayoutTests/ChangeLog 2011-09-13 03:13:33 UTC (rev 95003)
@@ -1,3 +1,32 @@
+2011-09-12 Wyatt Carss <wca...@chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ convert editing/deleting/5390681-2.html to dump-as-markup
+ https://bugs.webkit.org/show_bug.cgi?id=63293
+
+ Renamed editing/deleting/5390681* to editing/deleting/smart-delete-across-editable-boundaries,
+ Added doctype/html/body to both tests, and converted smart-delete-across-editable-boundaries-2
+ to dump-as-markup test in the same style as the first. Also updated results.
+
+ * editing/deleting/5390681.html: Removed.
+ * editing/deleting/5390681-expected.txt: Removed.
+ * editing/deleting/5390681-2.html: Removed.
+ * editing/deleting/smart-delete-across-editable-boundaries.html: Added.
+ * editing/deleting/smart-delete-across-editable-boundaries-expected.txt: Added.
+ * editing/deleting/smart-delete-across-editable-boundaries-2.html: Added.
+ * editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt: Added.
+ * platform/chromium-linux/editing/deleting/5390681-2-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/5390681-2-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/5390681-2-expected.txt: Removed.
+ * platform/gtk/editing/deleting/5390681-2-expected.txt: Removed.
+ * platform/mac-leopard/editing/deleting/5390681-2-expected.png: Removed.
+ * platform/mac/editing/deleting/5390681-2-expected.png: Removed.
+ * platform/mac/editing/deleting/5390681-2-expected.txt: Removed.
+ * platform/qt/editing/deleting/5390681-2-expected.png: Removed.
+ * platform/qt/editing/deleting/5390681-2-expected.txt: Removed.
+ * platform/qt/editing/deleting/5390681-expected.png: Removed.
+
2011-09-12 Fumitoshi Ukai <u...@chromium.org>
Unreviewed, update chromium test expectations.
Deleted: trunk/LayoutTests/editing/deleting/5390681-2.html (95002 => 95003)
--- trunk/LayoutTests/editing/deleting/5390681-2.html 2011-09-13 03:12:01 UTC (rev 95002)
+++ trunk/LayoutTests/editing/deleting/5390681-2.html 2011-09-13 03:13:33 UTC (rev 95003)
@@ -1,15 +0,0 @@
-<p>This tests for a bug where expansion for smart delete would not consider editable boundaries. Only 'foo' should be deleted. You should see ' bar'. <b>There is a bug: while the non-editable space isn't deleted, deletion inserts a placeholder when it shouldn't.</b></p>
-<div contenteditable="true" id="div">foo
-<span contenteditable="false"> bar</span></div>
-
-<script>
-var div = document.getElementById("div");
-var x = div.offsetLeft;
-var y = div.offsetTop;
-eventSender.mouseMoveTo(x, y);
-eventSender.mouseDown();
-eventSender.mouseUp();
-eventSender.mouseDown();
-eventSender.mouseUp();
-document.execCommand("Delete");
-</script>
Deleted: trunk/LayoutTests/editing/deleting/5390681-expected.txt (95002 => 95003)
--- trunk/LayoutTests/editing/deleting/5390681-expected.txt 2011-09-13 03:12:01 UTC (rev 95002)
+++ trunk/LayoutTests/editing/deleting/5390681-expected.txt 2011-09-13 03:13:33 UTC (rev 95003)
@@ -1,4 +0,0 @@
-This tests for a bug where expansion for smart delete would not consider editable boundaries. Only 'foo' should be deleted. You should see ' bar'.
-| <span>
-| contenteditable="false"
-| " bar"
Deleted: trunk/LayoutTests/editing/deleting/5390681.html (95002 => 95003)
--- trunk/LayoutTests/editing/deleting/5390681.html 2011-09-13 03:12:01 UTC (rev 95002)
+++ trunk/LayoutTests/editing/deleting/5390681.html 2011-09-13 03:13:33 UTC (rev 95003)
@@ -1,11 +0,0 @@
-<script src=""
-<div contenteditable="true" id="div">foo<span contenteditable="false"> bar</span></div>
-<script>
-var div = document.getElementById("div");
-var sel = window.getSelection();
-sel.setPosition(div, 0);
-sel.modify("extend", "forward", "word");
-document.execCommand("Delete");
-Markup.description("This tests for a bug where expansion for smart delete would not consider editable boundaries. Only 'foo' should be deleted. You should see ' bar'.");
-Markup.dump(div);
-</script>
Copied: trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt (from rev 95001, trunk/LayoutTests/editing/deleting/5390681-expected.txt) (0 => 95003)
--- trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2-expected.txt 2011-09-13 03:13:33 UTC (rev 95003)
@@ -0,0 +1,4 @@
+This tests for a bug where expansion for smart delete would not consider editable boundaries. Only 'foo' should be deleted. You should see ' bar'. <radr://problem/5390681>
+| <span>
+| contenteditable="false"
+| " bar"
Added: trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2.html (0 => 95003)
--- trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2.html (rev 0)
+++ trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-2.html 2011-09-13 03:13:33 UTC (rev 95003)
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<body>
+<p id="description">This tests for a bug where expansion for smart delete would not consider editable boundaries. Only 'foo' should be deleted. You should see ' bar'. <radr://problem/5390681></p>
+<div contenteditable="true" id="div">foo
+<span contenteditable="false"> bar</span></div>
+
+<script src=""
+<script>
+var div = document.getElementById("div");
+var x = div.offsetLeft;
+var y = div.offsetTop;
+eventSender.mouseMoveTo(x, y);
+eventSender.mouseDown();
+eventSender.mouseUp();
+eventSender.mouseDown();
+eventSender.mouseUp();
+document.execCommand("Delete");
+Markup.description(description.textContent);
+Markup.dump(div);
+</script>
+</body>
+</html>
Copied: trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-expected.txt (from rev 95001, trunk/LayoutTests/editing/deleting/5390681-expected.txt) (0 => 95003)
--- trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries-expected.txt 2011-09-13 03:13:33 UTC (rev 95003)
@@ -0,0 +1,4 @@
+This tests for a bug where expansion for smart delete would not consider editable boundaries. Only 'foo' should be deleted. You should see ' bar'. <radr://problem/5390681>
+| <span>
+| contenteditable="false"
+| " bar"
Copied: trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries.html (from rev 95001, trunk/LayoutTests/editing/deleting/5390681.html) (0 => 95003)
--- trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries.html (rev 0)
+++ trunk/LayoutTests/editing/deleting/smart-delete-across-editable-boundaries.html 2011-09-13 03:13:33 UTC (rev 95003)
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<body>
+<script src=""
+<div contenteditable="true" id="div">foo<span contenteditable="false"> bar</span></div>
+<script>
+var div = document.getElementById("div");
+var sel = window.getSelection();
+sel.setPosition(div, 0);
+sel.modify("extend", "forward", "word");
+document.execCommand("Delete");
+Markup.description("This tests for a bug where expansion for smart delete would not consider editable boundaries. Only 'foo' should be deleted. You should see ' bar'. <radr://problem/5390681>");
+Markup.dump(div);
+</script>
+</body>
+</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/deleting/5390681-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/5390681-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/5390681-2-expected.txt (95002 => 95003)
--- trunk/LayoutTests/platform/chromium-win/editing/deleting/5390681-2-expected.txt 2011-09-13 03:12:01 UTC (rev 95002)
+++ trunk/LayoutTests/platform/chromium-win/editing/deleting/5390681-2-expected.txt 2011-09-13 03:13:33 UTC (rev 95003)
@@ -1,20 +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 {P} at (0,0) size 784x60
- RenderText {#text} at (0,0) size 768x39
- text run at (0,0) width 565: "This tests for a bug where expansion for smart delete would not consider editable boundaries. "
- text run at (565,0) width 177: "Only 'foo' should be deleted. "
- text run at (742,0) width 26: "You"
- text run at (0,20) width 105: "should see ' bar'. "
- RenderInline {B} at (0,0) size 735x39
- RenderText {#text} at (105,20) size 735x39
- text run at (105,20) width 630: "There is a bug: while the non-editable space isn't deleted, deletion inserts a placeholder when it"
- text run at (0,40) width 64: "shouldn't."
- RenderBlock {DIV} at (0,76) size 784x20
- RenderInline {SPAN} at (0,0) size 20x19
- RenderText {#text} at (0,0) size 20x19
- text run at (0,0) width 20: "bar"
-caret: position 0 of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/deleting/5390681-2-expected.txt (95002 => 95003)
--- trunk/LayoutTests/platform/gtk/editing/deleting/5390681-2-expected.txt 2011-09-13 03:12:01 UTC (rev 95002)
+++ trunk/LayoutTests/platform/gtk/editing/deleting/5390681-2-expected.txt 2011-09-13 03:13:33 UTC (rev 95003)
@@ -1,19 +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 {P} at (0,0) size 784x57
- RenderText {#text} at (0,0) size 772x38
- text run at (0,0) width 591: "This tests for a bug where expansion for smart delete would not consider editable boundaries. "
- text run at (591,0) width 181: "Only 'foo' should be deleted."
- text run at (0,19) width 140: "You should see ' bar'. "
- RenderInline {B} at (0,0) size 778x38
- RenderText {#text} at (140,19) size 778x38
- text run at (140,19) width 638: "There is a bug: while the non-editable space isn't deleted, deletion inserts a placeholder when it"
- text run at (0,38) width 67: "shouldn't."
- RenderBlock {DIV} at (0,73) size 784x19
- RenderInline {SPAN} at (0,0) size 20x19
- RenderText {#text} at (0,0) size 20x19
- text run at (0,0) width 20: "bar"
-caret: position 0 of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/5390681-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/5390681-2-expected.txt (95002 => 95003)
--- trunk/LayoutTests/platform/mac/editing/deleting/5390681-2-expected.txt 2011-09-13 03:12:01 UTC (rev 95002)
+++ trunk/LayoutTests/platform/mac/editing/deleting/5390681-2-expected.txt 2011-09-13 03:13:33 UTC (rev 95003)
@@ -1,19 +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 {P} at (0,0) size 784x54
- RenderText {#text} at (0,0) size 772x36
- text run at (0,0) width 591: "This tests for a bug where expansion for smart delete would not consider editable boundaries. "
- text run at (591,0) width 181: "Only 'foo' should be deleted."
- text run at (0,18) width 140: "You should see ' bar'. "
- RenderInline {B} at (0,0) size 778x36
- RenderText {#text} at (140,18) size 778x36
- text run at (140,18) width 638: "There is a bug: while the non-editable space isn't deleted, deletion inserts a placeholder when it"
- text run at (0,36) width 67: "shouldn't."
- RenderBlock {DIV} at (0,70) size 784x18
- RenderInline {SPAN} at (0,0) size 20x18
- RenderText {#text} at (0,0) size 20x18
- text run at (0,0) width 20: "bar"
-caret: position 0 of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/deleting/5390681-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/5390681-2-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/5390681-2-expected.txt (95002 => 95003)
--- trunk/LayoutTests/platform/qt/editing/deleting/5390681-2-expected.txt 2011-09-13 03:12:01 UTC (rev 95002)
+++ trunk/LayoutTests/platform/qt/editing/deleting/5390681-2-expected.txt 2011-09-13 03:13:33 UTC (rev 95003)
@@ -1,20 +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 {P} at (0,0) size 784x66
- RenderText {#text} at (0,0) size 770x44
- text run at (0,0) width 635: "This tests for a bug where expansion for smart delete would not consider editable boundaries. "
- text run at (635,0) width 135: "Only 'foo' should be"
- text run at (0,22) width 56: "deleted. "
- text run at (56,22) width 150: "You should see ' bar'. "
- RenderInline {B} at (0,0) size 707x44
- RenderText {#text} at (206,22) size 707x44
- text run at (206,22) width 501: "There is a bug: while the non-editable space isn't deleted, deletion inserts a"
- text run at (0,44) width 204: "placeholder when it shouldn't."
- RenderBlock {DIV} at (0,82) size 784x22
- RenderInline {SPAN} at (0,0) size 24x22
- RenderText {#text} at (0,0) size 24x22
- text run at (0,0) width 24: "bar"
-caret: position 0 of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/5390681-expected.png
(Binary files differ)
