Changeset 238818 in webkit

Timestamp:

Dec 3, 2018 1:41:29 PM (5 years ago)

Author:

timothy_horton@apple.com

Message:

Swipe snapshot stays up too long swiping around on apple.com (waiting for first paint)
​https://bugs.webkit.org/show_bug.cgi?id=192319
<rdar://problem/45928708>

Reviewed by Simon Fraser.

• UIProcess/Cocoa/ViewGestureController.cpp:

(WebKit::ViewGestureController::didStartProvisionalLoadForMainFrame):

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

(WebKit::ViewGestureController::endSwipeGesture):
In r236966, I reverted slightly too much of r232416.
We still need to defer requesting a presentation update callback until
after the provisional load starts. Otherwise, we could get the callback
while we're in the 'paused' state, and drop it on the floor. That would
then mean that we time out instead of promptly removing the snapshot.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-03  Tim Horton  <timothy_horton@apple.com>
+
+        Swipe snapshot stays up too long swiping around on apple.com (waiting for first paint)
+        https://bugs.webkit.org/show_bug.cgi?id=192319
+        <rdar://problem/45928708>
+
+        Reviewed by Simon Fraser.
+
+        * UIProcess/Cocoa/ViewGestureController.cpp:
+        (WebKit::ViewGestureController::didStartProvisionalLoadForMainFrame):
+        * UIProcess/Cocoa/ViewGestureController.h:
+        * UIProcess/ios/ViewGestureControllerIOS.mm:
+        (WebKit::ViewGestureController::endSwipeGesture):
+        In r236966, I reverted slightly too much of r232416.
+        We still need to defer requesting a presentation update callback until
+        after the provisional load starts. Otherwise, we could get the callback
+        while we're in the 'paused' state, and drop it on the floor. That would
+        then mean that we time out instead of promptly removing the snapshot.
+
 2018-12-03  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -149 +149 @@
 {
     m_snapshotRemovalTracker.resume();
+
+    if (auto provisionalLoadCallback = WTFMove(m_provisionalLoadCallback))
+        provisionalLoadCallback();
 }
 

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

@@ -313 +313 @@
 
     SnapshotRemovalTracker m_snapshotRemovalTracker;
+    WTF::Function<void()> m_provisionalLoadCallback;
 };
 

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

@@ -301 +301 @@
     }
 
-    if (auto drawingArea = m_webPageProxy.drawingArea()) {
-        uint64_t pageID = m_webPageProxy.pageID();
-        GestureID gestureID = m_currentGestureID;
-        drawingArea->dispatchAfterEnsuringDrawing([pageID, gestureID] (CallbackBase::Error error) {
-            if (auto gestureController = controllerForGesture(pageID, gestureID))
-                gestureController->willCommitPostSwipeTransitionLayerTree(error == CallbackBase::Error::None);
-        });
-        drawingArea->hideContentUntilPendingUpdate();
-    } else {
-        removeSwipeSnapshot();
-        return;
-    }
-
     // FIXME: Should we wait for VisuallyNonEmptyLayout like we do on Mac?
     m_snapshotRemovalTracker.start(SnapshotRemovalTracker::RenderTreeSizeThreshold
@@ -327 +314 @@
         m_webPageProxy.didChangeBackgroundColor();
     }
+
+    uint64_t pageID = m_webPageProxy.pageID();
+    GestureID gestureID = m_currentGestureID;
+    m_provisionalLoadCallback = [this, pageID, gestureID] {
+        auto drawingArea = m_webPageProxy.drawingArea();
+        if (!drawingArea) {
+            removeSwipeSnapshot();
+            return;
+        }
+
+        drawingArea->dispatchAfterEnsuringDrawing([pageID, gestureID] (CallbackBase::Error error) {
+            if (auto gestureController = controllerForGesture(pageID, gestureID))
+                gestureController->willCommitPostSwipeTransitionLayerTree(error == CallbackBase::Error::None);
+        });
+        drawingArea->hideContentUntilPendingUpdate();
+    };
 }