Diff
Modified: trunk/LayoutTests/ChangeLog (87269 => 87270)
--- trunk/LayoutTests/ChangeLog 2011-05-25 04:38:26 UTC (rev 87269)
+++ trunk/LayoutTests/ChangeLog 2011-05-25 04:38:26 UTC (rev 87270)
@@ -1,3 +1,33 @@
+2011-05-24 Annie Sullivan <[email protected]>
+
+ Reviewed by Ryosuke Niwa.
+
+ Convert LayoutTests/editing/selection/4895428-1 and -4 to dump-as-markup
+ https://bugs.webkit.org/show_bug.cgi?id=61402
+
+ Converts the two html files to dump-as-markup and adds doctype, html, and body tags.
+
+ * editing/selection/4895428-1-expected.txt: Added.
+ * editing/selection/4895428-1.html: Converted to dump-as-markup
+ * editing/selection/4895428-4-expected.txt: Added.
+ * editing/selection/4895428-4.html: Converted to dump-as-markup
+ * platform/chromium-linux/editing/selection/4895428-1-expected.png: Removed.
+ * platform/chromium-linux/editing/selection/4895428-4-expected.png: Removed.
+ * platform/chromium-win/editing/selection/4895428-1-expected.png: Removed.
+ * platform/chromium-win/editing/selection/4895428-1-expected.txt: Removed.
+ * platform/chromium-win/editing/selection/4895428-4-expected.png: Removed.
+ * platform/chromium-win/editing/selection/4895428-4-expected.txt: Removed.
+ * platform/gtk/editing/selection/4895428-1-expected.png: Removed.
+ * platform/gtk/editing/selection/4895428-1-expected.txt: Removed.
+ * platform/gtk/editing/selection/4895428-4-expected.png: Removed.
+ * platform/gtk/editing/selection/4895428-4-expected.txt: Removed.
+ * platform/mac-leopard/editing/selection/4895428-1-expected.png: Removed.
+ * platform/mac-leopard/editing/selection/4895428-4-expected.png: Removed.
+ * platform/mac/editing/selection/4895428-1-expected.png: Removed.
+ * platform/mac/editing/selection/4895428-1-expected.txt: Removed.
+ * platform/mac/editing/selection/4895428-4-expected.png: Removed.
+ * platform/mac/editing/selection/4895428-4-expected.txt: Removed.
+
2011-05-24 Steve Lacey <[email protected]>
Reviewed by Eric Carlson.
Added: trunk/LayoutTests/editing/selection/4895428-1-expected.txt (0 => 87270)
--- trunk/LayoutTests/editing/selection/4895428-1-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/selection/4895428-1-expected.txt 2011-05-25 04:38:26 UTC (rev 87270)
@@ -0,0 +1,27 @@
+This tests dragging a selected table by mousing down on the contents of one of its cells. It should be in the red bordered area.
+| "
+"
+| <div>
+| contenteditable="true"
+| id="source"
+| style="border: 1px solid blue;"
+| <span>
+| class="Apple-style-span"
+| style="-webkit-border-horizontal-spacing: 2px; -webkit-border-vertical-spacing: 2px;"
+| <br>
+| "
+"
+| <div>
+| contenteditable="true"
+| id="destination"
+| style="border: 1px solid red;"
+| <#selection-anchor>
+| <table>
+| border="1"
+| <tbody>
+| <tr>
+| <td>
+| id="cell"
+| "foo<#selection-focus>"
+| "
+"
Modified: trunk/LayoutTests/editing/selection/4895428-1.html (87269 => 87270)
--- trunk/LayoutTests/editing/selection/4895428-1.html 2011-05-25 04:38:26 UTC (rev 87269)
+++ trunk/LayoutTests/editing/selection/4895428-1.html 2011-05-25 04:38:26 UTC (rev 87270)
@@ -1,7 +1,13 @@
-<p>This tests dragging a selected table by mousing down on the contents of one of its cells. It should be in the red bordered area.</p>
+<!DOCTYPE html>
+<html>
+<body>
+<p id="description">This tests dragging a selected table by mousing down on the contents of one of its cells. It should be in the red bordered area.</p>
+<div id="root">
<div id="source" style="border: 1px solid blue;" contenteditable="true"><table border="1"><tr><td id="cell">foo</td></tr></table></div>
<div id="destination" style="border: 1px solid red;" contenteditable="true"><br></div>
+</div>
+<script src=""
<script>
function runTest() {
if (!window.layoutTestController)
@@ -25,7 +31,11 @@
eventSender.mouseMoveTo(x, y);
eventSender.mouseUp();
+ Markup.description(description.textContent);
+ Markup.dump(root);
}
runTest();
</script>
+</body>
+</html>
Added: trunk/LayoutTests/editing/selection/4895428-4-expected.txt (0 => 87270)
--- trunk/LayoutTests/editing/selection/4895428-4-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/selection/4895428-4-expected.txt 2011-05-25 04:38:26 UTC (rev 87270)
@@ -0,0 +1,37 @@
+This tests to see if an editable selection containing a focusable node is draggable by content inside that focusable node. To achieve this we delay focus of such nodes until mouse up. Below, the table should be inside the red bordered div.
+| "
+"
+| <div>
+| contenteditable="true"
+| id="div"
+| style="border: 1px solid blue;"
+| "
+"
+| <span>
+| class="Apple-style-span"
+| style="-webkit-border-horizontal-spacing: 2px; -webkit-border-vertical-spacing: 2px;"
+| <br>
+| "
+"
+| "
+"
+| <div>
+| contenteditable="true"
+| id="destination"
+| style="border: 1px solid red;"
+| <#selection-anchor>
+| <table>
+| border="1"
+| contenteditable="false"
+| <tbody>
+| <tr>
+| <td>
+| contenteditable="true"
+| id="cell"
+| "editable<#selection-focus>"
+| "
+"
+| <ul>
+| id="console"
+| "
+"
Modified: trunk/LayoutTests/editing/selection/4895428-4.html (87269 => 87270)
--- trunk/LayoutTests/editing/selection/4895428-4.html 2011-05-25 04:38:26 UTC (rev 87269)
+++ trunk/LayoutTests/editing/selection/4895428-4.html 2011-05-25 04:38:26 UTC (rev 87270)
@@ -1,9 +1,15 @@
-<p>This tests to see if an editable selection containing a focusable node is draggable by content inside that focusable node. To achieve this we delay focus of such nodes until mouse up. Below, the table should be inside the red bordered div.</p>
+<doctype HTML>
+<html>
+<body>
+<p id="description">This tests to see if an editable selection containing a focusable node is draggable by content inside that focusable node. To achieve this we delay focus of such nodes until mouse up. Below, the table should be inside the red bordered div.</p>
+<div id="root">
<div id="div" contenteditable="true" style="border: 1px solid blue;">
<table contenteditable="false" border="1"><tr><td id="cell" contenteditable="true">editable</td></tr></table>
</div>
<div id="destination" contenteditable="true" style="border: 1px solid red;"><br></div>
<ul id="console"></ul>
+</div>
+<script src=""
<script>
function log(str) {
var text = document.createTextNode(str);
@@ -32,7 +38,11 @@
y = destination.offsetParent.offsetTop + destination.offsetTop + destination.offsetHeight / 2;
eventSender.mouseMoveTo(x, y);
eventSender.mouseUp();
+ Markup.description(description.textContent);
+ Markup.dump(root);
}
runTest();
</script>
+</body>
+</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/selection/4895428-1-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/selection/4895428-4-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/selection/4895428-1-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/selection/4895428-1-expected.txt (87269 => 87270)
--- trunk/LayoutTests/platform/chromium-win/editing/selection/4895428-1-expected.txt 2011-05-25 04:38:26 UTC (rev 87269)
+++ trunk/LayoutTests/platform/chromium-win/editing/selection/4895428-1-expected.txt 2011-05-25 04:38:26 UTC (rev 87270)
@@ -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 784x20
- RenderText {#text} at (0,0) size 751x19
- text run at (0,0) width 751: "This tests dragging a selected table by mousing down on the contents of one of its cells. It should be in the red bordered area."
- RenderBlock {DIV} at (0,36) size 784x22 [border: (1px solid #0000FF)]
- RenderInline {SPAN} at (0,0) size 0x19
- RenderBR {BR} at (1,1) size 0x19
- RenderBlock {DIV} at (0,58) size 784x32 [border: (1px solid #FF0000)]
- RenderTable {TABLE} at (1,1) size 30x30 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 28x28
- RenderTableRow {TR} at (0,2) size 28x24
- RenderTableCell {TD} at (2,2) size 24x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (2,2) size 20x19
- text run at (2,2) width 20: "foo"
- RenderBlock (anonymous) at (1,31) size 782x0
-selection start: position 0 of child 0 {TABLE} of child 4 {DIV} of body
-selection end: position 3 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 4 {DIV} of body
Deleted: trunk/LayoutTests/platform/chromium-win/editing/selection/4895428-4-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/selection/4895428-4-expected.txt (87269 => 87270)
--- trunk/LayoutTests/platform/chromium-win/editing/selection/4895428-4-expected.txt 2011-05-25 04:38:26 UTC (rev 87269)
+++ trunk/LayoutTests/platform/chromium-win/editing/selection/4895428-4-expected.txt 2011-05-25 04:38:26 UTC (rev 87270)
@@ -1,23 +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 784x576
- RenderBlock {P} at (0,0) size 784x40
- RenderText {#text} at (0,0) size 778x39
- text run at (0,0) width 778: "This tests to see if an editable selection containing a focusable node is draggable by content inside that focusable node. To achieve"
- text run at (0,20) width 629: "this we delay focus of such nodes until mouse up. Below, the table should be inside the red bordered div."
- RenderBlock {DIV} at (0,56) size 784x22 [border: (1px solid #0000FF)]
- RenderInline {SPAN} at (0,0) size 0x19
- RenderBR {BR} at (1,1) size 0x19
- RenderBlock {DIV} at (0,78) size 784x32 [border: (1px solid #FF0000)]
- RenderTable {TABLE} at (1,1) size 57x30 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 55x28
- RenderTableRow {TR} at (0,2) size 55x24
- RenderTableCell {TD} at (2,2) size 51x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (2,2) size 47x19
- text run at (2,2) width 47: "editable"
- RenderBlock (anonymous) at (1,31) size 782x0
- RenderBlock {UL} at (0,126) size 784x0
-selection start: position 0 of child 0 {TABLE} of child 4 {DIV} of body
-selection end: position 8 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 4 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/selection/4895428-1-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/gtk/editing/selection/4895428-1-expected.txt (87269 => 87270)
--- trunk/LayoutTests/platform/gtk/editing/selection/4895428-1-expected.txt 2011-05-25 04:38:26 UTC (rev 87269)
+++ trunk/LayoutTests/platform/gtk/editing/selection/4895428-1-expected.txt 2011-05-25 04:38:26 UTC (rev 87270)
@@ -1,22 +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 751x38
- text run at (0,0) width 751: "This tests dragging a selected table by mousing down on the contents of one of its cells. It should be in the red bordered"
- text run at (0,19) width 30: "area."
- RenderBlock {DIV} at (0,54) size 784x21 [border: (1px solid #0000FF)]
- RenderInline {SPAN} at (0,0) size 0x19
- RenderBR {BR} at (1,1) size 0x19
- RenderBlock {DIV} at (0,75) size 784x31 [border: (1px solid #FF0000)]
- RenderTable {TABLE} at (1,1) size 31x29 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 29x27
- RenderTableRow {TR} at (0,2) size 29x23
- RenderTableCell {TD} at (2,2) size 25x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (2,2) size 21x19
- text run at (2,2) width 21: "foo"
- RenderBlock (anonymous) at (1,30) size 782x0
-selection start: position 0 of child 0 {TABLE} of child 4 {DIV} of body
-selection end: position 3 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 4 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/selection/4895428-4-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/gtk/editing/selection/4895428-4-expected.txt (87269 => 87270)
--- trunk/LayoutTests/platform/gtk/editing/selection/4895428-4-expected.txt 2011-05-25 04:38:26 UTC (rev 87269)
+++ trunk/LayoutTests/platform/gtk/editing/selection/4895428-4-expected.txt 2011-05-25 04:38:26 UTC (rev 87270)
@@ -1,23 +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 784x576
- RenderBlock {P} at (0,0) size 784x38
- RenderText {#text} at (0,0) size 766x38
- text run at (0,0) width 766: "This tests to see if an editable selection containing a focusable node is draggable by content inside that focusable node. To"
- text run at (0,19) width 713: "achieve this we delay focus of such nodes until mouse up. Below, the table should be inside the red bordered div."
- RenderBlock {DIV} at (0,54) size 784x21 [border: (1px solid #0000FF)]
- RenderInline {SPAN} at (0,0) size 0x19
- RenderBR {BR} at (1,1) size 0x19
- RenderBlock {DIV} at (0,75) size 784x31 [border: (1px solid #FF0000)]
- RenderTable {TABLE} at (1,1) size 59x29 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 57x27
- RenderTableRow {TR} at (0,2) size 57x23
- RenderTableCell {TD} at (2,2) size 53x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (2,2) size 49x19
- text run at (2,2) width 49: "editable"
- RenderBlock (anonymous) at (1,30) size 782x0
- RenderBlock {UL} at (0,122) size 784x0
-selection start: position 0 of child 0 {TABLE} of child 4 {DIV} of body
-selection end: position 8 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 4 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/selection/4895428-1-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/selection/4895428-1-expected.txt (87269 => 87270)
--- trunk/LayoutTests/platform/mac/editing/selection/4895428-1-expected.txt 2011-05-25 04:38:26 UTC (rev 87269)
+++ trunk/LayoutTests/platform/mac/editing/selection/4895428-1-expected.txt 2011-05-25 04:38:26 UTC (rev 87270)
@@ -1,22 +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 751x36
- text run at (0,0) width 751: "This tests dragging a selected table by mousing down on the contents of one of its cells. It should be in the red bordered"
- text run at (0,18) width 30: "area."
- RenderBlock {DIV} at (0,52) size 784x20 [border: (1px solid #0000FF)]
- RenderInline {SPAN} at (0,0) size 0x18
- RenderBR {BR} at (1,1) size 0x18
- RenderBlock {DIV} at (0,72) size 784x30 [border: (1px solid #FF0000)]
- RenderTable {TABLE} at (1,1) size 31x28 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 29x26
- RenderTableRow {TR} at (0,2) size 29x22
- RenderTableCell {TD} at (2,2) size 25x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (2,2) size 21x18
- text run at (2,2) width 21: "foo"
- RenderBlock (anonymous) at (1,29) size 782x0
-selection start: position 0 of child 0 {TABLE} of child 4 {DIV} of body
-selection end: position 3 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 4 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/selection/4895428-4-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/selection/4895428-4-expected.txt (87269 => 87270)
--- trunk/LayoutTests/platform/mac/editing/selection/4895428-4-expected.txt 2011-05-25 04:38:26 UTC (rev 87269)
+++ trunk/LayoutTests/platform/mac/editing/selection/4895428-4-expected.txt 2011-05-25 04:38:26 UTC (rev 87270)
@@ -1,23 +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 784x576
- RenderBlock {P} at (0,0) size 784x36
- RenderText {#text} at (0,0) size 766x36
- text run at (0,0) width 766: "This tests to see if an editable selection containing a focusable node is draggable by content inside that focusable node. To"
- text run at (0,18) width 713: "achieve this we delay focus of such nodes until mouse up. Below, the table should be inside the red bordered div."
- RenderBlock {DIV} at (0,52) size 784x20 [border: (1px solid #0000FF)]
- RenderInline {SPAN} at (0,0) size 0x18
- RenderBR {BR} at (1,1) size 0x18
- RenderBlock {DIV} at (0,72) size 784x30 [border: (1px solid #FF0000)]
- RenderTable {TABLE} at (1,1) size 59x28 [border: (1px outset #808080)]
- RenderTableSection {TBODY} at (1,1) size 57x26
- RenderTableRow {TR} at (0,2) size 57x22
- RenderTableCell {TD} at (2,2) size 53x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderText {#text} at (2,2) size 49x18
- text run at (2,2) width 49: "editable"
- RenderBlock (anonymous) at (1,29) size 782x0
- RenderBlock {UL} at (0,118) size 784x0
-selection start: position 0 of child 0 {TABLE} of child 4 {DIV} of body
-selection end: position 8 of child 0 {#text} of child 0 {TD} of child 0 {TR} of child 0 {TBODY} of child 0 {TABLE} of child 4 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/selection/4895428-1-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/selection/4895428-4-expected.png
(Binary files differ)
