Modified: trunk/LayoutTests/ChangeLog (94976 => 94977)
--- trunk/LayoutTests/ChangeLog 2011-09-12 20:54:21 UTC (rev 94976)
+++ trunk/LayoutTests/ChangeLog 2011-09-12 21:05:29 UTC (rev 94977)
@@ -1,3 +1,10 @@
+2011-09-12 Ryosuke Niwa <[email protected]>
+
+ Fix a test added by r94966 to work on Mac.
+
+ * fast/events/selectstart-by-arrow-keys.html:
+ * platform/chromium/test_expectations.txt:
+
2011-09-12 Nate Chapin <[email protected]>
Fix up duplicate expectations and add expected failure
Modified: trunk/LayoutTests/fast/events/selectstart-by-arrow-keys.html (94976 => 94977)
--- trunk/LayoutTests/fast/events/selectstart-by-arrow-keys.html 2011-09-12 20:54:21 UTC (rev 94976)
+++ trunk/LayoutTests/fast/events/selectstart-by-arrow-keys.html 2011-09-12 21:05:29 UTC (rev 94977)
@@ -22,7 +22,10 @@
eventSender.keyDown("rightArrow", ["shiftKey"]);
logResult('Check (Right arrow + Shift)', 1);
- eventSender.keyDown("rightArrow", ["shiftKey"], ["ctrlKey"]);
+ if (navigator.platform.indexOf('Mac') == 0)
+ eventSender.keyDown("rightArrow", ["shiftKey"], ["altKey"]);
+ else
+ eventSender.keyDown("rightArrow", ["shiftKey"], ["ctrlKey"]);
logResult('Check (Right arrow + Shift + Control)', 1);
eventSender.keyDown("end", ["shiftKey"]);
@@ -34,10 +37,17 @@
eventSender.keyDown("end", ["shiftKey"]);
logResult('Check (End + Shift)', 1);
+ // On Mac, home/end doesn't move caret so manually select " World".
+ if (navigator.platform.indexOf('Mac') == 0)
+ window.getSelection().setBaseAndExtent(div.firstChild, div.textContent.indexOf('World'), div.textContent.length);
+
eventSender.keyDown("leftArrow");
logResult('Check (Left arrow)', 1);
- eventSender.keyDown("leftArrow", ["shiftKey"], ["ctrlKey"]);
+ if (navigator.platform.indexOf('Mac') == 0)
+ eventSender.keyDown("leftArrow", ["shiftKey"], ["altKey"]);
+ else
+ eventSender.keyDown("leftArrow", ["shiftKey"], ["ctrlKey"]);
logResult('Check (LeftArrow + Shift + Control)', 2);
eventSender.keyDown("leftArrow", ["shiftKey"]);
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (94976 => 94977)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-09-12 20:54:21 UTC (rev 94976)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-09-12 21:05:29 UTC (rev 94977)
@@ -3727,6 +3727,3 @@
// Failing after r94946
BUGWK67926 WIN : fast/events/constructors/progress-event-constructor.html = TEXT
-
-// Failing after r94966.
-BUGJAPHET MAC : fast/events/selectstart-by-arrow-keys.html = TEXT
