Diff
Modified: trunk/LayoutTests/ChangeLog (89643 => 89644)
--- trunk/LayoutTests/ChangeLog 2011-06-24 00:40:18 UTC (rev 89643)
+++ trunk/LayoutTests/ChangeLog 2011-06-24 00:51:20 UTC (rev 89644)
@@ -1,3 +1,35 @@
+2011-06-23 Wyatt Carss <wca...@chromium.org>
+
+ Reviewed by Ryosuke Niwa.
+
+ convert editing/deleting/5026848-1.html to dump-as-markup test
+ https://bugs.webkit.org/show_bug.cgi?id=63289
+
+ Renamed editing/deleting/5026848* to editing/deleting/delete-across-editable-content-boundaries*,
+ and converted editing/deleting/delete-across-editable-content-boundaries-1 to a dump-as-markup test.
+ Removed old png/txt test results, and added new result. Also included radr number.
+
+ * editing/deleting/delete-across-editable-content-boundaries-1.html: Added.
+ * editing/deleting/delete-across-editable-content-boundaries-1-expected.txt: Added.
+ * editing/deleting/delete-across-editable-content-boundaries-2.html: Added.
+ * editing/deleting/delete-across-editable-content-boundaries-2-expected.txt: Added.
+ * editing/deleting/delete-across-editable-content-boundaries-3.html: Added.
+ * editing/deleting/delete-across-editable-content-boundaries-3-expected.txt: Added.
+ * editing/deleting/5026848-1.html: Removed.
+ * editing/deleting/5026848-2.html: Removed.
+ * editing/deleting/5026848-2-expected.txt: Removed.
+ * editing/deleting/5026848-3.html: Removed.
+ * editing/deleting/5026848-3-expected.txt: Removed.
+ * platform/chromium-linux/editing/deleting/5026848-1-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/5026848-1-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/5026848-1-expected.txt: Removed.
+ * platform/gtk/editing/deleting/5026848-1-expected.txt: Removed.
+ * platform/mac-leopard/editing/deleting/5026848-1-expected.png: Removed.
+ * platform/mac/editing/deleting/5026848-1-expected.png: Removed.
+ * platform/mac/editing/deleting/5026848-1-expected.txt: Removed.
+ * platform/qt/editing/deleting/5026848-1-expected.png: Removed.
+ * platform/qt/editing/deleting/5026848-1-expected.txt: Removed.
+
2011-06-23 Adrienne Walker <e...@google.com>
[chromium] Unreviewed, mark a few tests failing on OSX after r89632.
Deleted: trunk/LayoutTests/editing/deleting/5026848-1.html (89643 => 89644)
--- trunk/LayoutTests/editing/deleting/5026848-1.html 2011-06-24 00:40:18 UTC (rev 89643)
+++ trunk/LayoutTests/editing/deleting/5026848-1.html 2011-06-24 00:51:20 UTC (rev 89644)
@@ -1,14 +0,0 @@
-<html>
-<body>
-<p>This tests the deletion of non-editable content that is in both the start and end editable roots. It should be removed. You shouldn't see anything in the editable region below.</p>
-<div id="div" contenteditable="true">foo <span style="color: red;" contenteditable="false">bar</span> baz</div>
-
-<script>
-var div = document.getElementById("div");
-div.focus();
-document.execCommand("SelectAll");
-document.execCommand("Delete");
-</script>
-
-</body>
-</html>
\ No newline at end of file
Deleted: trunk/LayoutTests/editing/deleting/5026848-2-expected.txt (89643 => 89644)
--- trunk/LayoutTests/editing/deleting/5026848-2-expected.txt 2011-06-24 00:40:18 UTC (rev 89643)
+++ trunk/LayoutTests/editing/deleting/5026848-2-expected.txt 2011-06-24 00:51:20 UTC (rev 89644)
@@ -1,27 +0,0 @@
-This tests to see that selected non-editable nodes that are not in both the start and end editable root are preserved during a deletion. You should see two 'Non-editable' pieces on either side of the editable piece below.
-| "
-"
-| <table>
-| contenteditable="false"
-| "
- "
-| <tbody>
-| <tr>
-| "
- "
-| <td>
-| "Non-editable"
-| "
- "
-| <td>
-| contenteditable="true"
-| "Editable <#selection-caret>"
-| "content"
-| "
- "
-| <td>
-| "Non-editable"
-| "
- "
-| "
-"
Deleted: trunk/LayoutTests/editing/deleting/5026848-2.html (89643 => 89644)
--- trunk/LayoutTests/editing/deleting/5026848-2.html 2011-06-24 00:40:18 UTC (rev 89643)
+++ trunk/LayoutTests/editing/deleting/5026848-2.html 2011-06-24 00:51:20 UTC (rev 89644)
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<p id="description">This tests to see that selected non-editable nodes that are not in both the start and end editable root are preserved during a deletion. You should see two 'Non-editable' pieces on either side of the editable piece below.</p>
-<div id="div" contenteditable="true">
-<table contenteditable="false">
- <tr>
- <td>Non-editable</td>
- <td contenteditable="true">Editable <span id="start">content</span></td>
- <td>Non-editable</td>
- </tr>
-</table>
-Editable <span id="end">content</span>
-</div>
-
-<script src=""
-<script>
-var sel = window.getSelection();
-var start = document.getElementById("start");
-var end = document.getElementById("end");
-sel.setBaseAndExtent(start, 0, end, 0);
-document.execCommand("Delete");
-Markup.description(description.textContent);
-Markup.dump("div");
-</script>
-
-</body>
-</html>
Deleted: trunk/LayoutTests/editing/deleting/5026848-3-expected.txt (89643 => 89644)
--- trunk/LayoutTests/editing/deleting/5026848-3-expected.txt 2011-06-24 00:40:18 UTC (rev 89643)
+++ trunk/LayoutTests/editing/deleting/5026848-3-expected.txt 2011-06-24 00:51:20 UTC (rev 89644)
@@ -1,35 +0,0 @@
-This tests to see that selected editable nodes that are not in both the start and end editable roots are cleared. You should see one non-editable piece and an editable one and then two empty table cells. The table cells are editable but are preserved and not removed because they are in a non-editable region. They should be completely cleared out, even the second one that contains a non-editable piece.
-| "
-"
-| <table>
-| border="1"
-| contenteditable="false"
-| "
- "
-| <tbody>
-| <tr>
-| "
- "
-| <td>
-| "Non-editable"
-| "
- "
-| <td>
-| contenteditable="true"
-| "Editable <#selection-caret>"
-| "content"
-| "
- "
-| <!-- The following cell should be removed, even though it contains non-editable pieces. -->
-| "
- "
-| <td>
-| contenteditable="true"
-| "
- "
-| <td>
-| contenteditable="true"
-| "
- "
-| "
-"
Deleted: trunk/LayoutTests/editing/deleting/5026848-3.html (89643 => 89644)
--- trunk/LayoutTests/editing/deleting/5026848-3.html 2011-06-24 00:40:18 UTC (rev 89643)
+++ trunk/LayoutTests/editing/deleting/5026848-3.html 2011-06-24 00:51:20 UTC (rev 89644)
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-<p id="description">This tests to see that selected editable nodes that are not in both the start and end editable roots are cleared. You should see one non-editable piece and an editable one and then two empty table cells. The table cells are editable but are preserved and not removed because they are in a non-editable region. They should be completely cleared out, even the second one that contains a non-editable piece.</p>
-<div id="div" contenteditable="true">
-<table border="1" contenteditable="false">
- <tr>
- <td>Non-editable</td>
- <td contenteditable="true">Editable <span id="start">content</span></td>
- <!-- The following cell should be removed, even though it contains non-editable pieces. -->
- <td contenteditable="true">Editable</td>
- <td contenteditable="true">Edit<span contenteditable="false">(non-editable content that should be removed because its in an editable region)</span>able</td>
- </tr>
-</table>
-Editable <span id="end">content</span>
-</div>
-
-<script src=""
-<script>
-var sel = window.getSelection();
-var start = document.getElementById("start");
-var end = document.getElementById("end");
-sel.setBaseAndExtent(start, 0, end, 0);
-document.execCommand("Delete");
-Markup.description(description.textContent);
-Markup.dump("div");
-</script>
-
-</body>
-</html>
Added: trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1-expected.txt (0 => 89644)
--- trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1-expected.txt 2011-06-24 00:51:20 UTC (rev 89644)
@@ -0,0 +1,2 @@
+This tests the deletion of non-editable content that both starts and ends in editable roots - it should successfully be removed. There should be no visible content in the markup below. <radr://problem/5026848>
+| <br>
Added: trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1.html (0 => 89644)
--- trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1.html (rev 0)
+++ trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-1.html 2011-06-24 00:51:20 UTC (rev 89644)
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<body>
+<p id="description">This tests the deletion of non-editable content that both starts and ends in editable roots - it should successfully be removed. There should be no visible content in the markup below. <radr://problem/5026848></p>
+<div id="div" contenteditable="true">foo <span style="color: red;" contenteditable="false">bar</span> baz</div>
+
+<script src=""
+<script>
+var div = document.getElementById("div");
+div.focus();
+document.execCommand("SelectAll");
+document.execCommand("Delete");
+Markup.description(description.textContent);
+Markup.dump("div");
+</script>
+
+</body>
+</html>
Copied: trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-2-expected.txt (from rev 89643, trunk/LayoutTests/editing/deleting/5026848-2-expected.txt) (0 => 89644)
--- trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-2-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-2-expected.txt 2011-06-24 00:51:20 UTC (rev 89644)
@@ -0,0 +1,27 @@
+This tests to see that selected non-editable nodes that are not in both the start and end editable root are preserved during a deletion. You should see two 'Non-editable' pieces on either side of the editable piece below. <radr://problem/5026848>
+| "
+"
+| <table>
+| contenteditable="false"
+| "
+ "
+| <tbody>
+| <tr>
+| "
+ "
+| <td>
+| "Non-editable"
+| "
+ "
+| <td>
+| contenteditable="true"
+| "Editable <#selection-caret>"
+| "content"
+| "
+ "
+| <td>
+| "Non-editable"
+| "
+ "
+| "
+"
Copied: trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-2.html (from rev 89643, trunk/LayoutTests/editing/deleting/5026848-2.html) (0 => 89644)
--- trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-2.html (rev 0)
+++ trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-2.html 2011-06-24 00:51:20 UTC (rev 89644)
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<body>
+<p id="description">This tests to see that selected non-editable nodes that are not in both the start and end editable root are preserved during a deletion. You should see two 'Non-editable' pieces on either side of the editable piece below. <radr://problem/5026848></p>
+<div id="div" contenteditable="true">
+<table contenteditable="false">
+ <tr>
+ <td>Non-editable</td>
+ <td contenteditable="true">Editable <span id="start">content</span></td>
+ <td>Non-editable</td>
+ </tr>
+</table>
+Editable <span id="end">content</span>
+</div>
+
+<script src=""
+<script>
+var sel = window.getSelection();
+var start = document.getElementById("start");
+var end = document.getElementById("end");
+sel.setBaseAndExtent(start, 0, end, 0);
+document.execCommand("Delete");
+Markup.description(description.textContent);
+Markup.dump("div");
+</script>
+
+</body>
+</html>
Copied: trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-3-expected.txt (from rev 89643, trunk/LayoutTests/editing/deleting/5026848-3-expected.txt) (0 => 89644)
--- trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-3-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-3-expected.txt 2011-06-24 00:51:20 UTC (rev 89644)
@@ -0,0 +1,35 @@
+This tests to see that selected editable nodes that are not in both the start and end editable roots are cleared. You should see one non-editable piece and an editable one and then two empty table cells. The table cells are editable but are preserved and not removed because they are in a non-editable region. They should be completely cleared out, even the second one that contains a non-editable piece. <radr://problem/5026848>
+| "
+"
+| <table>
+| border="1"
+| contenteditable="false"
+| "
+ "
+| <tbody>
+| <tr>
+| "
+ "
+| <td>
+| "Non-editable"
+| "
+ "
+| <td>
+| contenteditable="true"
+| "Editable <#selection-caret>"
+| "content"
+| "
+ "
+| <!-- The following cell should be removed, even though it contains non-editable pieces. -->
+| "
+ "
+| <td>
+| contenteditable="true"
+| "
+ "
+| <td>
+| contenteditable="true"
+| "
+ "
+| "
+"
Copied: trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-3.html (from rev 89643, trunk/LayoutTests/editing/deleting/5026848-3.html) (0 => 89644)
--- trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-3.html (rev 0)
+++ trunk/LayoutTests/editing/deleting/delete-across-editable-content-boundaries-3.html 2011-06-24 00:51:20 UTC (rev 89644)
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+<body>
+<p id="description">This tests to see that selected editable nodes that are not in both the start and end editable roots are cleared. You should see one non-editable piece and an editable one and then two empty table cells. The table cells are editable but are preserved and not removed because they are in a non-editable region. They should be completely cleared out, even the second one that contains a non-editable piece. <radr://problem/5026848></p>
+<div id="div" contenteditable="true">
+<table border="1" contenteditable="false">
+ <tr>
+ <td>Non-editable</td>
+ <td contenteditable="true">Editable <span id="start">content</span></td>
+ <!-- The following cell should be removed, even though it contains non-editable pieces. -->
+ <td contenteditable="true">Editable</td>
+ <td contenteditable="true">Edit<span contenteditable="false">(non-editable content that should be removed because its in an editable region)</span>able</td>
+ </tr>
+</table>
+Editable <span id="end">content</span>
+</div>
+
+<script src=""
+<script>
+var sel = window.getSelection();
+var start = document.getElementById("start");
+var end = document.getElementById("end");
+sel.setBaseAndExtent(start, 0, end, 0);
+document.execCommand("Delete");
+Markup.description(description.textContent);
+Markup.dump("div");
+</script>
+
+</body>
+</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/deleting/5026848-1-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/5026848-1-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/5026848-1-expected.txt (89643 => 89644)
--- trunk/LayoutTests/platform/chromium-win/editing/deleting/5026848-1-expected.txt 2011-06-24 00:40:18 UTC (rev 89643)
+++ trunk/LayoutTests/platform/chromium-win/editing/deleting/5026848-1-expected.txt 2011-06-24 00:51:20 UTC (rev 89644)
@@ -1,14 +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 784x40
- RenderText {#text} at (0,0) size 773x39
- text run at (0,0) width 554: "This tests the deletion of non-editable content that is in both the start and end editable roots. "
- text run at (554,0) width 136: "It should be removed. "
- text run at (690,0) width 83: "You shouldn't"
- text run at (0,20) width 246: "see anything in the editable region below."
- RenderBlock {DIV} at (0,56) size 784x20
- RenderBR {BR} at (0,0) size 0x19
-caret: position 0 of child 0 {BR} of child 3 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/deleting/5026848-1-expected.txt (89643 => 89644)
--- trunk/LayoutTests/platform/gtk/editing/deleting/5026848-1-expected.txt 2011-06-24 00:40:18 UTC (rev 89643)
+++ trunk/LayoutTests/platform/gtk/editing/deleting/5026848-1-expected.txt 2011-06-24 00:51:20 UTC (rev 89644)
@@ -1,14 +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 784x38
- RenderText {#text} at (0,0) size 746x38
- text run at (0,0) width 577: "This tests the deletion of non-editable content that is in both the start and end editable roots. "
- text run at (577,0) width 141: "It should be removed. "
- text run at (718,0) width 28: "You"
- text run at (0,19) width 323: "shouldn't see anything in the editable region below."
- RenderBlock {DIV} at (0,54) size 784x19
- RenderBR {BR} at (0,0) size 0x19
-caret: position 0 of child 0 {BR} of child 3 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/5026848-1-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/5026848-1-expected.txt (89643 => 89644)
--- trunk/LayoutTests/platform/mac/editing/deleting/5026848-1-expected.txt 2011-06-24 00:40:18 UTC (rev 89643)
+++ trunk/LayoutTests/platform/mac/editing/deleting/5026848-1-expected.txt 2011-06-24 00:51:20 UTC (rev 89644)
@@ -1,14 +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 784x36
- RenderText {#text} at (0,0) size 746x36
- text run at (0,0) width 577: "This tests the deletion of non-editable content that is in both the start and end editable roots. "
- text run at (577,0) width 141: "It should be removed. "
- text run at (718,0) width 28: "You"
- text run at (0,18) width 323: "shouldn't see anything in the editable region below."
- RenderBlock {DIV} at (0,52) size 784x18
- RenderBR {BR} at (0,0) size 0x18
-caret: position 0 of child 0 {BR} of child 3 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/deleting/5026848-1-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/5026848-1-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/5026848-1-expected.txt (89643 => 89644)
--- trunk/LayoutTests/platform/qt/editing/deleting/5026848-1-expected.txt 2011-06-24 00:40:18 UTC (rev 89643)
+++ trunk/LayoutTests/platform/qt/editing/deleting/5026848-1-expected.txt 2011-06-24 00:51:20 UTC (rev 89644)
@@ -1,13 +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 784x44
- RenderText {#text} at (0,0) size 770x44
- text run at (0,0) width 623: "This tests the deletion of non-editable content that is in both the start and end editable roots. "
- text run at (623,0) width 147: "It should be removed."
- text run at (0,22) width 378: "You shouldn't see anything in the editable region below."
- RenderBlock {DIV} at (0,60) size 784x22
- RenderBR {BR} at (0,0) size 0x22
-caret: position 0 of child 0 {BR} of child 3 {DIV} of body
