⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 259857 in webkit


Ignore:
Timestamp:
Apr 10, 2020, 3:32:42 AM (6 years ago)
Author:
commit-queue@webkit.org
Message:

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

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r259856 r259857  
     12020-04-10  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r259818.
     4        https://bugs.webkit.org/show_bug.cgi?id=210330
     5
     6        "Causes crashes in at least three layout tests on iOS bots."
     7        (Requested by ddkilzer on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Reset view navigation gesture state between tests"
     12        https://bugs.webkit.org/show_bug.cgi?id=210283
     13        https://trac.webkit.org/changeset/259818
     14
    1152020-04-10  Claudio Saavedra  <csaavedra@igalia.com>
    216

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivateForTesting.h

    r259818 r259857  
    4646- (BOOL)_beginBackSwipeForTesting;
    4747- (BOOL)_completeBackSwipeForTesting;
    48 - (void)_resetNavigationGestureStateForTesting;
    4948- (void)_setDefersLoadingForTesting:(BOOL)defersLoading;
    5049

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm

    r259843 r259857  
    144144}
    145145
    146 - (void)_resetNavigationGestureStateForTesting
    147 {
    148 #if PLATFORM(MAC)
    149     if (auto gestureController = _impl->gestureController())
    150         gestureController->reset();
    151 #else
    152     if (_gestureController)
    153         _gestureController->reset();
    154 #endif
    155 }
    156 
    157146- (void)_setDefersLoadingForTesting:(BOOL)defersLoading
    158147{

  • trunk/Source/WebKit/UIProcess/ViewGestureController.cpp

    r259818 r259857  
    130130void ViewGestureController::willBeginGesture(ViewGestureType type)
    131131{
    132     LOG(ViewGestures, "ViewGestureController::willBeginGesture %d", (int)type);
    133 
    134132    m_activeGestureType = type;
    135133    m_currentGestureID = takeNextGestureID();
    … …  
    138136void ViewGestureController::didEndGesture()
    139137{
    140     LOG(ViewGestures, "ViewGestureController::didEndGesture");
    141 
    142138    m_activeGestureType = ViewGestureType::None;
    143139    m_currentGestureID = 0;
    … …  
    435431bool ViewGestureController::PendingSwipeTracker::handleEvent(PlatformScrollEvent event)
    436432{
    437     LOG(ViewGestures, "PendingSwipeTracker::handleEvent - state %d", (int)m_state);
    438 
    439433    if (scrollEventCanEndSwipe(event)) {
    440434        reset("gesture ended");
    … …  
    443437
    444438    if (m_state == State::None) {
    445         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());
    446 
    447439        if (!scrollEventCanBecomeSwipe(event, m_direction))
    448440            return false;
    … …  
    462454void ViewGestureController::PendingSwipeTracker::eventWasNotHandledByWebCore(PlatformScrollEvent event)
    463455{
    464     LOG(ViewGestures, "Swipe Start Hysteresis - WebCore didn't handle event, state %d", (int)m_state);
    465 
    466456    if (m_state != State::WaitingForWebCore)
    467457        return;
    468458
     459    LOG(ViewGestures, "Swipe Start Hysteresis - WebCore didn't handle event");
    469460    m_state = State::None;
    470461    m_cumulativeDelta = FloatSize();

  • trunk/Source/WebKit/UIProcess/ViewGestureController.h

    r259818 r259857  
    163163
    164164    void removeSwipeSnapshot();
    165     void reset();
    166165
    167166    void setSwipeGestureEnabled(bool enabled) { m_swipeGestureEnabled = enabled; }
    … …  
    186185    void willBeginGesture(ViewGestureType);
    187186    void didEndGesture();
    188     void resetState();
    189187
    190188    void didStartProvisionalOrSameDocumentLoadForMainFrame();

  • trunk/Source/WebKit/UIProcess/ios/ViewGestureControllerIOS.mm

    r259818 r259857  
    419419    }
    420420
    421     resetState();
    422 }
    423 
    424 void ViewGestureController::resetState()
    425 {
    426421    [m_snapshotView removeFromSuperview];
    427422    m_snapshotView = nullptr;
    … …  
    439434}
    440435
    441 void ViewGestureController::reset()
    442 {
    443     removeSwipeSnapshot();
    444     resetState();
    445 }
    446 
    447436bool ViewGestureController::beginSimulatedSwipeInDirectionForTesting(SwipeDirection direction)
    448437{

  • trunk/Source/WebKit/UIProcess/mac/ViewGestureControllerMac.mm

    r259818 r259857  
    610610    }
    611611
    612     resetState();
    613 }
    614 
    615 void ViewGestureController::resetState()
    616 {
    617612    if (m_currentSwipeSnapshot)
    618613        m_currentSwipeSnapshot->setVolatile(true);
    … …  
    643638}
    644639
    645 void ViewGestureController::reset()
    646 {
    647     removeSwipeSnapshot();
    648     resetState();
    649     m_swipeCancellationTracker = nil; // FIXME: Move to reset state()?
    650 }
    651 
    652640double ViewGestureController::magnification() const
    653641{

  • trunk/Tools/ChangeLog

    r259843 r259857  
     12020-04-10  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r259818.
     4        https://bugs.webkit.org/show_bug.cgi?id=210330
     5
     6        "Causes crashes in at least three layout tests on iOS bots."
     7        (Requested by ddkilzer on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Reset view navigation gesture state between tests"
     12        https://bugs.webkit.org/show_bug.cgi?id=210283
     13        https://trac.webkit.org/changeset/259818
     14
    1152020-04-08  Darin Adler  <darin@apple.com>
    216

  • trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm

    r259843 r259857  
    278278        [platformView _setContinuousSpellCheckingEnabledForTesting:options.shouldShowSpellCheckingDots];
    279279        [platformView resetInteractionCallbacks];
    280         [platformView _resetNavigationGestureStateForTesting];
    281280    }
    282281
Note: See TracChangeset for help on using the changeset viewer.