[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
tonikitoo at webkit.org
tonikitoo at webkit.org
Wed Dec 22 14:28:45 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 73197510beb6a4a36f08d7afd85da19eaec4c822
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 11 13:41:04 2010 +0000
2010-10-10 Antonio Gomes <agomes at rim.com>
Reviewed by Andreas Kling.
Convert editing/selection/script-tests/click-in-margins-inside-editable-div.js to use LayoutTestController::setEditingBeh avior
https://bugs.webkit.org/show_bug.cgi?id=47471
Patch converts the editing/selection/click-in-margins-inside-editable-div to make use of the
LayoutTestController::setEditingBehavior machinery. That way, all platform specific editing behavior
code paths can be test in the same execution, and we make it possible to share the same
expected result file through all ports.
* editing/selection/click-in-margins-inside-editable-div-expected.txt:
* editing/selection/script-tests/click-in-margins-inside-editable-div.js:
():
* platform/mac/editing/selection/click-in-margins-inside-editable-div-expected.txt: Removed.
* platform/qt/editing/selection/click-in-margins-inside-editable-div-expected.txt: Removed.
* platform/win/editing/selection/click-in-margins-inside-editable-div-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69489 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 28b7900..dc412e0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,22 @@
+2010-10-10 Antonio Gomes <agomes at rim.com>
+
+ Reviewed by Andreas Kling.
+
+ Convert editing/selection/script-tests/click-in-margins-inside-editable-div.js to use LayoutTestController::setEditingBehavior
+ https://bugs.webkit.org/show_bug.cgi?id=47471
+
+ Patch converts the editing/selection/click-in-margins-inside-editable-div to make use of the
+ LayoutTestController::setEditingBehavior machinery. That way, all platform specific editing behavior
+ code paths can be test in the same execution, and we make it possible to share the same
+ expected result file through all ports.
+
+ * editing/selection/click-in-margins-inside-editable-div-expected.txt:
+ * editing/selection/script-tests/click-in-margins-inside-editable-div.js:
+ ():
+ * platform/mac/editing/selection/click-in-margins-inside-editable-div-expected.txt: Removed.
+ * platform/qt/editing/selection/click-in-margins-inside-editable-div-expected.txt: Removed.
+ * platform/win/editing/selection/click-in-margins-inside-editable-div-expected.txt: Removed.
+
2010-10-11 Alexander Pavlov <apavlov at chromium.org>
[Chromium] Unreviewed, build fix.
diff --git a/LayoutTests/editing/selection/click-in-margins-inside-editable-div-expected.txt b/LayoutTests/editing/selection/click-in-margins-inside-editable-div-expected.txt
index a9f3d11..42a4f36 100644
--- a/LayoutTests/editing/selection/click-in-margins-inside-editable-div-expected.txt
+++ b/LayoutTests/editing/selection/click-in-margins-inside-editable-div-expected.txt
@@ -3,20 +3,34 @@ Ensure cursor placement matches IE6/IE7/FF3 when clicking above/below lines in p
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS Selection is at node: [object Text] offset: 0
-PASS Selection is at node: [object Text] offset: 1
-PASS Selection is at node: [object Text] offset: 2
-PASS Selection is at node: [object Text] offset: 0
-PASS Selection is at node: [object Text] offset: 2
-PASS Selection is at node: [object Text] offset: 0
-PASS Selection is at node: [object Text] offset: 1
-PASS Selection is at node: [object Text] offset: 2
-PASS Selection is at node: [object Text] offset: 0
-PASS Selection is at node: [object Text] offset: 1
-PASS Selection is at node: [object Text] offset: 2
-PASS Selection is at node: [object Text] offset: 0
-PASS Selection is at node: [object Text] offset: 1
-PASS Selection is at node: [object Text] offset: 2
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 1 focusNode: [object Text](XX) focusOffset: 1 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 1 focusNode: [object Text](XX) focusOffset: 1 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 1 focusNode: [object Text](YY) focusOffset: 1 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 1 focusNode: [object Text](YY) focusOffset: 1 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/editing/selection/script-tests/click-in-margins-inside-editable-div.js b/LayoutTests/editing/selection/script-tests/click-in-margins-inside-editable-div.js
index 796c9c9..fab7263 100644
--- a/LayoutTests/editing/selection/script-tests/click-in-margins-inside-editable-div.js
+++ b/LayoutTests/editing/selection/script-tests/click-in-margins-inside-editable-div.js
@@ -66,29 +66,35 @@ function runInteractiveTests()
// for determining if the click below a div (in the padding/margin region)
// The rules for clicking above or below the text are different on Windows and Mac.
-// Later we could break this into two tests, one that tests each platform's rules,
-// since this is supported as a setting in the Settings object, but for now we'll
-// just use separate expected results for Mac and other platforms.
-var expectMacStyleSelection = navigator.userAgent.search(/\bMac OS X\b/) != -1;
+function editingTest(editingBehavior)
+{
+ if (window.layoutTestController)
+ layoutTestController.setEditingBehavior(editingBehavior);
+
+ var expectMacStyleSelection = editingBehavior == "mac";
-clickShouldResultInRange(10, 10, firstText, 0);
-clickShouldResultInRange(40, 10, firstText, expectMacStyleSelection ? 0 : 1);
-clickShouldResultInRange(70, 10, firstText, expectMacStyleSelection ? 0 : 2);
+ clickShouldResultInRange(10, 10, firstText, 0);
+ clickShouldResultInRange(40, 10, firstText, expectMacStyleSelection ? 0 : 1);
+ clickShouldResultInRange(70, 10, firstText, expectMacStyleSelection ? 0 : 2);
-clickShouldResultInRange(10, 30, firstText, 0);
-clickShouldResultInRange(70, 30, firstText, 2);
+ clickShouldResultInRange(10, 30, firstText, 0);
+ clickShouldResultInRange(70, 30, firstText, 2);
-clickShouldResultInRange(10, 50, firstText, expectMacStyleSelection ? 2 : 0);
-clickShouldResultInRange(40, 50, firstText, expectMacStyleSelection ? 2 : 1);
-clickShouldResultInRange(70, 50, firstText, 2);
+ clickShouldResultInRange(10, 50, firstText, expectMacStyleSelection ? 2 : 0);
+ clickShouldResultInRange(40, 50, firstText, expectMacStyleSelection ? 2 : 1);
+ clickShouldResultInRange(70, 50, firstText, 2);
-clickShouldResultInRange(10, 70, secondText, 0);
-clickShouldResultInRange(40, 70, secondText, expectMacStyleSelection ? 0 : 1);
-clickShouldResultInRange(70, 70, secondText, expectMacStyleSelection ? 0 : 2);
+ clickShouldResultInRange(10, 70, secondText, 0);
+ clickShouldResultInRange(40, 70, secondText, expectMacStyleSelection ? 0 : 1);
+ clickShouldResultInRange(70, 70, secondText, expectMacStyleSelection ? 0 : 2);
+
+ clickShouldResultInRange(10, 110, secondText, expectMacStyleSelection ? 2 : 0);
+ clickShouldResultInRange(40, 110, secondText, expectMacStyleSelection ? 2 : 1);
+ clickShouldResultInRange(70, 110, secondText, 2);
+}
-clickShouldResultInRange(10, 110, secondText, expectMacStyleSelection ? 2 : 0);
-clickShouldResultInRange(40, 110, secondText, expectMacStyleSelection ? 2 : 1);
-clickShouldResultInRange(70, 110, secondText, 2);
+editingTest("mac");
+editingTest("win");
// Clean up after ourselves if we're not being run in the browser
if (window.eventSender) {
diff --git a/LayoutTests/platform/mac/editing/selection/click-in-margins-inside-editable-div-expected.txt b/LayoutTests/platform/mac/editing/selection/click-in-margins-inside-editable-div-expected.txt
deleted file mode 100644
index 2f8d5a5..0000000
--- a/LayoutTests/platform/mac/editing/selection/click-in-margins-inside-editable-div-expected.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Ensure cursor placement matches IE6/IE7/FF3 when clicking above/below lines in padding.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/platform/qt/editing/selection/click-in-margins-inside-editable-div-expected.txt b/LayoutTests/platform/qt/editing/selection/click-in-margins-inside-editable-div-expected.txt
deleted file mode 100644
index 80eebbb..0000000
--- a/LayoutTests/platform/qt/editing/selection/click-in-margins-inside-editable-div-expected.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Ensure cursor placement matches IE6/IE7/FF3 when clicking above/below lines in padding.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 1 focusNode: [object Text](XX) focusOffset: 1 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 1 focusNode: [object Text](XX) focusOffset: 1 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 1 focusNode: [object Text](YY) focusOffset: 1 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 1 focusNode: [object Text](YY) focusOffset: 1 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/platform/win/editing/selection/click-in-margins-inside-editable-div-expected.txt b/LayoutTests/platform/win/editing/selection/click-in-margins-inside-editable-div-expected.txt
deleted file mode 100644
index 80eebbb..0000000
--- a/LayoutTests/platform/win/editing/selection/click-in-margins-inside-editable-div-expected.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Ensure cursor placement matches IE6/IE7/FF3 when clicking above/below lines in padding.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 1 focusNode: [object Text](XX) focusOffset: 1 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 0 focusNode: [object Text](XX) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 1 focusNode: [object Text](XX) focusOffset: 1 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](XX) anchorOffset: 2 focusNode: [object Text](XX) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 1 focusNode: [object Text](YY) focusOffset: 1 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 0 focusNode: [object Text](YY) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 1 focusNode: [object Text](YY) focusOffset: 1 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](YY) anchorOffset: 2 focusNode: [object Text](YY) focusOffset: 2 isCollapsed: true]
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list