Changeset 253394 in webkit

Timestamp:

Dec 11, 2019, 2:04:16 PM (7 years ago)

Author:

Chris Dumez

Message:

[iOS] Issue load sooner on swipe back/forward navigation
​https://bugs.webkit.org/show_bug.cgi?id=205127
<rdar://problem/57843862>

Reviewed by Tim Horton.

Issue load sooner on swipe back/forward navigation on iOS. We were waiting until the end of
the swipe animation to issue the load. We now issue the load as soon as the user lifts the finger
off the screen and thus commits to navigating. This results in improved perceived performance
when swiping back/forward to navigate.

• UIProcess/ViewGestureController.cpp:

(WebKit::ViewGestureController::didStartProvisionalOrSameDocumentLoadForMainFrame):
(WebKit::ViewGestureController::willEndSwipeGesture):

• UIProcess/ViewGestureController.h:
• UIProcess/ios/ViewGestureControllerIOS.mm:

(WebKit::ViewGestureController::beginSwipeGesture):
(WebKit::ViewGestureController::willEndSwipeGesture):
(WebKit::ViewGestureController::endSwipeGesture):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ViewGestureController.cpp (modified) (2 diffs)
• UIProcess/ViewGestureController.h (modified) (2 diffs)
• UIProcess/ios/ViewGestureControllerIOS.mm (modified) (5 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-12-11  Chris Dumez  <cdumez@apple.com>
+
+        [iOS] Issue load sooner on swipe back/forward navigation
+        https://bugs.webkit.org/show_bug.cgi?id=205127
+        <rdar://problem/57843862>
+
+        Reviewed by Tim Horton.
+
+        Issue load sooner on swipe back/forward navigation on iOS. We were waiting until the end of
+        the swipe animation to issue the load. We now issue the load as soon as the user lifts the finger
+        off the screen and thus commits to navigating. This results in improved perceived performance
+        when swiping back/forward to navigate.
+
+        * UIProcess/ViewGestureController.cpp:
+        (WebKit::ViewGestureController::didStartProvisionalOrSameDocumentLoadForMainFrame):
+        (WebKit::ViewGestureController::willEndSwipeGesture):
+        * UIProcess/ViewGestureController.h:
+        * UIProcess/ios/ViewGestureControllerIOS.mm:
+        (WebKit::ViewGestureController::beginSwipeGesture):
+        (WebKit::ViewGestureController::willEndSwipeGesture):
+        (WebKit::ViewGestureController::endSwipeGesture):
+
 2019-12-11  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebKit/UIProcess/ViewGestureController.cpp

@@ -164 +164 @@
 void ViewGestureController::didStartProvisionalOrSameDocumentLoadForMainFrame()
 {
+    m_didStartProvisionalLoad = true;
     m_snapshotRemovalTracker.resume();
 #if !PLATFORM(IOS_FAMILY)
@@ -566 +567 @@
     auto renderTreeSizeThreshold = renderTreeSize * swipeSnapshotRemovalRenderTreeSizeTargetFraction;
 
+    m_didStartProvisionalLoad = false;
     m_webPageProxy.goToBackForwardItem(targetItem);
 

trunk/Source/WebKit/UIProcess/ViewGestureController.h

@@ -138 +138 @@
     void installSwipeHandler(UIView *gestureRecognizerView, UIView *swipingView);
     void beginSwipeGesture(_UINavigationInteractiveTransitionBase *, SwipeDirection);
+    void willEndSwipeGesture(WebBackForwardListItem& targetItem, bool cancelled);
     void endSwipeGesture(WebBackForwardListItem* targetItem, _UIViewControllerTransitionContext *, bool cancelled);
     void willCommitPostSwipeTransitionLayerTree(bool);
@@ -431 +432 @@
 
     bool m_isConnectedToProcess { false };
+    bool m_didStartProvisionalLoad { false };
 
     SnapshotRemovalTracker m_snapshotRemovalTracker;

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

@@ -260 +260 @@
     [m_swipeTransitionContext _setInteractiveUpdateHandler:^(BOOL finish, CGFloat percent, BOOL transitionCompleted, _UIViewControllerTransitionContext *) {
         if (finish)
-            m_webPageProxyForBackForwardListForCurrentSwipe->navigationGestureWillEnd(transitionCompleted, *targetItem);
+            willEndSwipeGesture(*targetItem, !transitionCompleted);
     }];
     auto pageID = m_webPageProxy.identifier();
@@ -271 +271 @@
     [transition setAnimationController:animationController.get()];
     [transition startInteractiveTransition:m_swipeTransitionContext.get()];
+}
+
+void ViewGestureController::willEndSwipeGesture(WebBackForwardListItem& targetItem, bool cancelled)
+{
+    m_webPageProxyForBackForwardListForCurrentSwipe->navigationGestureWillEnd(!cancelled, targetItem);
+
+    if (cancelled)
+        return;
+
+    m_snapshotRemovalTargetRenderTreeSize = 0;
+    if (ViewSnapshot* snapshot = targetItem.snapshot())
+        m_snapshotRemovalTargetRenderTreeSize = snapshot->renderTreeSize() * swipeSnapshotRemovalRenderTreeSizeTargetFraction;
+
+    m_didStartProvisionalLoad = false;
+    m_webPageProxyForBackForwardListForCurrentSwipe->goToBackForwardItem(targetItem);
+
+    auto* currentItem = m_webPageProxyForBackForwardListForCurrentSwipe->backForwardList().currentItem();
+    // The main frame will not be navigated so hide the snapshot right away.
+    if (currentItem && currentItem->itemIsClone(targetItem)) {
+        removeSwipeSnapshot();
+        return;
+    }
+
+    // FIXME: Should we wait for VisuallyNonEmptyLayout like we do on Mac?
+    m_snapshotRemovalTracker.start(SnapshotRemovalTracker::RenderTreeSizeThreshold
+        | SnapshotRemovalTracker::RepaintAfterNavigation
+        | SnapshotRemovalTracker::MainFrameLoad
+        | SnapshotRemovalTracker::SubresourceLoads
+        | SnapshotRemovalTracker::ScrollPositionRestoration
+        | SnapshotRemovalTracker::SwipeAnimationEnd, [this] {
+        this->removeSwipeSnapshot();
+    });
+
+    if (ViewSnapshot* snapshot = targetItem.snapshot()) {
+        m_backgroundColorForCurrentSnapshot = snapshot->backgroundColor();
+        m_webPageProxy.didChangeBackgroundColor();
+    }
 }
 
@@ -296 +333 @@
     }
 
-    m_snapshotRemovalTargetRenderTreeSize = 0;
-    if (ViewSnapshot* snapshot = targetItem->snapshot())
-        m_snapshotRemovalTargetRenderTreeSize = snapshot->renderTreeSize() * swipeSnapshotRemovalRenderTreeSizeTargetFraction;
+    m_snapshotRemovalTracker.eventOccurred(SnapshotRemovalTracker::SwipeAnimationEnd);
 
     m_webPageProxyForBackForwardListForCurrentSwipe->navigationGestureDidEnd(true, *targetItem);
@@ -304 +339 @@
         m_webPageProxy.navigationGestureDidEnd();
 
-    m_webPageProxyForBackForwardListForCurrentSwipe->goToBackForwardItem(*targetItem);
-
-    if (!m_webPageProxy.drawingArea()) {
+    if (!m_webPageProxy.provisionalDrawingArea()) {
         removeSwipeSnapshot();
         return;
-    }
-
-    auto* currentItem = m_webPageProxyForBackForwardListForCurrentSwipe->backForwardList().currentItem();
-    // The main frame will not be navigated so hide the snapshot right away.
-    if (currentItem && currentItem->itemIsClone(*targetItem)) {
-        removeSwipeSnapshot();
-        return;
-    }
-
-    // FIXME: Should we wait for VisuallyNonEmptyLayout like we do on Mac?
-    m_snapshotRemovalTracker.start(SnapshotRemovalTracker::RenderTreeSizeThreshold
-        | SnapshotRemovalTracker::RepaintAfterNavigation
-        | SnapshotRemovalTracker::MainFrameLoad
-        | SnapshotRemovalTracker::SubresourceLoads
-        | SnapshotRemovalTracker::ScrollPositionRestoration, [this] {
-            this->removeSwipeSnapshot();
-    });
-
-    if (ViewSnapshot* snapshot = targetItem->snapshot()) {
-        m_backgroundColorForCurrentSnapshot = snapshot->backgroundColor();
-        m_webPageProxy.didChangeBackgroundColor();
     }
 
     auto pageID = m_webPageProxy.identifier();
     GestureID gestureID = m_currentGestureID;
-    m_loadCallback = [this, pageID, gestureID] {
-        auto drawingArea = m_webPageProxy.provisionalDrawingArea();
+
+    auto doAfterLoadStart = [this, pageID, gestureID] {
+        auto* drawingArea = m_webPageProxy.provisionalDrawingArea();
         if (!drawingArea) {
             removeSwipeSnapshot();
@@ -347 +360 @@
         drawingArea->hideContentUntilPendingUpdate();
     };
+
+    if (m_didStartProvisionalLoad)
+        doAfterLoadStart();
+    else
+        m_loadCallback = WTFMove(doAfterLoadStart);
 }