Changeset 251907 in webkit

Timestamp:

Oct 31, 2019 9:07:37 PM (5 years ago)

Author:

Chris Dumez

Message:

Take down the gesture snapshot early when the back/forward cache is not leveraged
​https://bugs.webkit.org/show_bug.cgi?id=203713
<rdar://problem/56803910>

Reviewed by Tim Horton.

Take down the gesture snapshot as soon as the gesture is done when the back/forward cache
is not leveraged. Otherwise, the snapshot may stay up for a long time (while we load, parse
and restore scroll position) and it would look to the user as if the view was unresponsive.
Showing the page slowly loading in such cases is less confusing as the user knows what's
going on and is even able to interact with the partially loaded page.

• Shared/WebBackForwardListItem.cpp:

(WebKit::WebBackForwardListItem::hasCachedWebPage const):

• Shared/WebBackForwardListItem.h:
• UIProcess/ViewGestureController.cpp:

(WebKit::ViewGestureController::endSwipeGesture):

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

(WebKit::ViewGestureController::makeSnapshotBlank):
(WebKit::ViewGestureController::endSwipeGesture):

• UIProcess/mac/ViewGestureControllerMac.mm:

(WebKit::ViewGestureController::makeSnapshotBlank):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebBackForwardListItem.cpp (modified) (1 diff)
• Shared/WebBackForwardListItem.h (modified) (1 diff)
• UIProcess/ViewGestureController.cpp (modified) (1 diff)
• UIProcess/ViewGestureController.h (modified) (1 diff)
• UIProcess/gtk/ViewGestureControllerGtk.cpp (modified) (1 diff)
• UIProcess/ios/ViewGestureControllerIOS.mm (modified) (2 diffs)
• UIProcess/mac/ViewGestureControllerMac.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-10-31  Chris Dumez  <cdumez@apple.com>
+
+        Take down the gesture snapshot early when the back/forward cache is not leveraged
+        https://bugs.webkit.org/show_bug.cgi?id=203713
+        <rdar://problem/56803910>
+
+        Reviewed by Tim Horton.
+
+        Take down the gesture snapshot as soon as the gesture is done when the back/forward cache
+        is not leveraged. Otherwise, the snapshot may stay up for a long time (while we load, parse
+        and restore scroll position) and it would look to the user as if the view was unresponsive.
+        Showing the page slowly loading in such cases is less confusing as the user knows what's
+        going on and is even able to interact with the partially loaded page.
+
+        * Shared/WebBackForwardListItem.cpp:
+        (WebKit::WebBackForwardListItem::hasCachedWebPage const):
+        * Shared/WebBackForwardListItem.h:
+        * UIProcess/ViewGestureController.cpp:
+        (WebKit::ViewGestureController::endSwipeGesture):
+        * UIProcess/ViewGestureController.h:
+        * UIProcess/ios/ViewGestureControllerIOS.mm:
+        (WebKit::ViewGestureController::makeSnapshotBlank):
+        (WebKit::ViewGestureController::endSwipeGesture):
+        * UIProcess/mac/ViewGestureControllerMac.mm:
+        (WebKit::ViewGestureController::makeSnapshotBlank):
+
 2019-10-31  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/Shared/WebBackForwardListItem.cpp

@@ -183 +183 @@
 }
 
+bool WebBackForwardListItem::hasCachedWebPage() const
+{
+    if (!m_backForwardCacheEntry)
+        return false;
+    if (!m_backForwardCacheEntry->suspendedPage())
+        return true; // In-process cached page without suspended page proxy.
+    // Make sure the suspended page proxy has an associated WebPage.
+    return !m_backForwardCacheEntry->suspendedPage()->pageIsClosedOrClosing();
+}
+
 #if !LOG_DISABLED
 const char* WebBackForwardListItem::loggingString()

trunk/Source/WebKit/Shared/WebBackForwardListItem.h

@@ -83 +83 @@
     void wasRemovedFromBackForwardList();
 
+    bool hasCachedWebPage() const;
     WebBackForwardCacheEntry* backForwardCacheEntry() const { return m_backForwardCacheEntry.get(); }
     SuspendedPageProxy* suspendedPage() const;

trunk/Source/WebKit/UIProcess/ViewGestureController.cpp

@@ -591 +591 @@
     }
 
-    SnapshotRemovalTracker::Events desiredEvents = SnapshotRemovalTracker::VisuallyNonEmptyLayout
+    SnapshotRemovalTracker::Events desiredEvents;
+    if (targetItem->hasCachedWebPage()) {
+        desiredEvents = SnapshotRemovalTracker::VisuallyNonEmptyLayout
         | SnapshotRemovalTracker::MainFrameLoad
         | SnapshotRemovalTracker::SubresourceLoads
         | SnapshotRemovalTracker::ScrollPositionRestoration;
+    } else {
+        desiredEvents = SnapshotRemovalTracker::VisuallyNonEmptyLayout;
+        makeSnapshotBlank();
+    }
 
     if (renderTreeSizeThreshold) {

trunk/Source/WebKit/UIProcess/ViewGestureController.h

@@ -311 +311 @@
 #endif
 
+    void makeSnapshotBlank();
+
     WebPageProxy& m_webPageProxy;
     ViewGestureType m_activeGestureType { ViewGestureType::None };

trunk/Source/WebKit/UIProcess/gtk/ViewGestureControllerGtk.cpp

@@ -571 +571 @@
 }
 
+void ViewGestureController::makeSnapshotBlank()
+{
+}
+
 } // namespace WebKit

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

@@ -268 +268 @@
 }
 
+void ViewGestureController::makeSnapshotBlank()
+{
+    [m_snapshotView layer].contents = nil;
+}
+
 void ViewGestureController::endSwipeGesture(WebBackForwardListItem* targetItem, _UIViewControllerTransitionContext *context, bool cancelled)
 {
@@ -313 +318 @@
     }
 
+    SnapshotRemovalTracker::Events desiredEvents;
+    if (targetItem->hasCachedWebPage()) {
+        desiredEvents = SnapshotRemovalTracker::RenderTreeSizeThreshold
+            | SnapshotRemovalTracker::RepaintAfterNavigation
+            | SnapshotRemovalTracker::MainFrameLoad
+            | SnapshotRemovalTracker::SubresourceLoads
+            | SnapshotRemovalTracker::ScrollPositionRestoration;
+    } else {
+        desiredEvents = SnapshotRemovalTracker::VisuallyNonEmptyLayout;
+        makeSnapshotBlank();
+    }
+
     // 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] {
+    m_snapshotRemovalTracker.start(desiredEvents, [this] {
             this->removeSwipeSnapshot();
     });

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

@@ -172 +172 @@
     if (event.phase == NSEventPhaseEnded || event.phase == NSEventPhaseCancelled)
         endMagnificationGesture();
+}
+
+void ViewGestureController::makeSnapshotBlank()
+{
+    [m_swipeSnapshotLayer setContents:nil];
 }