Diff
Modified: trunk/Source/WebKit/ChangeLog (259856 => 259857)
--- trunk/Source/WebKit/ChangeLog 2020-04-10 10:31:56 UTC (rev 259856)
+++ trunk/Source/WebKit/ChangeLog 2020-04-10 10:32:42 UTC (rev 259857)
@@ -1,3 +1,17 @@
+2020-04-10 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r259818.
+ https://bugs.webkit.org/show_bug.cgi?id=210330
+
+ "Causes crashes in at least three layout tests on iOS bots."
+ (Requested by ddkilzer on #webkit).
+
+ Reverted changeset:
+
+ "Reset view navigation gesture state between tests"
+ https://bugs.webkit.org/show_bug.cgi?id=210283
+ https://trac.webkit.org/changeset/259818
+
2020-04-10 Claudio Saavedra <[email protected]>
[GTK] Use X11-specific GDK API in Netscape plugin
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h (259856 => 259857)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h 2020-04-10 10:31:56 UTC (rev 259856)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h 2020-04-10 10:32:42 UTC (rev 259857)
@@ -45,7 +45,6 @@
- (BOOL)_beginBackSwipeForTesting;
- (BOOL)_completeBackSwipeForTesting;
-- (void)_resetNavigationGestureStateForTesting;
- (void)_setDefersLoadingForTesting:(BOOL)defersLoading;
- (void)_setShareSheetCompletesImmediatelyWithResolutionForTesting:(BOOL)resolved;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm (259856 => 259857)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm 2020-04-10 10:31:56 UTC (rev 259856)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm 2020-04-10 10:32:42 UTC (rev 259857)
@@ -143,17 +143,6 @@
#endif
}
-- (void)_resetNavigationGestureStateForTesting
-{
-#if PLATFORM(MAC)
- if (auto gestureController = _impl->gestureController())
- gestureController->reset();
-#else
- if (_gestureController)
- _gestureController->reset();
-#endif
-}
-
- (void)_setDefersLoadingForTesting:(BOOL)defersLoading
{
_page->setDefersLoadingForTesting(defersLoading);
Modified: trunk/Source/WebKit/UIProcess/ViewGestureController.cpp (259856 => 259857)
--- trunk/Source/WebKit/UIProcess/ViewGestureController.cpp 2020-04-10 10:31:56 UTC (rev 259856)
+++ trunk/Source/WebKit/UIProcess/ViewGestureController.cpp 2020-04-10 10:32:42 UTC (rev 259857)
@@ -129,8 +129,6 @@
void ViewGestureController::willBeginGesture(ViewGestureType type)
{
- LOG(ViewGestures, "ViewGestureController::willBeginGesture %d", (int)type);
-
m_activeGestureType = type;
m_currentGestureID = takeNextGestureID();
}
@@ -137,8 +135,6 @@
void ViewGestureController::didEndGesture()
{
- LOG(ViewGestures, "ViewGestureController::didEndGesture");
-
m_activeGestureType = ViewGestureType::None;
m_currentGestureID = 0;
}
@@ -434,8 +430,6 @@
bool ViewGestureController::PendingSwipeTracker::handleEvent(PlatformScrollEvent event)
{
- LOG(ViewGestures, "PendingSwipeTracker::handleEvent - state %d", (int)m_state);
-
if (scrollEventCanEndSwipe(event)) {
reset("gesture ended");
return false;
@@ -442,8 +436,6 @@
}
if (m_state == State::None) {
- LOG(ViewGestures, "PendingSwipeTracker::handleEvent - scroll can become swipe %d shouldIgnorePinnedState %d, page will handle scrolls %d", scrollEventCanBecomeSwipe(event, m_direction), m_shouldIgnorePinnedState, m_webPageProxy.willHandleHorizontalScrollEvents());
-
if (!scrollEventCanBecomeSwipe(event, m_direction))
return false;
@@ -461,11 +453,10 @@
void ViewGestureController::PendingSwipeTracker::eventWasNotHandledByWebCore(PlatformScrollEvent event)
{
- LOG(ViewGestures, "Swipe Start Hysteresis - WebCore didn't handle event, state %d", (int)m_state);
-
if (m_state != State::WaitingForWebCore)
return;
+ LOG(ViewGestures, "Swipe Start Hysteresis - WebCore didn't handle event");
m_state = State::None;
m_cumulativeDelta = FloatSize();
tryToStartSwipe(event);
Modified: trunk/Source/WebKit/UIProcess/ViewGestureController.h (259856 => 259857)
--- trunk/Source/WebKit/UIProcess/ViewGestureController.h 2020-04-10 10:31:56 UTC (rev 259856)
+++ trunk/Source/WebKit/UIProcess/ViewGestureController.h 2020-04-10 10:32:42 UTC (rev 259857)
@@ -162,7 +162,6 @@
void checkForActiveLoads();
void removeSwipeSnapshot();
- void reset();
void setSwipeGestureEnabled(bool enabled) { m_swipeGestureEnabled = enabled; }
bool isSwipeGestureEnabled() { return m_swipeGestureEnabled; }
@@ -185,7 +184,6 @@
static GestureID takeNextGestureID();
void willBeginGesture(ViewGestureType);
void didEndGesture();
- void resetState();
void didStartProvisionalOrSameDocumentLoadForMainFrame();
Modified: trunk/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm (259856 => 259857)
--- trunk/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm 2020-04-10 10:31:56 UTC (rev 259856)
+++ trunk/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm 2020-04-10 10:32:42 UTC (rev 259857)
@@ -418,11 +418,6 @@
return;
}
- resetState();
-}
-
-void ViewGestureController::resetState()
-{
[m_snapshotView removeFromSuperview];
m_snapshotView = nullptr;
@@ -438,12 +433,6 @@
didEndGesture();
}
-void ViewGestureController::reset()
-{
- removeSwipeSnapshot();
- resetState();
-}
-
bool ViewGestureController::beginSimulatedSwipeInDirectionForTesting(SwipeDirection direction)
{
if (!canSwipeInDirection(direction))
Modified: trunk/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm (259856 => 259857)
--- trunk/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm 2020-04-10 10:31:56 UTC (rev 259856)
+++ trunk/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm 2020-04-10 10:32:42 UTC (rev 259857)
@@ -609,11 +609,6 @@
return;
}
- resetState();
-}
-
-void ViewGestureController::resetState()
-{
if (m_currentSwipeSnapshot)
m_currentSwipeSnapshot->setVolatile(true);
m_currentSwipeSnapshot = nullptr;
@@ -642,13 +637,6 @@
didEndGesture();
}
-void ViewGestureController::reset()
-{
- removeSwipeSnapshot();
- resetState();
- m_swipeCancellationTracker = nil; // FIXME: Move to reset state()?
-}
-
double ViewGestureController::magnification() const
{
if (m_activeGestureType == ViewGestureType::Magnification)
Modified: trunk/Tools/ChangeLog (259856 => 259857)
--- trunk/Tools/ChangeLog 2020-04-10 10:31:56 UTC (rev 259856)
+++ trunk/Tools/ChangeLog 2020-04-10 10:32:42 UTC (rev 259857)
@@ -1,3 +1,17 @@
+2020-04-10 Commit Queue <[email protected]>
+
+ Unreviewed, reverting r259818.
+ https://bugs.webkit.org/show_bug.cgi?id=210330
+
+ "Causes crashes in at least three layout tests on iOS bots."
+ (Requested by ddkilzer on #webkit).
+
+ Reverted changeset:
+
+ "Reset view navigation gesture state between tests"
+ https://bugs.webkit.org/show_bug.cgi?id=210283
+ https://trac.webkit.org/changeset/259818
+
2020-04-08 Darin Adler <[email protected]>
[Cocoa] Simplify NSArray, NSDictionary, and NSNumber idioms throughout WebKit
Modified: trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm (259856 => 259857)
--- trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2020-04-10 10:31:56 UTC (rev 259856)
+++ trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm 2020-04-10 10:32:42 UTC (rev 259857)
@@ -277,7 +277,6 @@
platformView._minimumEffectiveDeviceWidth = 0;
[platformView _setContinuousSpellCheckingEnabledForTesting:options.shouldShowSpellCheckingDots];
[platformView resetInteractionCallbacks];
- [platformView _resetNavigationGestureStateForTesting];
}
[globalWebsiteDataStoreDelegateClient setAllowRaisingQuota:YES];
