Diff
Modified: trunk/LayoutTests/ChangeLog (166529 => 166530)
--- trunk/LayoutTests/ChangeLog 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/ChangeLog 2014-03-31 21:22:42 UTC (rev 166530)
@@ -1,3 +1,27 @@
+2014-03-31 Brent Fulgham <[email protected]>
+
+ Reduced Latched Scroll Test Flakiness
+ https://bugs.webkit.org/show_bug.cgi?id=130983
+
+ Reviewed by Darin Adler.
+
+ Rebaseline test output for 'hasPreciseScrollingDeltas' behavior.
+
+ * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt:
+ * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt:
+ * platform/mac/fast/scrolling/scroll-div-latched-mainframe-expected.txt:
+ * platform/mac/fast/scrolling/scroll-iframe-latched-mainframe-expected.txt:
+ * platform/mac/fast/scrolling/scroll-select-latched-mainframe-expected.txt:
+ * platform/mac/fast/scrolling/scroll-select-latched-select-expected.txt:
+
2014-03-31 Ion Rosca <[email protected]>
[CSS Blending] Blend mode property is propagated to multiple GraphicLayers
Modified: trunk/LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-mainframe-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-mainframe-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-mainframe-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -54,6 +54,6 @@
TEST COMPLETE
Mouse moved to (28, 125)
Page before: 0, div before: 0
-Page after: 320, div after: 0
+Page after: 58, div after: 0
PASS Scrollable div did not receive wheel events.
Modified: trunk/LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-mainframe-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-mainframe-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-mainframe-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -10,6 +10,6 @@
TEST COMPLETE
Mouse moved to (28, 66)
Page before: 0, IFrame before: 0
-Page after: 320, IFrame after: 0
+Page after: 58, IFrame after: 0
PASS IFrame did not receive wheel events.
Modified: trunk/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-mainframe-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-mainframe-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-mainframe-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -12,6 +12,6 @@
TEST COMPLETE
Mouse moved to (30, 127)
Page before: 0, select before: 0
-Page after: 320, select after: 0
+Page after: 58, select after: 0
PASS Select did not receive wheel events.
Modified: trunk/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-select-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-select-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-select-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -13,6 +13,6 @@
div display height = 111
Mouse moved to (30, 238)
Page before: 0, select before: 70
-Page after: 0, select after: 182
+Page after: 0, select after: 140
PASS Page did not receive wheel events.
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -54,17 +54,17 @@
TEST COMPLETE
Mouse moved to (28, 125)
Page before: 0, div before: 0
-Page after: 280, div after: 0
+Page after: 70, div after: 0
PASS Scrollable div did not receive wheel events.
(GraphicsLayer
(bounds 2008.00 2311.00)
- (visible rect 0.00, 280.00 785.00 x 585.00)
+ (visible rect 0.00, 70.00 785.00 x 585.00)
(contentsScale 1.00)
(children 1
(GraphicsLayer
(bounds 2008.00 2311.00)
(contentsOpaque 1)
- (visible rect 0.00, 280.00 785.00 x 585.00)
+ (visible rect 0.00, 70.00 785.00 x 585.00)
(contentsScale 1.00)
(tile cache coverage 0, 0 2008 x 2048)
(tile size 512 x 512)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -54,18 +54,18 @@
TEST COMPLETE
Mouse moved to (28, 125)
Page before: 0, div before: 0
-Page after: 280, div after: 0
+Page after: 70, div after: 0
PASS Scrollable div did not receive wheel events.
Document was initial target for 4 of the wheel events.
(GraphicsLayer
(bounds 2008.00 2326.00)
- (visible rect 0.00, 280.00 785.00 x 585.00)
+ (visible rect 0.00, 70.00 785.00 x 585.00)
(contentsScale 1.00)
(children 1
(GraphicsLayer
(bounds 2008.00 2326.00)
(contentsOpaque 1)
- (visible rect 0.00, 280.00 785.00 x 585.00)
+ (visible rect 0.00, 70.00 785.00 x 585.00)
(contentsScale 1.00)
(tile cache coverage 0, 0 2008 x 2048)
(tile size 512 x 512)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -11,7 +11,7 @@
IFrame display height = 500
Mouse moved to (28, 566)
Page before: 0, IFrame before: 416
-Page after: 0, IFrame after: 531
+Page after: 0, IFrame after: 496
PASS Page did not receive wheel events.
(GraphicsLayer
(bounds 785.00 2326.00)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -11,7 +11,7 @@
IFrame display height = 500
Mouse moved to (28, 566)
Page before: 0, IFrame before: 416
-Page after: 0, IFrame after: 531
+Page after: 0, IFrame after: 496
PASS Page did not receive wheel events.
Document was initial target for 0 of the wheel events.
(GraphicsLayer
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -10,17 +10,17 @@
TEST COMPLETE
Mouse moved to (28, 66)
Page before: 0, IFrame before: 0
-Page after: 280, IFrame after: 0
+Page after: 70, IFrame after: 0
PASS IFrame did not receive wheel events.
(GraphicsLayer
(bounds 785.00 2311.00)
- (visible rect 0.00, 280.00 785.00 x 600.00)
+ (visible rect 0.00, 70.00 785.00 x 600.00)
(contentsScale 1.00)
(children 1
(GraphicsLayer
(bounds 785.00 2311.00)
(contentsOpaque 1)
- (visible rect 0.00, 280.00 785.00 x 600.00)
+ (visible rect 0.00, 70.00 785.00 x 600.00)
(contentsScale 1.00)
(tile cache coverage 0, 0 785 x 2048)
(tile size 512 x 512)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -10,18 +10,18 @@
TEST COMPLETE
Mouse moved to (28, 66)
Page before: 0, IFrame before: 0
-Page after: 280, IFrame after: 0
+Page after: 70, IFrame after: 0
PASS IFrame did not receive wheel events.
Document was initial target for 4 of the wheel events.
(GraphicsLayer
(bounds 785.00 2326.00)
- (visible rect 0.00, 280.00 785.00 x 600.00)
+ (visible rect 0.00, 70.00 785.00 x 600.00)
(contentsScale 1.00)
(children 1
(GraphicsLayer
(bounds 785.00 2326.00)
(contentsOpaque 1)
- (visible rect 0.00, 280.00 785.00 x 600.00)
+ (visible rect 0.00, 70.00 785.00 x 600.00)
(contentsScale 1.00)
(tile cache coverage 0, 0 785 x 2048)
(tile size 512 x 512)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -12,17 +12,17 @@
TEST COMPLETE
Mouse moved to (30, 127)
Page before: 0, select before: 0
-Page after: 280, select after: 0
+Page after: 70, select after: 0
PASS Select did not receive wheel events.
(GraphicsLayer
(bounds 2008.00 2311.00)
- (visible rect 0.00, 280.00 785.00 x 585.00)
+ (visible rect 0.00, 70.00 785.00 x 585.00)
(contentsScale 1.00)
(children 1
(GraphicsLayer
(bounds 2008.00 2311.00)
(contentsOpaque 1)
- (visible rect 0.00, 280.00 785.00 x 585.00)
+ (visible rect 0.00, 70.00 785.00 x 585.00)
(contentsScale 1.00)
(tile cache coverage 0, 0 2008 x 2048)
(tile size 512 x 512)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -12,18 +12,18 @@
TEST COMPLETE
Mouse moved to (30, 127)
Page before: 0, select before: 0
-Page after: 280, select after: 0
+Page after: 70, select after: 0
PASS Select did not receive wheel events.
Document was initial target for 4 of the wheel events.
(GraphicsLayer
(bounds 2008.00 2326.00)
- (visible rect 0.00, 280.00 785.00 x 585.00)
+ (visible rect 0.00, 70.00 785.00 x 585.00)
(contentsScale 1.00)
(children 1
(GraphicsLayer
(bounds 2008.00 2326.00)
(contentsOpaque 1)
- (visible rect 0.00, 280.00 785.00 x 585.00)
+ (visible rect 0.00, 70.00 785.00 x 585.00)
(contentsScale 1.00)
(tile cache coverage 0, 0 2008 x 2048)
(tile size 512 x 512)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -13,7 +13,7 @@
div display height = 111
Mouse moved to (30, 238)
Page before: 0, select before: 70
-Page after: 0, select after: 182
+Page after: 0, select after: 140
PASS Page did not receive wheel events.
(GraphicsLayer
(bounds 2008.00 2326.00)
Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt (166529 => 166530)
--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt 2014-03-31 21:22:42 UTC (rev 166530)
@@ -13,7 +13,7 @@
div display height = 111
Mouse moved to (30, 238)
Page before: 0, select before: 70
-Page after: 0, select after: 182
+Page after: 0, select after: 140
PASS Page did not receive wheel events.
Document was initial target for 4 of the wheel events.
(GraphicsLayer
Modified: trunk/Tools/ChangeLog (166529 => 166530)
--- trunk/Tools/ChangeLog 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/Tools/ChangeLog 2014-03-31 21:22:42 UTC (rev 166530)
@@ -1,3 +1,18 @@
+2014-03-31 Brent Fulgham <[email protected]>
+
+ Reduced Latched Scroll Test Flakiness
+ https://bugs.webkit.org/show_bug.cgi?id=130983
+
+ Reviewed by Darin Adler.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (setDefaultsToConsistentValuesForTesting): Test user should have 'high resolution' scrolling.
+ * DumpRenderTree/mac/EventSendingController.mm:
+ (-[EventSendingController mouseScrollByX:andY:withWheel:andMomentumPhases:]): Generate mouse wheel events
+ with high resolution flags turned on.
+ * WebKitTestRunner/mac/EventSenderProxy.mm:
+ (WTR::EventSenderProxy::mouseScrollByWithWheelAndMomentumPhases): Ditto.
+
2014-03-31 Jozsef Berta <[email protected]>
run-webkit-tests should have a --no-timeout option
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (166529 => 166530)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-03-31 21:22:42 UTC (rev 166530)
@@ -953,6 +953,7 @@
#endif
@"NSOverlayScrollersEnabled": @NO,
@"AppleShowScrollBars": @"Always",
+ @"NSSmoothScrollWheel": @YES,
WebDatabaseDirectoryDefaultsKey: [libraryPath stringByAppendingPathComponent:@"Databases"],
WebStorageDirectoryDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalStorage"],
WebKitLocalCacheDefaultsKey: [libraryPath stringByAppendingPathComponent:@"LocalCache"]
Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.mm (166529 => 166530)
--- trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2014-03-31 21:22:42 UTC (rev 166530)
@@ -738,6 +738,7 @@
// CGEvent locations are in global display coordinates.
CGPoint lastGlobalMousePosition = CGPointMake(lastMousePosition.x, [[NSScreen mainScreen] frame].size.height - lastMousePosition.y);
CGEventSetLocation(cgScrollEvent, lastGlobalMousePosition);
+ CGEventSetIntegerValueField(cgScrollEvent, kCGScrollWheelEventIsContinuous, 1);
CGEventSetIntegerValueField(cgScrollEvent, kCGScrollWheelEventScrollPhase, phase);
CGEventSetIntegerValueField(cgScrollEvent, kCGScrollWheelEventMomentumPhase, momentum);
Modified: trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm (166529 => 166530)
--- trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2014-03-31 21:18:23 UTC (rev 166529)
+++ trunk/Tools/WebKitTestRunner/mac/EventSenderProxy.mm 2014-03-31 21:22:42 UTC (rev 166530)
@@ -473,6 +473,7 @@
CGPoint lastGlobalMousePosition = CGPointMake(m_position.x, [[NSScreen mainScreen] frame].size.height - m_position.y);
CGEventSetLocation(cgScrollEvent.get(), lastGlobalMousePosition);
+ CGEventSetIntegerValueField(cgScrollEvent.get(), kCGScrollWheelEventIsContinuous, 1);
CGEventSetIntegerValueField(cgScrollEvent.get(), kCGScrollWheelEventScrollPhase, phase);
CGEventSetIntegerValueField(cgScrollEvent.get(), kCGScrollWheelEventMomentumPhase, momentum);
