Changeset 244648 in webkit

Timestamp:

Apr 25, 2019 9:58:09 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Back/forward gesture snapshot always times out
​https://bugs.webkit.org/show_bug.cgi?id=197233

Patch by Alexander Mikhaylenko <​exalm7659@gmail.com> on 2019-04-25
Reviewed by Michael Catanzaro.

Delaying web process launch caused a regression where we create ViewGestureController when the
web process doesn't yet exist. The controller immediately tries to connect to it and fails,
and because of that never receives DidHitRenderTreeSizeThreshold() message, so navigation
snapshot always stays until timeout after performing the gesture.

To prevent this, create the controller in webkitWebViewBaseDidRelaunchWebProcess() instead of
webkitWebViewBaseCreateWebPage(). Additionally, since settings are now created earlier than
ViewGestureController, store the value of whether swipe gesture is enabled in WebKitWebViewBase
and immediately apply it when creating the controller.

• UIProcess/API/glib/WebKitWebView.cpp:

(enableBackForwardNavigationGesturesChanged):
Move the logic into webkitWebViewBaseSetEnableBackForwardNavigationGesture().

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseSetEnableBackForwardNavigationGesture): Added. In addition to what was in
WebKitWebViewBase::enableBackForwardNavigationGesturesChanged(), store the value in a field
for the case ViewGestureController doesn't exist yet.
(webkitWebViewBaseCreateWebPage): Stop creating ViewGestureController.
(webkitWebViewBaseDidRelaunchWebProcess): Move creating ViewGestureController here. Also
immediately call setSwipeGestureEnabled() with the stored value.

• UIProcess/API/gtk/WebKitWebViewBasePrivate.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/glib/WebKitWebView.cpp (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (5 diffs)
• UIProcess/API/gtk/WebKitWebViewBasePrivate.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-25  Alexander Mikhaylenko  <exalm7659@gmail.com>
+
+        [GTK] Back/forward gesture snapshot always times out
+        https://bugs.webkit.org/show_bug.cgi?id=197233
+
+        Reviewed by Michael Catanzaro.
+
+        Delaying web process launch caused a regression where we create ViewGestureController when the
+        web process doesn't yet exist. The controller immediately tries to connect to it and fails,
+        and because of that never receives DidHitRenderTreeSizeThreshold() message, so navigation
+        snapshot always stays until timeout after performing the gesture.
+
+        To prevent this, create the controller in webkitWebViewBaseDidRelaunchWebProcess() instead of
+        webkitWebViewBaseCreateWebPage(). Additionally, since settings are now created earlier than
+        ViewGestureController, store the value of whether swipe gesture is enabled in WebKitWebViewBase
+        and immediately apply it when creating the controller.
+
+        * UIProcess/API/glib/WebKitWebView.cpp:
+        (enableBackForwardNavigationGesturesChanged):
+        Move the logic into webkitWebViewBaseSetEnableBackForwardNavigationGesture().
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseSetEnableBackForwardNavigationGesture): Added. In addition to what was in
+        WebKitWebViewBase::enableBackForwardNavigationGesturesChanged(), store the value in a field
+        for the case ViewGestureController doesn't exist yet.
+        (webkitWebViewBaseCreateWebPage): Stop creating ViewGestureController.
+        (webkitWebViewBaseDidRelaunchWebProcess): Move creating ViewGestureController here. Also
+        immediately call setSwipeGestureEnabled() with the stored value.
+        * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
+
 2019-04-25  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp

@@ -515 +515 @@
 {
     gboolean enable = webkit_settings_get_enable_back_forward_navigation_gestures(settings);
-
-    ViewGestureController& controller = webkitWebViewBaseViewGestureController(WEBKIT_WEB_VIEW_BASE(webView));
-    controller.setSwipeGestureEnabled(enable);
-
-    getPage(webView).setShouldRecordNavigationSnapshots(enable);
+    webkitWebViewBaseSetEnableBackForwardNavigationGesture(WEBKIT_WEB_VIEW_BASE(webView), enable);
 }
 

trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -207 +207 @@
 #endif
     std::unique_ptr<ViewGestureController> viewGestureController;
+    bool isBackForwardNavigationGestureEnabled { false };
 };
 
@@ -1190 +1191 @@
 #endif
 
+void webkitWebViewBaseSetEnableBackForwardNavigationGesture(WebKitWebViewBase* webViewBase, bool enabled)
+{
+    WebKitWebViewBasePrivate* priv = webViewBase->priv;
+
+    priv->isBackForwardNavigationGestureEnabled = enabled;
+
+    if (priv->pageProxy->hasRunningProcess())
+        webViewBase->priv->viewGestureController->setSwipeGestureEnabled(enabled);
+
+    priv->pageProxy->setShouldRecordNavigationSnapshots(enabled);
+}
+
 ViewGestureController& webkitWebViewBaseViewGestureController(WebKitWebViewBase* webViewBase)
 {
@@ -1421 +1434 @@
     g_signal_connect(webkitWebViewBase, "notify::scale-factor", G_CALLBACK(deviceScaleFactorChanged), nullptr);
 #endif
-
-    priv->viewGestureController = std::make_unique<WebKit::ViewGestureController>(*priv->pageProxy);
 }
 
@@ -1640 +1651 @@
     gtk_widget_queue_resize_no_redraw(GTK_WIDGET(webkitWebViewBase));
 
+    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
+
 #if PLATFORM(X11) && USE(TEXTURE_MAPPER_GL) && !USE(REDIRECTED_XCOMPOSITE_WINDOW)
     if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
         return;
 
-    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
     auto* drawingArea = static_cast<DrawingAreaProxyCoordinatedGraphics*>(priv->pageProxy->drawingArea());
     ASSERT(drawingArea);
@@ -1656 +1668 @@
     UNUSED_PARAM(webkitWebViewBase);
 #endif
+
+    priv->viewGestureController = std::make_unique<WebKit::ViewGestureController>(*priv->pageProxy);
+    priv->viewGestureController->setSwipeGestureEnabled(priv->isBackForwardNavigationGestureEnabled);
 }
 

trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h

@@ -85 +85 @@
 RefPtr<WebKit::ViewSnapshot> webkitWebViewBaseTakeViewSnapshot(WebKitWebViewBase*);
 
+void webkitWebViewBaseSetEnableBackForwardNavigationGesture(WebKitWebViewBase*, bool enabled);
 WebKit::ViewGestureController& webkitWebViewBaseViewGestureController(WebKitWebViewBase*);