Changeset 69466 in webkit

Timestamp:

Oct 10, 2010 7:14:53 AM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

2010-10-10 Antonio Gomes <​agomes@rim.com>

Reviewed by Andreas Kling.

editing/selection/extend-after-mouse-selection.html should useLayoutTestController::setEditingBehavior
​https://bugs.webkit.org/show_bug.cgi?id=47468

Changed editing/selection/extend-after-mouse-selection.html to use the LayoutTestController::setEditingBehavior
machinary. It makes it possible to remove platform dependent test results by testing through all
platform-specific codepath's we have.

• editing/selection/extend-after-mouse-selection.html:
• platform/editing/selection/extend-after-mouse-selection-expected.txt: Added.
• platform/mac/editing/selection/extend-after-mouse-selection-expected.txt: Removed.
• platform/win/editing/selection/extend-after-mouse-selection-expected.txt: Removed.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• editing/selection/extend-after-mouse-selection-expected.txt (added)
• editing/selection/extend-after-mouse-selection.html (modified) (6 diffs)
• platform/mac/editing/selection/extend-after-mouse-selection-expected.txt (deleted)
• platform/win/editing/selection/extend-after-mouse-selection-expected.txt (deleted)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-10  Antonio Gomes  <agomes@rim.com>
+
+        Reviewed by Andreas Kling.
+
+        editing/selection/extend-after-mouse-selection.html should use LayoutTestController::setEditingBehavior
+        https://bugs.webkit.org/show_bug.cgi?id=47468
+
+        Changed editing/selection/extend-after-mouse-selection.html to use the LayoutTestController::setEditingBehavior
+        machinary. It makes it possible to remove platform dependent test results by testing through all
+        platform-specific codepath's we have.
+
+        * editing/selection/extend-after-mouse-selection.html:
+        * platform/editing/selection/extend-after-mouse-selection-expected.txt: Added.
+        * platform/mac/editing/selection/extend-after-mouse-selection-expected.txt: Removed.
+        * platform/win/editing/selection/extend-after-mouse-selection-expected.txt: Removed.
+
 2010-10-09  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/editing/selection/extend-after-mouse-selection.html

@@ -14 +14 @@
 
 <script>
-// FIXME: Expose settings->editingBehavior() and use that here instead.
-var onMacPlatform = navigator.userAgent.search(/\bMac OS X\b/) != -1;
 
-function editingTest() {
+function editingTest(editingBehavior) {
+
+    if (window.layoutTestController)
+        layoutTestController.setEditingBehavior(editingBehavior);
+
     var startTarget = document.getElementById('start');
     var endTarget = document.getElementById('end');
@@ -34 +36 @@
     extendSelectionBackwardByCharacterCommand();
 
-
     // On Win/Linux the anchor is be fixed after the mouse-selection and never changes.
     // On Mac, the first character-granularity selection after a mouse-selection resets the anchor/focus.
-    if (onMacPlatform)
+    if (editingBehavior == "mac")
         assertSelectionAt(endTarget.firstChild, 2, startTarget.previousSibling, 1);
     else
@@ -43 +44 @@
 
     extendSelectionForwardByCharacterCommand();
-    if (onMacPlatform)
+    if (editingBehavior == "mac")
         assertSelectionAt(endTarget.firstChild, 2, startTarget.firstChild, 0);
     else
@@ -50 +51 @@
     extendSelectionForwardByLineBoundaryCommand();
 
-    if (onMacPlatform)
+    if (editingBehavior == "mac")
         assertSelectionAt(endTarget.nextSibling, 1, startTarget.firstChild, 0);
     else
@@ -57 +58 @@
     extendSelectionBackwardByLineBoundaryCommand();
 
-    if (onMacPlatform)
+    if (editingBehavior == "mac")
         assertSelectionAt(endTarget.nextSibling, 1, startTarget.previousSibling, 0);
     else
@@ -75 +76 @@
 
 <script>
-editingTest();
+editingTest("mac");
+editingTest("win");
 var successfullyParsed = true;
 </script>