Diff
Modified: trunk/LayoutTests/ChangeLog (87263 => 87264)
--- trunk/LayoutTests/ChangeLog 2011-05-25 04:04:03 UTC (rev 87263)
+++ trunk/LayoutTests/ChangeLog 2011-05-25 04:14:51 UTC (rev 87264)
@@ -1,5 +1,26 @@
2011-05-24 Annie Sullivan <[email protected]>
+ Reviewed by Tony Chang.
+
+ editing/deleting/5032066 should be a dump-as-markup test
+ https://bugs.webkit.org/show_bug.cgi?id=61327
+
+ Converts 5032066 to dump-as-markup and adds doctype, html, and body tags.
+
+ * editing/deleting/5032066-expected.txt: Added.
+ * editing/deleting/5032066.html:
+ * platform/chromium-linux/editing/deleting/5032066-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/5032066-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/5032066-expected.txt: Removed.
+ * platform/gtk/editing/deleting/5032066-expected.txt: Removed.
+ * platform/mac-leopard/editing/deleting/5032066-expected.png: Removed.
+ * platform/mac/editing/deleting/5032066-expected.png: Removed.
+ * platform/mac/editing/deleting/5032066-expected.txt: Removed.
+ * platform/qt/editing/deleting/5032066-expected.png: Removed.
+ * platform/qt/editing/deleting/5032066-expected.txt: Removed.
+
+2011-05-24 Annie Sullivan <[email protected]>
+
Reviewed by Ryosuke Niwa.
Convert LayoutTests/editing/deleting/5115601.html to dump-as-markup.
Added: trunk/LayoutTests/editing/deleting/5032066-expected.txt (0 => 87264)
--- trunk/LayoutTests/editing/deleting/5032066-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/deleting/5032066-expected.txt 2011-05-25 04:14:51 UTC (rev 87264)
@@ -0,0 +1,11 @@
+This tests deleting when the caret is at the start of a paragraph just after a table. The content in that paragraph should be moved into the last table cell unless that content is another table.
+| <table>
+| border="1"
+| <tbody>
+| <tr>
+| <td>
+| "All the content in this editable region <#selection-caret>"
+| <span>
+| class="Apple-style-span"
+| style="-webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; "
+| "should be in one table cell."
Modified: trunk/LayoutTests/editing/deleting/5032066.html (87263 => 87264)
--- trunk/LayoutTests/editing/deleting/5032066.html 2011-05-25 04:04:03 UTC (rev 87263)
+++ trunk/LayoutTests/editing/deleting/5032066.html 2011-05-25 04:14:51 UTC (rev 87264)
@@ -1,9 +1,17 @@
-<p>This tests deleting when the caret is at the start of a paragraph just after a table. The content in that paragraph should be moved into the last table cell unless that content is another table.</p>
-<div contenteditable="true"><table border="1"><tr><td>All the content in this editable region </td></tr></table><div id="div">should be in one table cell.</div></div>
+<!DOCTYPE html>
+<html>
+<body>
+<p id="description">This tests deleting when the caret is at the start of a paragraph just after a table. The content in that paragraph should be moved into the last table cell unless that content is another table.</p>
+<div contenteditable="true" id="root"><table border="1"><tr><td>All the content in this editable region </td></tr></table><div id="div">should be in one table cell.</div></div>
+<script src=""
<script>
var sel = window.getSelection();
var div = document.getElementById("div");
sel.setPosition(div, 0);
document.execCommand("Delete");
+Markup.description(description.textContent);
+Markup.dump("root");
</script>
+</body>
+</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/deleting/5032066-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/5032066-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/5032066-expected.txt (87263 => 87264)
--- trunk/LayoutTests/platform/chromium-win/editing/deleting/5032066-expected.txt 2011-05-25 04:04:03 UTC (rev 87263)
+++ trunk/LayoutTests/platform/chromium-win/editing/deleting/5032066-expected.txt 2011-05-25 04:14:51 UTC (rev 87264)
@@ -1,21 +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 761x39
- text run at (0,0) width 478: "This tests deleting when the caret is at the start of a paragraph just after a table. "
- text run at (478,0) width 283: "The content in that paragraph should be moved"
- text run at (0,20) width 338: "into the last table cell unless that content is another table."
- RenderBlock {DIV} at (0,56) size 784x30
- RenderTable {TABLE} at (0,0) size 390x30 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 388x28
- RenderTableRow {TR} at (0,2) size 388x24
- RenderTableCell {TD} at (2,2) size 384x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (2,2) size 221x19
- text run at (2,2) width 221: "All the content in this editable region "
- RenderInline {SPAN} at (0,0) size 159x19
- RenderText {#text} at (223,2) size 159x19
- text run at (223,2) width 159: "should be in one table cell."
-caret: position 40 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/deleting/5032066-expected.txt (87263 => 87264)
--- trunk/LayoutTests/platform/gtk/editing/deleting/5032066-expected.txt 2011-05-25 04:04:03 UTC (rev 87263)
+++ trunk/LayoutTests/platform/gtk/editing/deleting/5032066-expected.txt 2011-05-25 04:14:51 UTC (rev 87264)
@@ -1,21 +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 747x38
- text run at (0,0) width 497: "This tests deleting when the caret is at the start of a paragraph just after a table. "
- text run at (497,0) width 250: "The content in that paragraph should be"
- text run at (0,19) width 402: "moved into the last table cell unless that content is another table."
- RenderBlock {DIV} at (0,54) size 784x29
- RenderTable {TABLE} at (0,0) size 414x29 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 412x27
- RenderTableRow {TR} at (0,2) size 412x23
- RenderTableCell {TD} at (2,2) size 408x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (2,2) size 236x19
- text run at (2,2) width 236: "All the content in this editable region "
- RenderInline {SPAN} at (0,0) size 168x19
- RenderText {#text} at (238,2) size 168x19
- text run at (238,2) width 168: "should be in one table cell."
-caret: position 40 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/5032066-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/5032066-expected.txt (87263 => 87264)
--- trunk/LayoutTests/platform/mac/editing/deleting/5032066-expected.txt 2011-05-25 04:04:03 UTC (rev 87263)
+++ trunk/LayoutTests/platform/mac/editing/deleting/5032066-expected.txt 2011-05-25 04:14:51 UTC (rev 87264)
@@ -1,21 +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 747x36
- text run at (0,0) width 497: "This tests deleting when the caret is at the start of a paragraph just after a table. "
- text run at (497,0) width 250: "The content in that paragraph should be"
- text run at (0,18) width 402: "moved into the last table cell unless that content is another table."
- RenderBlock {DIV} at (0,52) size 784x28
- RenderTable {TABLE} at (0,0) size 414x28 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 412x26
- RenderTableRow {TR} at (0,2) size 412x22
- RenderTableCell {TD} at (2,2) size 408x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (2,2) size 236x18
- text run at (2,2) width 236: "All the content in this editable region "
- RenderInline {SPAN} at (0,0) size 168x18
- RenderText {#text} at (238,2) size 168x18
- text run at (238,2) width 168: "should be in one table cell."
-caret: position 40 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/deleting/5032066-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/5032066-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/5032066-expected.txt (87263 => 87264)
--- trunk/LayoutTests/platform/qt/editing/deleting/5032066-expected.txt 2011-05-25 04:04:03 UTC (rev 87263)
+++ trunk/LayoutTests/platform/qt/editing/deleting/5032066-expected.txt 2011-05-25 04:14:51 UTC (rev 87264)
@@ -1,21 +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 749x44
- text run at (0,0) width 543: "This tests deleting when the caret is at the start of a paragraph just after a table. "
- text run at (543,0) width 206: "The content in that paragraph"
- text run at (0,22) width 501: "should be moved into the last table cell unless that content is another table."
- RenderBlock {DIV} at (0,60) size 784x32
- RenderTable {TABLE} at (0,0) size 439x32 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 437x30
- RenderTableRow {TR} at (0,2) size 437x26
- RenderTableCell {TD} at (2,2) size 433x26 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (2,2) size 252x22
- text run at (2,2) width 252: "All the content in this editable region "
- RenderInline {SPAN} at (0,0) size 177x22
- RenderText {#text} at (254,2) size 177x22
- text run at (254,2) width 177: "should be in one table cell."
-caret: position 40 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 2 {DIV} of body
