Title: [258905] trunk
- Revision
- 258905
- Author
- [email protected]
- Date
- 2020-03-23 21:17:19 -0700 (Mon, 23 Mar 2020)
Log Message
[mac-wk1] fast/scrolling/arrow-key-scroll-in-rtl-document.html is a flaky timeout
https://bugs.webkit.org/show_bug.cgi?id=209427
Reviewed by Wenson Hsieh.
Source/WebCore:
In WebKit1, arrow-key scrolls are instantaneous, so scrolling is complete before the test
registers the 'monitor wheel events' callback. However, nothing triggers a subsequent rendering
update, so the test never completes.
Fix by having WheelEventTestMonitor::setTestCallbackAndStartMonitoring() trigger a rendering
update.
* page/WheelEventTestMonitor.cpp:
(WebCore::WheelEventTestMonitor::setTestCallbackAndStartMonitoring):
Tools:
0 => NULL
* DumpRenderTree/mac/DumpRenderTree.mm:
(invalidateAnyPreviousWaitToDumpWatchdog):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (258904 => 258905)
--- trunk/Source/WebCore/ChangeLog 2020-03-24 04:09:30 UTC (rev 258904)
+++ trunk/Source/WebCore/ChangeLog 2020-03-24 04:17:19 UTC (rev 258905)
@@ -1,3 +1,20 @@
+2020-03-23 Simon Fraser <[email protected]>
+
+ [mac-wk1] fast/scrolling/arrow-key-scroll-in-rtl-document.html is a flaky timeout
+ https://bugs.webkit.org/show_bug.cgi?id=209427
+
+ Reviewed by Wenson Hsieh.
+
+ In WebKit1, arrow-key scrolls are instantaneous, so scrolling is complete before the test
+ registers the 'monitor wheel events' callback. However, nothing triggers a subsequent rendering
+ update, so the test never completes.
+
+ Fix by having WheelEventTestMonitor::setTestCallbackAndStartMonitoring() trigger a rendering
+ update.
+
+ * page/WheelEventTestMonitor.cpp:
+ (WebCore::WheelEventTestMonitor::setTestCallbackAndStartMonitoring):
+
2020-03-23 Zalan Bujtas <[email protected]>
[LFC] Layout::Box::initialContainingBlock() should return const InitialContainingBlock&
Modified: trunk/Source/WebCore/page/WheelEventTestMonitor.cpp (258904 => 258905)
--- trunk/Source/WebCore/page/WheelEventTestMonitor.cpp 2020-03-24 04:09:30 UTC (rev 258904)
+++ trunk/Source/WebCore/page/WheelEventTestMonitor.cpp 2020-03-24 04:17:19 UTC (rev 258905)
@@ -72,7 +72,9 @@
UNUSED_PARAM(expectMomentumEnd);
#endif
- LOG_WITH_STREAM(WheelEventTestMonitor, stream << " WheelEventTestMonitor::setTestCallbackAndStartMonitoring - expect end/cancel " << expectWheelEndOrCancel << ", expect momenum end " << expectMomentumEnd);
+ m_page.scheduleRenderingUpdate();
+
+ LOG_WITH_STREAM(WheelEventTestMonitor, stream << " WheelEventTestMonitor::setTestCallbackAndStartMonitoring - expect end/cancel " << expectWheelEndOrCancel << ", expect momentum end " << expectMomentumEnd);
}
void WheelEventTestMonitor::deferForReason(ScrollableAreaIdentifier identifier, DeferReason reason)
Modified: trunk/Tools/ChangeLog (258904 => 258905)
--- trunk/Tools/ChangeLog 2020-03-24 04:09:30 UTC (rev 258904)
+++ trunk/Tools/ChangeLog 2020-03-24 04:17:19 UTC (rev 258905)
@@ -1,3 +1,15 @@
+2020-03-23 Simon Fraser <[email protected]>
+
+ [mac-wk1] fast/scrolling/arrow-key-scroll-in-rtl-document.html is a flaky timeout
+ https://bugs.webkit.org/show_bug.cgi?id=209427
+
+ Reviewed by Wenson Hsieh.
+
+ 0 => NULL
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (invalidateAnyPreviousWaitToDumpWatchdog):
+
2020-03-23 Dean Jackson <[email protected]>
webkitpy Git class must expose the repository URL
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (258904 => 258905)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2020-03-24 04:09:30 UTC (rev 258904)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2020-03-24 04:17:19 UTC (rev 258905)
@@ -1707,7 +1707,7 @@
if (waitToDumpWatchdog) {
CFRunLoopTimerInvalidate(waitToDumpWatchdog);
CFRelease(waitToDumpWatchdog);
- waitToDumpWatchdog = 0;
+ waitToDumpWatchdog = NULL;
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
