[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:29:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 35f4ae58effd42b7f16b8f129197f090c84bfe80
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 11 19:09:53 2010 +0000
2010-10-10 Antonio Gomes <agomes at rim.com>
Reviewed by Andreas Kling.
Convert editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js to use LayoutTestController::setEditingBehavior
https://bugs.webkit.org/show_bug.cgi?id=47472
Patch converts the editing/selection/click-in-padding-with-multiple-line-boxes.js 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-padding-with-multiple-line-boxes-expected.txt: Modified with resutls for all editing behaviors, i.e. mac and win.
* editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js:
():
* platform/mac/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt: Removed.
* platform/qt/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt: Removed.
* platform/win/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt: Removed.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69515 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7231426..fec086d 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-padding-with-multiple-line-boxes.js to use LayoutTestController::setEditingBehavior
+ https://bugs.webkit.org/show_bug.cgi?id=47472
+
+ Patch converts the editing/selection/click-in-padding-with-multiple-line-boxes.js 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-padding-with-multiple-line-boxes-expected.txt: Modified with resutls for all editing behaviors, i.e. mac and win.
+ * editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js:
+ ():
+ * platform/mac/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt: Removed.
+ * platform/qt/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt: Removed.
+ * platform/win/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt: Removed.
+
2010-10-11 Ryosuke Niwa <rniwa at webkit.org>
Unreviewed build fix.
diff --git a/LayoutTests/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt b/LayoutTests/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt
index 8dc7c07..0e2a66e 100644
--- a/LayoutTests/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt
+++ b/LayoutTests/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt
@@ -3,8 +3,10 @@ Click above/beneath the word FOO. Notice how the cursor goes in the right place
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS Selection is at node: [object Text] offset: 1
-PASS Selection is at node: [object Text] offset: 1
+PASS Selection is [anchorNode: [object Text](12345) anchorOffset: 0 focusNode: [object Text](12345) focusOffset: 0 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](BAR) anchorOffset: 3 focusNode: [object Text](BAR) focusOffset: 3 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](FOO) anchorOffset: 1 focusNode: [object Text](FOO) focusOffset: 1 isCollapsed: true]
+PASS Selection is [anchorNode: [object Text](FOO) anchorOffset: 1 focusNode: [object Text](FOO) focusOffset: 1 isCollapsed: true]
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js b/LayoutTests/editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js
index d704dc3..0cf51b1 100644
--- a/LayoutTests/editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js
+++ b/LayoutTests/editing/selection/script-tests/click-in-padding-with-multiple-line-boxes.js
@@ -47,23 +47,29 @@ function runInteractiveTests()
}
// The rules for clicking 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";
-var foo = document.getElementById('foo');
-var x = foo.offsetLeft - div.scrollLeft + 10;
+ var foo = document.getElementById('foo');
+ var x = foo.offsetLeft - div.scrollLeft + 10;
-// Click 10px after the start of the span should put the cursor right after the letter F.
-if (expectMacStyleSelection) {
- clickShouldResultInRange(x, foo.offsetTop - 20, div.firstChild, 0);
- clickShouldResultInRange(x, foo.offsetTop + 20, div.lastChild.firstChild, 3);
-} else {
- clickShouldResultInRange(x, foo.offsetTop - 20, foo.firstChild, 1);
- clickShouldResultInRange(x, foo.offsetTop + 20, foo.firstChild, 1);
+ // Click 10px after the start of the span should put the cursor right after the letter F.
+ if (expectMacStyleSelection) {
+ clickShouldResultInRange(x, foo.offsetTop - 20, div.firstChild, 0);
+ clickShouldResultInRange(x, foo.offsetTop + 20, div.lastChild.firstChild, 3);
+ } else {
+ clickShouldResultInRange(x, foo.offsetTop - 20, foo.firstChild, 1);
+ clickShouldResultInRange(x, foo.offsetTop + 20, foo.firstChild, 1);
+ }
}
+editingTest("mac");
+editingTest("win");
+
// Clean up after ourselves if we're not being run in the browser
if (window.eventSender) {
document.body.removeChild(div);
diff --git a/LayoutTests/platform/mac/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt b/LayoutTests/platform/mac/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt
deleted file mode 100644
index 182c0eb..0000000
--- a/LayoutTests/platform/mac/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Click above/beneath the word FOO. Notice how the cursor goes in the right place (after the letter F).
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Selection is [anchorNode: [object Text](12345) anchorOffset: 0 focusNode: [object Text](12345) focusOffset: 0 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](BAR) anchorOffset: 3 focusNode: [object Text](BAR) focusOffset: 3 isCollapsed: true]
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/platform/qt/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt b/LayoutTests/platform/qt/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt
deleted file mode 100644
index ce31cfd..0000000
--- a/LayoutTests/platform/qt/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Click above/beneath the word FOO. Notice how the cursor goes in the right place (after the letter F).
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Selection is [anchorNode: [object Text](FOO) anchorOffset: 1 focusNode: [object Text](FOO) focusOffset: 1 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](FOO) anchorOffset: 1 focusNode: [object Text](FOO) focusOffset: 1 isCollapsed: true]
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/platform/win/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt b/LayoutTests/platform/win/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt
deleted file mode 100644
index ce31cfd..0000000
--- a/LayoutTests/platform/win/editing/selection/click-in-padding-with-multiple-line-boxes-expected.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-Click above/beneath the word FOO. Notice how the cursor goes in the right place (after the letter F).
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS Selection is [anchorNode: [object Text](FOO) anchorOffset: 1 focusNode: [object Text](FOO) focusOffset: 1 isCollapsed: true]
-PASS Selection is [anchorNode: [object Text](FOO) anchorOffset: 1 focusNode: [object Text](FOO) focusOffset: 1 isCollapsed: true]
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list