Diff
Modified: trunk/LayoutTests/ChangeLog (87262 => 87263)
--- trunk/LayoutTests/ChangeLog 2011-05-25 03:50:54 UTC (rev 87262)
+++ trunk/LayoutTests/ChangeLog 2011-05-25 04:04:03 UTC (rev 87263)
@@ -2,6 +2,27 @@
Reviewed by Ryosuke Niwa.
+ Convert LayoutTests/editing/deleting/5115601.html to dump-as-markup.
+ https://bugs.webkit.org/show_bug.cgi?id=61330
+
+ Converted to dump-as-markup and added a little html cleanup.
+
+ * editing/deleting/5115601-expected.txt: Added.
+ * editing/deleting/5115601.html: Convert to dump-as-markup.
+ * platform/chromium-linux/editing/deleting/5115601-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/5115601-expected.png: Removed.
+ * platform/chromium-win/editing/deleting/5115601-expected.txt: Removed.
+ * platform/gtk/editing/deleting/5115601-expected.txt: Removed.
+ * platform/mac-leopard/editing/deleting/5115601-expected.png: Removed.
+ * platform/mac/editing/deleting/5115601-expected.png: Removed.
+ * platform/mac/editing/deleting/5115601-expected.txt: Removed.
+ * platform/qt/editing/deleting/5115601-expected.png: Removed.
+ * platform/qt/editing/deleting/5115601-expected.txt: Removed.
+
+2011-05-24 Annie Sullivan <[email protected]>
+
+ Reviewed by Ryosuke Niwa.
+
Convert LayoutTests/editing/deleting/5206311-2.html to dump-as-markup
https://bugs.webkit.org/show_bug.cgi?id=61332
Added: trunk/LayoutTests/editing/deleting/5115601-expected.txt (0 => 87263)
--- trunk/LayoutTests/editing/deleting/5115601-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/deleting/5115601-expected.txt 2011-05-25 04:04:03 UTC (rev 87263)
@@ -0,0 +1,16 @@
+This tests to make sure that after a deletion, merging can merge into an editable region that's embedded in non-editable content that is collapsed by the deletion.
+| "
+"
+| <table>
+| border="1"
+| contenteditable="false"
+| <tbody>
+| <tr>
+| <td>
+| <span>
+| contenteditable="true"
+| id="start"
+| <span>
+| class="Apple-style-span"
+| style="-webkit-border-horizontal-spacing: 0px; -webkit-border-vertical-spacing: 0px; "
+| "<#selection-caret>This sentence should be inside the editable cell."
Modified: trunk/LayoutTests/editing/deleting/5115601.html (87262 => 87263)
--- trunk/LayoutTests/editing/deleting/5115601.html 2011-05-25 03:50:54 UTC (rev 87262)
+++ trunk/LayoutTests/editing/deleting/5115601.html 2011-05-25 04:04:03 UTC (rev 87263)
@@ -1,8 +1,12 @@
-<p>This tests to make sure that after a deletion, merging can merge into an editable region that's embedded in non-editable content that is collapsed by the deletion.</p>
-<div contenteditable="true">
+<!DOCTYPE html>
+<html>
+<body>
+<p id="description">This tests to make sure that after a deletion, merging can merge into an editable region that's embedded in non-editable content that is collapsed by the deletion.</p>
+<div id="root" contenteditable="true">
<table border="1" contenteditable="false"><tr><td><span id="start" contenteditable="true">foo</span></td></tr></table><span id="end">x</span>This sentence should be inside the editable cell.
</div>
+<script src=""
<script>
var start = document.getElementById("start");
var end = document.getElementById("end");
@@ -12,4 +16,8 @@
range.setEnd(end, end.childNodes.length);
sel.addRange(range);
document.execCommand("Delete");
+Markup.description(description.textContent);
+Markup.dump("root");
</script>
+</body>
+</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/deleting/5115601-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/5115601-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/deleting/5115601-expected.txt (87262 => 87263)
--- trunk/LayoutTests/platform/chromium-win/editing/deleting/5115601-expected.txt 2011-05-25 03:50:54 UTC (rev 87262)
+++ trunk/LayoutTests/platform/chromium-win/editing/deleting/5115601-expected.txt 2011-05-25 04:04:03 UTC (rev 87263)
@@ -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 784x40
- RenderText {#text} at (0,0) size 784x39
- text run at (0,0) width 784: "This tests to make sure that after a deletion, merging can merge into an editable region that's embedded in non-editable content that"
- text run at (0,20) width 166: "is collapsed by the deletion."
- RenderBlock {DIV} at (0,56) size 784x30
- RenderTable {TABLE} at (0,0) size 292x30 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 290x28
- RenderTableRow {TR} at (0,2) size 290x24
- RenderTableCell {TD} at (2,2) size 286x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderInline {SPAN} at (0,0) size 282x19
- RenderInline {SPAN} at (0,0) size 282x19
- RenderText {#text} at (2,2) size 282x19
- text run at (2,2) width 282: "This sentence should be inside the editable cell."
- RenderBlock (anonymous) at (0,30) size 784x0
-caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/deleting/5115601-expected.txt (87262 => 87263)
--- trunk/LayoutTests/platform/gtk/editing/deleting/5115601-expected.txt 2011-05-25 03:50:54 UTC (rev 87262)
+++ trunk/LayoutTests/platform/gtk/editing/deleting/5115601-expected.txt 2011-05-25 04:04:03 UTC (rev 87263)
@@ -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 784x38
- RenderText {#text} at (0,0) size 743x38
- text run at (0,0) width 743: "This tests to make sure that after a deletion, merging can merge into an editable region that's embedded in non-editable"
- text run at (0,19) width 251: "content that is collapsed by the deletion."
- RenderBlock {DIV} at (0,54) size 784x29
- RenderTable {TABLE} at (0,0) size 308x29 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 306x27
- RenderTableRow {TR} at (0,2) size 306x23
- RenderTableCell {TD} at (2,2) size 302x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderInline {SPAN} at (0,0) size 298x19
- RenderInline {SPAN} at (0,0) size 298x19
- RenderText {#text} at (2,2) size 298x19
- text run at (2,2) width 298: "This sentence should be inside the editable cell."
- RenderBlock (anonymous) at (0,29) size 784x0
-caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/5115601-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/deleting/5115601-expected.txt (87262 => 87263)
--- trunk/LayoutTests/platform/mac/editing/deleting/5115601-expected.txt 2011-05-25 03:50:54 UTC (rev 87262)
+++ trunk/LayoutTests/platform/mac/editing/deleting/5115601-expected.txt 2011-05-25 04:04:03 UTC (rev 87263)
@@ -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 784x36
- RenderText {#text} at (0,0) size 743x36
- text run at (0,0) width 743: "This tests to make sure that after a deletion, merging can merge into an editable region that's embedded in non-editable"
- text run at (0,18) width 251: "content that is collapsed by the deletion."
- RenderBlock {DIV} at (0,52) size 784x28
- RenderTable {TABLE} at (0,0) size 308x28 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 306x26
- RenderTableRow {TR} at (0,2) size 306x22
- RenderTableCell {TD} at (2,2) size 302x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderInline {SPAN} at (0,0) size 298x18
- RenderInline {SPAN} at (0,0) size 298x18
- RenderText {#text} at (2,2) size 298x18
- text run at (2,2) width 298: "This sentence should be inside the editable cell."
- RenderBlock (anonymous) at (0,28) size 784x0
-caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/deleting/5115601-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/5115601-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/qt/editing/deleting/5115601-expected.txt (87262 => 87263)
--- trunk/LayoutTests/platform/qt/editing/deleting/5115601-expected.txt 2011-05-25 03:50:54 UTC (rev 87262)
+++ trunk/LayoutTests/platform/qt/editing/deleting/5115601-expected.txt 2011-05-25 04:04:03 UTC (rev 87263)
@@ -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 784x44
- RenderText {#text} at (0,0) size 750x44
- text run at (0,0) width 750: "This tests to make sure that after a deletion, merging can merge into an editable region that's embedded in non-"
- text run at (0,22) width 325: "editable content that is collapsed by the deletion."
- RenderBlock {DIV} at (0,60) size 784x32
- RenderTable {TABLE} at (0,0) size 325x32 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 323x30
- RenderTableRow {TR} at (0,2) size 323x26
- RenderTableCell {TD} at (2,2) size 319x26 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderInline {SPAN} at (0,0) size 315x22
- RenderInline {SPAN} at (0,0) size 315x22
- RenderText {#text} at (2,2) size 315x22
- text run at (2,2) width 315: "This sentence should be inside the editable cell."
- RenderBlock (anonymous) at (0,32) size 784x0
-caret: position 0 of child 0 {#text} of child 0 {SPAN} of child 0 {SPAN} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 1 {TABLE} of child 2 {DIV} of body
