Diff
Modified: trunk/LayoutTests/ChangeLog (258557 => 258558)
--- trunk/LayoutTests/ChangeLog 2020-03-17 16:59:32 UTC (rev 258557)
+++ trunk/LayoutTests/ChangeLog 2020-03-17 17:14:43 UTC (rev 258558)
@@ -1,3 +1,16 @@
+2020-03-17 Jacob Uphoff <jacob_uph...@apple.com>
+
+ Unreviewed, reverting r257844.
+
+ this revision caused a test to start timing out
+
+ Reverted changeset:
+
+ "(r256513) [ Mac ] fast/scrolling/programmatic-scroll-to-zero-
+ zero.html is a flaky failure"
+ https://bugs.webkit.org/show_bug.cgi?id=207948
+ https://trac.webkit.org/changeset/257844
+
2020-03-17 Jason Lawrence <lawrenc...@apple.com>
[ Mac wk2 ] webrtc/concurrentVideoPlayback.html is flaky timing out.
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (258557 => 258558)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-03-17 16:59:32 UTC (rev 258557)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-03-17 17:14:43 UTC (rev 258558)
@@ -1059,6 +1059,8 @@
webkit.org/b/208062 http/wpt/fetch/disable-speculative-for-reload.html [ Pass Failure ]
+webkit.org/b/208160 fast/scrolling/overflow-scroll-past-max.html [ Pass Failure ]
+
webkit.org/b/208222 [ Release ] imported/w3c/web-platform-tests/webrtc/RTCPeerConnection-iceConnectionState.https.html [ Pass Failure ]
webkit.org/b/208340 webgpu/whlsl/textures-sample.html [ Pass ImageOnlyFailure ]
Modified: trunk/LayoutTests/platform/win/TestExpectations (258557 => 258558)
--- trunk/LayoutTests/platform/win/TestExpectations 2020-03-17 16:59:32 UTC (rev 258557)
+++ trunk/LayoutTests/platform/win/TestExpectations 2020-03-17 17:14:43 UTC (rev 258558)
@@ -275,8 +275,6 @@
fast/events/wheelevent-in-horizontal-scrollbar-in-rtl.html [ Failure ]
fast/events/wheelevent-in-vertical-scrollbar-in-rtl.html [ Failure ]
scrollbars/scroll-rtl-or-bt-layer.html [ Timeout ]
-webkit.org/b/208559 fast/scrolling/arrow-key-scroll-in-rtl-document.html [ Skip ]
-webkit.org/b/208559 fast/scrolling/programmatic-scroll-to-zero-zero.html [ Skip ]
# TODO Needs testRunner.enableAutoResizeMode()
fast/autoresize/ [ Skip ]
Modified: trunk/Source/WebCore/ChangeLog (258557 => 258558)
--- trunk/Source/WebCore/ChangeLog 2020-03-17 16:59:32 UTC (rev 258557)
+++ trunk/Source/WebCore/ChangeLog 2020-03-17 17:14:43 UTC (rev 258558)
@@ -1,3 +1,16 @@
+2020-03-17 Jacob Uphoff <jacob_uph...@apple.com>
+
+ Unreviewed, reverting r257844.
+
+ this revision caused a test to start timing out
+
+ Reverted changeset:
+
+ "(r256513) [ Mac ] fast/scrolling/programmatic-scroll-to-zero-
+ zero.html is a flaky failure"
+ https://bugs.webkit.org/show_bug.cgi?id=207948
+ https://trac.webkit.org/changeset/257844
+
2020-03-17 Commit Queue <commit-qu...@webkit.org>
Unreviewed, reverting r258339.
Modified: trunk/Source/WebCore/page/EventHandler.cpp (258557 => 258558)
--- trunk/Source/WebCore/page/EventHandler.cpp 2020-03-17 16:59:32 UTC (rev 258557)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2020-03-17 17:14:43 UTC (rev 258558)
@@ -103,7 +103,6 @@
#include "VisibleUnits.h"
#include "WheelEvent.h"
#include "WheelEventDeltaFilter.h"
-#include "WheelEventTestMonitor.h"
#include "WindowsKeyboardCodes.h"
#include <wtf/Assertions.h>
#include <wtf/NeverDestroyed.h>
@@ -2826,10 +2825,6 @@
}
#endif
-#if PLATFORM(COCOA)
- WheelEventTestMonitorCompletionDeferrer deferrer(m_frame.page()->wheelEventTestMonitor().get(), this, WheelEventTestMonitor::DeferReason::HandlingWheelEventOnMainThread);
-#endif
-
m_isHandlingWheelEvent = true;
setFrameWasScrolledByUser();
Modified: trunk/Source/WebCore/page/FrameView.cpp (258557 => 258558)
--- trunk/Source/WebCore/page/FrameView.cpp 2020-03-17 16:59:32 UTC (rev 258557)
+++ trunk/Source/WebCore/page/FrameView.cpp 2020-03-17 17:14:43 UTC (rev 258558)
@@ -2445,10 +2445,6 @@
void FrameView::scrollOffsetChangedViaPlatformWidgetImpl(const ScrollOffset& oldOffset, const ScrollOffset& newOffset)
{
-#if PLATFORM(COCOA)
- WheelEventTestMonitorCompletionDeferrer deferrer(frame().page()->wheelEventTestMonitor().get(), this, WheelEventTestMonitor::DeferReason::ContentScrollInProgress);
-#endif
-
updateLayerPositionsAfterScrolling();
updateCompositingLayersAfterScrolling();
repaintSlowRepaintObjects();
Modified: trunk/Source/WebCore/page/WheelEventTestMonitor.cpp (258557 => 258558)
--- trunk/Source/WebCore/page/WheelEventTestMonitor.cpp 2020-03-17 16:59:32 UTC (rev 258557)
+++ trunk/Source/WebCore/page/WheelEventTestMonitor.cpp 2020-03-17 17:14:43 UTC (rev 258558)
@@ -51,7 +51,6 @@
m_deferCompletionReasons.clear();
m_completionCallback = nullptr;
m_testForCompletionTimer.stop();
- m_everHadDeferral = false;
LOG_WITH_STREAM(WheelEventTestMonitor, stream << " (=) WheelEventTestMonitor::clearAllTestDeferrals: cleared all test state.");
}
@@ -70,9 +69,7 @@
m_deferCompletionReasons.ensure(identifier, [] {
return OptionSet<DeferReason>();
}).iterator->value.add(reason);
-
- m_everHadDeferral = true;
-
+
LOG_WITH_STREAM(WheelEventTestMonitor, stream << " (=) WheelEventTestMonitor::deferForReason: id=" << identifier << ", reason=" << reason);
}
@@ -98,11 +95,6 @@
return;
}
- if (!m_everHadDeferral) {
- LOG_WITH_STREAM(WheelEventTestMonitor, stream << " WheelEventTestMonitor::triggerTestTimerFired - have not yet seen any deferral reasons");
- return;
- }
-
auto functionCallback = WTFMove(m_completionCallback);
m_testForCompletionTimer.stop();
@@ -115,7 +107,6 @@
{
switch (reason) {
case WheelEventTestMonitor::HandlingWheelEvent: ts << "handling wheel event"; break;
- case WheelEventTestMonitor::HandlingWheelEventOnMainThread: ts << "handling wheel event on main thread"; break;
case WheelEventTestMonitor::RubberbandInProgress: ts << "rubberbanding"; break;
case WheelEventTestMonitor::ScrollSnapInProgress: ts << "scroll-snapping"; break;
case WheelEventTestMonitor::ScrollingThreadSyncNeeded: ts << "scrolling thread sync needed"; break;
Modified: trunk/Source/WebCore/page/WheelEventTestMonitor.h (258557 => 258558)
--- trunk/Source/WebCore/page/WheelEventTestMonitor.h 2020-03-17 16:59:32 UTC (rev 258557)
+++ trunk/Source/WebCore/page/WheelEventTestMonitor.h 2020-03-17 17:14:43 UTC (rev 258558)
@@ -47,12 +47,11 @@
WEBCORE_EXPORT void clearAllTestDeferrals();
enum DeferReason {
- HandlingWheelEvent = 1 << 0,
- HandlingWheelEventOnMainThread = 1 << 1,
- RubberbandInProgress = 1 << 2,
- ScrollSnapInProgress = 1 << 3,
- ScrollingThreadSyncNeeded = 1 << 4,
- ContentScrollInProgress = 1 << 5,
+ HandlingWheelEvent = 1 << 0,
+ RubberbandInProgress = 1 << 1,
+ ScrollSnapInProgress = 1 << 2,
+ ScrollingThreadSyncNeeded = 1 << 3,
+ ContentScrollInProgress = 1 << 4,
};
typedef const void* ScrollableAreaIdentifier;
@@ -68,32 +67,8 @@
RunLoop::Timer<WheelEventTestMonitor> m_testForCompletionTimer;
ScrollableAreaReasonMap m_deferCompletionReasons;
- bool m_everHadDeferral { false };
};
-class WheelEventTestMonitorCompletionDeferrer {
-public:
- WheelEventTestMonitorCompletionDeferrer(WheelEventTestMonitor* monitor, WheelEventTestMonitor::ScrollableAreaIdentifier identifier, WheelEventTestMonitor::DeferReason reason)
- : m_monitor(monitor)
- , m_identifier(identifier)
- , m_reason(reason)
- {
- if (m_monitor)
- m_monitor->deferForReason(m_identifier, m_reason);
- }
-
- ~WheelEventTestMonitorCompletionDeferrer()
- {
- if (m_monitor)
- m_monitor->removeDeferralForReason(m_identifier, m_reason);
- }
-
-private:
- RefPtr<WheelEventTestMonitor> m_monitor;
- WheelEventTestMonitor::ScrollableAreaIdentifier m_identifier;
- WheelEventTestMonitor::DeferReason m_reason;
-};
-
WTF::TextStream& operator<<(WTF::TextStream&, WheelEventTestMonitor::DeferReason);
WTF::TextStream& operator<<(WTF::TextStream&, const WheelEventTestMonitor::ScrollableAreaReasonMap&);
Modified: trunk/Tools/ChangeLog (258557 => 258558)
--- trunk/Tools/ChangeLog 2020-03-17 16:59:32 UTC (rev 258557)
+++ trunk/Tools/ChangeLog 2020-03-17 17:14:43 UTC (rev 258558)
@@ -1,3 +1,16 @@
+2020-03-17 Jacob Uphoff <jacob_uph...@apple.com>
+
+ Unreviewed, reverting r257844.
+
+ this revision caused a test to start timing out
+
+ Reverted changeset:
+
+ "(r256513) [ Mac ] fast/scrolling/programmatic-scroll-to-zero-
+ zero.html is a flaky failure"
+ https://bugs.webkit.org/show_bug.cgi?id=207948
+ https://trac.webkit.org/changeset/257844
+
2020-03-16 Justin Michaud <justin_mich...@apple.com>
Add personal email to Tools/Scripts/webkitpy/common/config/contributors.json
Modified: trunk/Tools/DumpRenderTree/mac/EventSendingController.mm (258557 => 258558)
--- trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2020-03-17 16:59:32 UTC (rev 258557)
+++ trunk/Tools/DumpRenderTree/mac/EventSendingController.mm 2020-03-17 17:14:43 UTC (rev 258558)
@@ -852,8 +852,6 @@
- (void)mouseScrollByX:(int)x andY:(int)y withWheel:(NSString*)phaseName andMomentumPhases:(NSString*)momentumName
{
#if PLATFORM(MAC)
- [[[mainFrame frameView] documentView] layout];
-
uint32_t phase = 0;
if ([phaseName isEqualToString: @"none"])
phase = 0;
Modified: trunk/Tools/DumpRenderTree/win/EventSender.cpp (258557 => 258558)
--- trunk/Tools/DumpRenderTree/win/EventSender.cpp 2020-03-17 16:59:32 UTC (rev 258557)
+++ trunk/Tools/DumpRenderTree/win/EventSender.cpp 2020-03-17 17:14:43 UTC (rev 258558)
@@ -832,10 +832,6 @@
RECT rect;
::GetWindowRect(webViewWindow, &rect);
- COMPtr<IWebFramePrivate> framePrivate;
- if (SUCCEEDED(frame->QueryInterface(&framePrivate)))
- framePrivate->layout();
-
if (x) {
UINT scrollChars = 1;
::SystemParametersInfo(SPI_GETWHEELSCROLLCHARS, 0, &scrollChars, 0);
