2011-03-11 Ryosuke Niwa <rniwa@webkit.org>

        Reviewed by Tony Chang.

        drag-text-delay.html should be a dump as text test
        https://bugs.webkit.org/show_bug.cgi?id=56223

        Converted the test to a dump as text. Also reorganized the test code and added more descriptions.

        * editing/selection/drag-text-delay-expected.txt:
        * editing/selection/drag-text-delay.html:
        * platform/chromium-linux/editing/selection/drag-text-delay-expected.checksum: Removed.
        * platform/chromium-linux/editing/selection/drag-text-delay-expected.png: Removed.
        * platform/chromium-win/editing/selection/drag-text-delay-expected.checksum: Removed.
        * platform/chromium-win/editing/selection/drag-text-delay-expected.png: Removed.
        * platform/chromium-win/editing/selection/drag-text-delay-expected.txt: Removed.
        * platform/gtk/editing/selection/drag-text-delay-expected.checksum: Removed.
        * platform/gtk/editing/selection/drag-text-delay-expected.png: Removed.
        * platform/gtk/editing/selection/drag-text-delay-expected.txt: Removed.
        * platform/mac/editing/selection/drag-text-delay-expected.checksum: Removed.
        * platform/mac/editing/selection/drag-text-delay-expected.png: Removed.
        * platform/mac/editing/selection/drag-text-delay-expected.txt:
        * platform/win/editing/selection/drag-text-delay-expected.checksum: Removed.
        * platform/win/editing/selection/drag-text-delay-expected.png: Removed.
        * platform/win/editing/selection/drag-text-delay-expected.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@80889 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 28a493532bb72b93d5a8d2f8587b90f031bcde52..55c04984ad5762b3b077833360e28e7c6f208d9c 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,29 @@
+2011-03-11  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Tony Chang.
+
+        drag-text-delay.html should be a dump as text test
+        https://bugs.webkit.org/show_bug.cgi?id=56223
+
+        Converted the test to a dump as text. Also reorganized the test code and added more descriptions.
+
+        * editing/selection/drag-text-delay-expected.txt:
+        * editing/selection/drag-text-delay.html:
+        * platform/chromium-linux/editing/selection/drag-text-delay-expected.checksum: Removed.
+        * platform/chromium-linux/editing/selection/drag-text-delay-expected.png: Removed.
+        * platform/chromium-win/editing/selection/drag-text-delay-expected.checksum: Removed.
+        * platform/chromium-win/editing/selection/drag-text-delay-expected.png: Removed.
+        * platform/chromium-win/editing/selection/drag-text-delay-expected.txt: Removed.
+        * platform/gtk/editing/selection/drag-text-delay-expected.checksum: Removed.
+        * platform/gtk/editing/selection/drag-text-delay-expected.png: Removed.
+        * platform/gtk/editing/selection/drag-text-delay-expected.txt: Removed.
+        * platform/mac/editing/selection/drag-text-delay-expected.checksum: Removed.
+        * platform/mac/editing/selection/drag-text-delay-expected.png: Removed.
+        * platform/mac/editing/selection/drag-text-delay-expected.txt:
+        * platform/win/editing/selection/drag-text-delay-expected.checksum: Removed.
+        * platform/win/editing/selection/drag-text-delay-expected.png: Removed.
+        * platform/win/editing/selection/drag-text-delay-expected.txt:
+
 2011-03-11  Mihai Parparita  <mihaip@chromium.org>
 
         Chromium Mac expectations update. Rebaseline some more tests after

diff --git a/LayoutTests/editing/selection/drag-text-delay-expected.txt b/LayoutTests/editing/selection/drag-text-delay-expected.txt
index 64584e36fbe21a9359b9016dd0ac1886be4ad1f1..beba868ad81d649590058852c5eb9166051eac10 100644 (file)
--- a/LayoutTests/editing/selection/drag-text-delay-expected.txt
+++ b/LayoutTests/editing/selection/drag-text-delay-expected.txt
@@ -1,16 +1,6 @@
-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
-      RenderTextControl {INPUT} at (2,2) size 148x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-layer at (13,13) size 142x13
-  RenderBlock {DIV} at (3,3) size 142x13
-    RenderText {#text} at (1,0) size 33x13
-      text run at (1,0) width 33: " world"
-    RenderText {#text} at (34,0) size 27x13
-      text run at (34,0) width 27: "hello"
-selection start: position 0 of child 1 {#text} of child 0 {DIV} of child 1 {INPUT} of body
-selection end:   position 5 of child 1 {#text} of child 0 {DIV} of child 1 {INPUT} of body
+On most platforms, if you click and move the mouse on selected text, it will always initiate a drag. On Mac, there must be a delay between the click and the mouse move before a drag starts. Otherwise, it will just change the selection.
+
+To manually test, select "hello" and rapidly drag. You should see "hello world" on Mac and "worldhello" on all other platforms.
+
+worldhello
+

diff --git a/LayoutTests/editing/selection/drag-text-delay.html b/LayoutTests/editing/selection/drag-text-delay.html
index 1fb6c1db4692585287ebf1f33af0cc1097b778ce..16c96f70ea6d7fa03c37ecdf36fff21ee224c944 100644 (file)
--- a/LayoutTests/editing/selection/drag-text-delay.html
+++ b/LayoutTests/editing/selection/drag-text-delay.html
@@ -1,27 +1,29 @@
+<!DOCTYPE html>
+<html>
+<body>
+<p>On most platforms, if you click and move the mouse on selected text, it will always initiate a drag. On Mac, there must be a delay between the click and the mouse move before a drag starts. Otherwise, it will just change the selection.</p>
+<p>To manually test, select "hello" and rapidly drag. You should see "hello world" on Mac and "worldhello" on all other platforms.</p>
+<div id="log"></div>
+<input id="text" type="text" value="hello world" />
 <script>
-// On most platforms, if you click and move the mouse on selected text, it
-// will always initiate a drag.  On mac, there must be a delay between the
-// click and the mouse move before a drag starts.  Otherwise, it will just
-// change the selection.
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
 
-function runtest() {
-  if (!window.layoutTestController)
-    return;
+    var text = document.getElementById("text");
+    text.setSelectionRange(0, 5);
 
-  var text = document.getElementById("text");
-  text.setSelectionRange(0, 5);
+    var start_x = text.offsetLeft + 5;
+    var start_y = text.offsetTop + text.offsetHeight / 2;
+    eventSender.mouseMoveTo(start_x, start_y);
+    eventSender.mouseDown();
 
-  var start_x = text.offsetLeft + 5;
-  var start_y = text.offsetTop + text.offsetHeight / 2;
-  eventSender.mouseMoveTo(start_x, start_y);
-  eventSender.mouseDown();
+    var end_x = text.offsetLeft + text.offsetWidth - 5;
+    var end_y = start_y;
+    eventSender.mouseMoveTo(end_x, end_y);
+    eventSender.mouseUp();
 
-  var end_x = text.offsetLeft + text.offsetWidth - 5;
-  var end_y = start_y;
-  eventSender.mouseMoveTo(end_x, end_y);
-  eventSender.mouseUp();
+    document.getElementById('log').innerText = text.value;
 }
 </script>
-<body onload="runtest()">
-<input id="text" type="text" value="hello world" />
 </body>
+</html>

diff --git a/LayoutTests/platform/chromium-linux/editing/selection/drag-text-delay-expected.checksum b/LayoutTests/platform/chromium-linux/editing/selection/drag-text-delay-expected.checksum
deleted file mode 100644 (file)
index dc03d78..0000000
--- a/LayoutTests/platform/chromium-linux/editing/selection/drag-text-delay-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-d28cd4b5de72054d0d80077e5511b6ea
\ No newline at end of file

diff --git a/LayoutTests/platform/chromium-linux/editing/selection/drag-text-delay-expected.png b/LayoutTests/platform/chromium-linux/editing/selection/drag-text-delay-expected.png
deleted file mode 100644 (file)
index 5365a73..0000000
Binary files a/LayoutTests/platform/chromium-linux/editing/selection/drag-text-delay-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/chromium-win/editing/selection/drag-text-delay-expected.checksum b/LayoutTests/platform/chromium-win/editing/selection/drag-text-delay-expected.checksum
deleted file mode 100644 (file)
index 0e1a7d1..0000000
--- a/LayoutTests/platform/chromium-win/editing/selection/drag-text-delay-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-94f0c20dfe6c8e6ba8c242adf5ae73aa
\ No newline at end of file

diff --git a/LayoutTests/platform/chromium-win/editing/selection/drag-text-delay-expected.png b/LayoutTests/platform/chromium-win/editing/selection/drag-text-delay-expected.png
deleted file mode 100644 (file)
index 9e33226..0000000
Binary files a/LayoutTests/platform/chromium-win/editing/selection/drag-text-delay-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/chromium-win/editing/selection/drag-text-delay-expected.txt b/LayoutTests/platform/chromium-win/editing/selection/drag-text-delay-expected.txt
deleted file mode 100644 (file)
index b38c402..0000000
--- a/LayoutTests/platform/chromium-win/editing/selection/drag-text-delay-expected.txt
+++ /dev/null
@@ -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
-      RenderTextControl {INPUT} at (2,2) size 155x22 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-      RenderText {#text} at (0,0) size 0x0
-layer at (12,13) size 151x16
-  RenderBlock {DIV} at (2,3) size 151x16
-    RenderText {#text} at (1,0) size 57x16
-      text run at (1,0) width 57: "worldhello"
-selection start: position 5 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of body
-selection end:   position 10 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of body

diff --git a/LayoutTests/platform/gtk/editing/selection/drag-text-delay-expected.checksum b/LayoutTests/platform/gtk/editing/selection/drag-text-delay-expected.checksum
deleted file mode 100644 (file)
index 91eaf94..0000000
--- a/LayoutTests/platform/gtk/editing/selection/drag-text-delay-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-1964fd90acc9b079f92d0e72c79db6e0
\ No newline at end of file

diff --git a/LayoutTests/platform/gtk/editing/selection/drag-text-delay-expected.png b/LayoutTests/platform/gtk/editing/selection/drag-text-delay-expected.png
deleted file mode 100644 (file)
index 753aae4..0000000
Binary files a/LayoutTests/platform/gtk/editing/selection/drag-text-delay-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/gtk/editing/selection/drag-text-delay-expected.txt b/LayoutTests/platform/gtk/editing/selection/drag-text-delay-expected.txt
deleted file mode 100644 (file)
index 8cfa15b..0000000
--- a/LayoutTests/platform/gtk/editing/selection/drag-text-delay-expected.txt
+++ /dev/null
@@ -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
-      RenderTextControl {INPUT} at (2,2) size 194x25 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-      RenderText {#text} at (0,0) size 0x0
-layer at (13,13) size 188x19
-  RenderBlock {DIV} at (3,3) size 188x19
-    RenderText {#text} at (1,0) size 78x19
-      text run at (1,0) width 78: " worldhello"
-selection start: position 6 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of body
-selection end:   position 11 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of body

diff --git a/LayoutTests/platform/mac/editing/selection/drag-text-delay-expected.checksum b/LayoutTests/platform/mac/editing/selection/drag-text-delay-expected.checksum
deleted file mode 100644 (file)
index 77c3d27..0000000
--- a/LayoutTests/platform/mac/editing/selection/drag-text-delay-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-ebaf5b69be32359ebad238844cf7e5e4
\ No newline at end of file

diff --git a/LayoutTests/platform/mac/editing/selection/drag-text-delay-expected.png b/LayoutTests/platform/mac/editing/selection/drag-text-delay-expected.png
deleted file mode 100644 (file)
index 36ca7a4..0000000
Binary files a/LayoutTests/platform/mac/editing/selection/drag-text-delay-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/mac/editing/selection/drag-text-delay-expected.txt b/LayoutTests/platform/mac/editing/selection/drag-text-delay-expected.txt
index 6c72628c18279471c8e121de152593cf74f2f7f6..447212b963c1e6d1baa0254210df98e627367d7e 100644 (file)
--- a/LayoutTests/platform/mac/editing/selection/drag-text-delay-expected.txt
+++ b/LayoutTests/platform/mac/editing/selection/drag-text-delay-expected.txt
@@ -1,12 +1,6 @@
-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
-      RenderTextControl {INPUT} at (2,2) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-      RenderText {#text} at (0,0) size 0x0
-layer at (13,13) size 119x13
-  RenderBlock {DIV} at (3,3) size 119x13
-    RenderText {#text} at (1,0) size 60x13
-      text run at (1,0) width 60: "hello world"
-caret: position 11 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of body
+On most platforms, if you click and move the mouse on selected text, it will always initiate a drag. On Mac, there must be a delay between the click and the mouse move before a drag starts. Otherwise, it will just change the selection.
+
+To manually test, select "hello" and rapidly drag. You should see "hello world" on Mac and "worldhello" on all other platforms.
+
+hello world
+

diff --git a/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.checksum b/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.checksum
deleted file mode 100644 (file)
index 42ee2ae..0000000
--- a/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-43fac1009b7e5c786b8bfe1834f6c7ff
\ No newline at end of file

diff --git a/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.png b/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.png
deleted file mode 100644 (file)
index 24cd4ce..0000000
Binary files a/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.png and /dev/null differ

diff --git a/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.txt b/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.txt
index d5c94fcb799950daa8885055d531266d36dcc293..beba868ad81d649590058852c5eb9166051eac10 100644 (file)
--- a/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.txt
+++ b/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.txt
@@ -1,13 +1,6 @@
-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
-      RenderTextControl {INPUT} at (2,2) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
-      RenderText {#text} at (0,0) size 0x0
-layer at (13,13) size 119x13
-  RenderBlock {DIV} at (3,3) size 119x13
-    RenderText {#text} at (1,0) size 56x13
-      text run at (1,0) width 56: "worldhello"
-selection start: position 5 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of body
-selection end:   position 10 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of body
+On most platforms, if you click and move the mouse on selected text, it will always initiate a drag. On Mac, there must be a delay between the click and the mouse move before a drag starts. Otherwise, it will just change the selection.
+
+To manually test, select "hello" and rapidly drag. You should see "hello world" on Mac and "worldhello" on all other platforms.
+
+worldhello
+