Diff
Modified: trunk/LayoutTests/ChangeLog (87777 => 87778)
--- trunk/LayoutTests/ChangeLog 2011-06-01 06:57:51 UTC (rev 87777)
+++ trunk/LayoutTests/ChangeLog 2011-06-01 07:16:05 UTC (rev 87778)
@@ -1,3 +1,23 @@
+2011-06-01 Annie Sullivan <[email protected]>
+
+ Reviewed by Ryosuke Niwa.
+
+ Convert editing/pasteboard/4861010 to dump-as-markup
+ https://bugs.webkit.org/show_bug.cgi?id=61683
+
+ Renamed test to drag-drop-list.html, cleaned up html, and updated description.
+
+ * editing/pasteboard/4861080.html: Removed.
+ * editing/pasteboard/drag-drop-list.html: Copied from LayoutTests/editing/pasteboard/4861080.html.
+ * platform/chromium-linux/editing/pasteboard/4861080-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/4861080-expected.png: Removed.
+ * platform/chromium-win/editing/pasteboard/4861080-expected.txt: Removed.
+ * platform/gtk/editing/pasteboard/4861080-expected.png: Removed.
+ * platform/gtk/editing/pasteboard/4861080-expected.txt: Removed.
+ * platform/mac-leopard/editing/pasteboard/4861080-expected.png: Removed.
+ * platform/mac/editing/pasteboard/4861080-expected.png: Removed.
+ * platform/mac/editing/pasteboard/4861080-expected.txt: Removed.
+
2011-05-31 Kent Tamura <[email protected]>
Reviewed by Hajime Morita.
Deleted: trunk/LayoutTests/editing/pasteboard/4861080.html (87777 => 87778)
--- trunk/LayoutTests/editing/pasteboard/4861080.html 2011-06-01 06:57:51 UTC (rev 87777)
+++ trunk/LayoutTests/editing/pasteboard/4861080.html 2011-06-01 07:16:05 UTC (rev 87778)
@@ -1,49 +0,0 @@
-<p>This tests dropping content into the unwanted space above a list items content when the content is wrapped in a span. You should see 'DragMe DropAboveMe'.</p>
-<div contenteditable="true">
-<li id="li" style="border: 1px solid black;"><span><div id="contents" style="border: 1px solid red;">DropAboveMe</div></span></li>
-<div><span id="drag">DragMe</span></div>
-</div>
-<ul id="console"></ul>
-<script>
-function log(str) {
- var li = document.createElement("li");
- li.appendChild(document.createTextNode(str));
- var console = document.getElementById("console");
- console.appendChild(li);
-}
-
-function runTest() {
- if (!window.layoutTestController)
- log("This can only be run automatically using the layout test engine. To run it manually, drag 'Dragme' and drop it above 'DropAboveMe'.");
-
- window.layoutTestController.waitUntilDone();
-
- var drag = document.getElementById("drag");
- var dragx = drag.offsetParent.offsetLeft + drag.offsetLeft + drag.offsetWidth / 2;
- var dragy = drag.offsetParent.offsetTop + drag.offsetTop + drag.offsetHeight / 2;
-
- eventSender.mouseMoveTo(dragx, dragy);
- eventSender.mouseDown();
- eventSender.mouseUp();
- eventSender.mouseDown();
- eventSender.mouseUp();
- // Leap forward so that the next mouseDown doesn't trigger a triple click.
- eventSender.leapForward(1200);
-
- eventSender.mouseDown();
- // Leap forward so that the mouse movement causes a drag instead of selection creation.
- eventSender.leapForward(500);
-
- var li = document.getElementById("li");
-
- var dropx = li.offsetParent.offsetLeft + li.offsetLeft + li.offsetWidth / 2;
- var dropy = li.offsetParent.offsetTop + li.offsetTop + 15;
-
- eventSender.mouseMoveTo(dropx, dropy);
- eventSender.mouseUp();
-
- window.layoutTestController.notifyDone();
-}
-
-runTest();
-</script>
Added: trunk/LayoutTests/editing/pasteboard/drag-drop-list-expected.txt (0 => 87778)
--- trunk/LayoutTests/editing/pasteboard/drag-drop-list-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/drag-drop-list-expected.txt 2011-06-01 07:16:05 UTC (rev 87778)
@@ -0,0 +1,18 @@
+This tests dropping content onto a list items content when the content is wrapped in a span. You should see 'DropAboveMe DragMe'. See <rdar://4861080>, but note that the expected behavior is different than what's described there, since the rendering bug <rdar://4907469> has been fixed.
+| "
+"
+| <li>
+| id="li"
+| style="border: 1px solid black;"
+| <span>
+| <div>
+| id="contents"
+| style="border: 1px solid red;"
+| "DropAboveMe"
+| "<#selection-anchor> DragMe<#selection-focus>"
+| "
+"
+| <div>
+| <br>
+| "
+"
Copied: trunk/LayoutTests/editing/pasteboard/drag-drop-list.html (from rev 87777, trunk/LayoutTests/editing/pasteboard/4861080.html) (0 => 87778)
--- trunk/LayoutTests/editing/pasteboard/drag-drop-list.html (rev 0)
+++ trunk/LayoutTests/editing/pasteboard/drag-drop-list.html 2011-06-01 07:16:05 UTC (rev 87778)
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML>
+<html>
+<body>
+<div contenteditable="true" id="editable">
+<li id="li" style="border: 1px solid black;"><span><div id="contents" style="border: 1px solid red;">DropAboveMe</div></span></li>
+<div><span id="drag">DragMe</span></div>
+</div>
+
+<ul id="console"></ul>
+<script src=""
+<script>
+function log(str) {
+ var li = document.createElement("li");
+ li.appendChild(document.createTextNode(str));
+ var console = document.getElementById("console");
+ console.appendChild(li);
+}
+
+function runTest() {
+ if (!window.layoutTestController)
+ log("This can only be run automatically using the layout test engine. To run it manually, drag 'Dragme' and drop it above 'DropAboveMe'.");
+
+ window.layoutTestController.waitUntilDone();
+
+ var drag = document.getElementById("drag");
+ var dragx = drag.offsetParent.offsetLeft + drag.offsetLeft + drag.offsetWidth / 2;
+ var dragy = drag.offsetParent.offsetTop + drag.offsetTop + drag.offsetHeight / 2;
+
+ eventSender.mouseMoveTo(dragx, dragy);
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ // Leap forward so that the next mouseDown doesn't trigger a triple click.
+ eventSender.leapForward(1200);
+
+ eventSender.mouseDown();
+ // Leap forward so that the mouse movement causes a drag instead of selection creation.
+ eventSender.leapForward(500);
+
+ var li = document.getElementById("li");
+
+ var dropx = li.offsetLeft + li.offsetWidth / 2;
+ var dropy = li.offsetTop + 15;
+
+ eventSender.mouseMoveTo(dropx, dropy);
+ eventSender.mouseUp();
+
+ window.layoutTestController.notifyDone();
+ Markup.description("This tests dropping content onto a list items content when the content is wrapped in a span. You should see 'DropAboveMe DragMe'. "
+ + "See <rdar://4861080>, but note that the expected behavior is different than what's described there, since the rendering bug <rdar://4907469> has been fixed.");
+ Markup.dump(editable);
+}
+
+runTest();
+</script>
+</body>
+</html>
Deleted: trunk/LayoutTests/platform/chromium-linux/editing/pasteboard/4861080-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/4861080-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/chromium-win/editing/pasteboard/4861080-expected.txt (87777 => 87778)
--- trunk/LayoutTests/platform/chromium-win/editing/pasteboard/4861080-expected.txt 2011-06-01 06:57:51 UTC (rev 87777)
+++ trunk/LayoutTests/platform/chromium-win/editing/pasteboard/4861080-expected.txt 2011-06-01 07:16:05 UTC (rev 87778)
@@ -1,28 +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 777x39
- text run at (0,0) width 708: "This tests dropping content into the unwanted space above a list items content when the content is wrapped in a span. "
- text run at (708,0) width 69: "You should"
- text run at (0,20) width 183: "see 'DragMe DropAboveMe'."
- RenderBlock {DIV} at (0,56) size 784x44
- RenderListItem {LI} at (0,0) size 784x24 [border: (1px solid #000000)]
- RenderBlock (anonymous) at (1,1) size 782x0
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBlock (anonymous) at (1,1) size 782x22
- RenderBlock {DIV} at (0,0) size 782x22 [border: (1px solid #FF0000)]
- RenderListMarker at (0,1) size 7x19: bullet
- RenderText {#text} at (16,1) size 94x19
- text run at (16,1) width 94: "DropAboveMe"
- RenderText {#text} at (110,1) size 55x19
- text run at (110,1) width 55: " DragMe"
- RenderBlock (anonymous) at (1,23) size 782x0
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBlock {DIV} at (0,24) size 784x20
- RenderBR {BR} at (0,0) size 0x19
- RenderBlock {UL} at (0,116) size 784x0
-selection start: position 0 of child 1 {#text} of child 0 {DIV} of child 0 {SPAN} of child 1 {LI} of child 2 {DIV} of body
-selection end: position 7 of child 1 {#text} of child 0 {DIV} of child 0 {SPAN} of child 1 {LI} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/4861080-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/gtk/editing/pasteboard/4861080-expected.txt (87777 => 87778)
--- trunk/LayoutTests/platform/gtk/editing/pasteboard/4861080-expected.txt 2011-06-01 06:57:51 UTC (rev 87777)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/4861080-expected.txt 2011-06-01 07:16:05 UTC (rev 87778)
@@ -1,28 +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 769x38
- text run at (0,0) width 741: "This tests dropping content into the unwanted space above a list items content when the content is wrapped in a span. "
- text run at (741,0) width 28: "You"
- text run at (0,19) width 234: "should see 'DragMe DropAboveMe'."
- RenderBlock {DIV} at (0,54) size 784x42
- RenderListItem {LI} at (0,0) size 784x23 [border: (1px solid #000000)]
- RenderBlock (anonymous) at (1,1) size 782x0
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBlock (anonymous) at (1,1) size 782x21
- RenderBlock {DIV} at (0,0) size 782x21 [border: (1px solid #FF0000)]
- RenderListMarker at (0,1) size 7x19: bullet
- RenderText {#text} at (16,1) size 97x19
- text run at (16,1) width 97: "DropAboveMe"
- RenderText {#text} at (113,1) size 53x19
- text run at (113,1) width 53: "DragMe"
- RenderBlock (anonymous) at (1,22) size 782x0
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBlock {DIV} at (0,23) size 784x19
- RenderBR {BR} at (0,0) size 0x19
- RenderBlock {UL} at (0,112) size 784x0
-selection start: position 0 of child 1 {#text} of child 0 {DIV} of child 0 {SPAN} of child 1 {LI} of child 2 {DIV} of body
-selection end: position 6 of child 1 {#text} of child 0 {DIV} of child 0 {SPAN} of child 1 {LI} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/4861080-expected.png
(Binary files differ)
Deleted: trunk/LayoutTests/platform/mac/editing/pasteboard/4861080-expected.txt (87777 => 87778)
--- trunk/LayoutTests/platform/mac/editing/pasteboard/4861080-expected.txt 2011-06-01 06:57:51 UTC (rev 87777)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/4861080-expected.txt 2011-06-01 07:16:05 UTC (rev 87778)
@@ -1,28 +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 769x36
- text run at (0,0) width 741: "This tests dropping content into the unwanted space above a list items content when the content is wrapped in a span. "
- text run at (741,0) width 28: "You"
- text run at (0,18) width 234: "should see 'DragMe DropAboveMe'."
- RenderBlock {DIV} at (0,52) size 784x40
- RenderListItem {LI} at (0,0) size 784x22 [border: (1px solid #000000)]
- RenderBlock (anonymous) at (1,1) size 782x0
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBlock (anonymous) at (1,1) size 782x20
- RenderBlock {DIV} at (0,0) size 782x20 [border: (1px solid #FF0000)]
- RenderListMarker at (0,1) size 7x18: bullet
- RenderText {#text} at (15,1) size 97x18
- text run at (15,1) width 97: "DropAboveMe"
- RenderText {#text} at (112,1) size 57x18
- text run at (112,1) width 57: " DragMe"
- RenderBlock (anonymous) at (1,21) size 782x0
- RenderInline {SPAN} at (0,0) size 0x0
- RenderBlock {DIV} at (0,22) size 784x18
- RenderBR {BR} at (0,0) size 0x18
- RenderBlock {UL} at (0,108) size 784x0
-selection start: position 0 of child 1 {#text} of child 0 {DIV} of child 0 {SPAN} of child 1 {LI} of child 2 {DIV} of body
-selection end: position 7 of child 1 {#text} of child 0 {DIV} of child 0 {SPAN} of child 1 {LI} of child 2 {DIV} of body
Deleted: trunk/LayoutTests/platform/mac-leopard/editing/pasteboard/4861080-expected.png
(Binary files differ)
