Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (188083 => 188084)
--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-08-06 23:22:41 UTC (rev 188083)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-08-06 23:22:43 UTC (rev 188084)
@@ -1,5 +1,19 @@
2015-08-06 Dana Burkart <dburk...@apple.com>
+ Merge r187964. rdar://problem/21870332
+
+ 2015-08-05 Brent Fulgham <bfulg...@apple.com>
+
+ Unreviewed test gardening.
+
+ Skip new latched scrolling test on WK1 due to timeout. Check in some minor clean-ups in
+ the test based on feedback from Antti and others:
+
+ * platform/mac/TestExpectations:
+ * platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html:
+
+2015-08-06 Dana Burkart <dburk...@apple.com>
+
Merge r187935. rdar://problem/22097682
2015-08-04 Doug Russell <d_russ...@apple.com>
Modified: branches/safari-601.1-branch/LayoutTests/platform/mac/TestExpectations (188083 => 188084)
--- branches/safari-601.1-branch/LayoutTests/platform/mac/TestExpectations 2015-08-06 23:22:41 UTC (rev 188083)
+++ branches/safari-601.1-branch/LayoutTests/platform/mac/TestExpectations 2015-08-06 23:22:43 UTC (rev 188084)
@@ -1360,3 +1360,6 @@
[ ElCapitan+ ] canvas/philip/tests/2d.composite.uncovered.pattern.source-in.html [ Pass Failure ]
[ ElCapitan+ ] canvas/philip/tests/2d.composite.uncovered.fill.source-out.html [ Pass Failure ]
[ ElCapitan+ ] canvas/philip/tests/2d.composite.uncovered.fill.source-in.html [ Pass Failure ]
+
+# WK1-only timeout.
+fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html [ Skip ]
Modified: branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html (188083 => 188084)
--- branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html 2015-08-06 23:22:41 UTC (rev 188083)
+++ branches/safari-601.1-branch/LayoutTests/platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html 2015-08-06 23:22:43 UTC (rev 188084)
@@ -11,8 +11,6 @@
var pageScrollPositionBefore;
var divScrollPositionBefore;
-var continueCount = 5;
-
function locationInWindowCoordinates(element)
{
var position = {};
@@ -37,7 +35,8 @@
testRunner.notifyDone();
}
-function checkForScroll() {
+function checkForScroll()
+{
var pageScrollPositionAfter = document.body.scrollTop;
var divScrollPositionAfter = divTarget.scrollTop;
@@ -54,7 +53,8 @@
finishTest();
}
-function scrollTest() {
+function scrollTest()
+{
pageScrollPositionBefore = document.body.scrollTop;
divTarget = document.getElementById('scrollable_div');
@@ -66,8 +66,7 @@
divScrollPositionBefore = divTarget.scrollTop;
- // Scroll the #source until we reach the #target.
- eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
+ eventSender.mouseMoveTo(startPosX, startPosY);
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
@@ -81,9 +80,10 @@
eventSender.callAfterScrollingCompletes(checkForScroll);
}
-function setupTopLevel() {
-
+function setupTopLevel()
+{
if (window.eventSender) {
+ jsTestIsAsync = true;
testRunner.waitUntilDone();
eventSender.monitorWheelEvents();
