Changeset 244732 in webkit

Timestamp:

Apr 29, 2019 5:24:02 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r244648.
​https://bugs.webkit.org/show_bug.cgi?id=197363

Lots of tests are crashing (Requested by KaL on #webkit).

Reverted changeset:

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

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-29  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r244648.
+        https://bugs.webkit.org/show_bug.cgi?id=197363
+
+         Lots of tests  are crashing (Requested by KaL on #webkit).
+
+        Reverted changeset:
+
+        "[GTK] Back/forward gesture snapshot always times out"
+        https://bugs.webkit.org/show_bug.cgi?id=197233
+        https://trac.webkit.org/changeset/244648
+
 2019-04-29  Michael Catanzaro  <mcatanzaro@igalia.com>
 

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

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

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

@@ -207 +207 @@
 #endif
     std::unique_ptr<ViewGestureController> viewGestureController;
-    bool isBackForwardNavigationGestureEnabled { false };
 };
 
@@ -1191 +1190 @@
 #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)
 {
@@ -1434 +1421 @@
     g_signal_connect(webkitWebViewBase, "notify::scale-factor", G_CALLBACK(deviceScaleFactorChanged), nullptr);
 #endif
+
+    priv->viewGestureController = std::make_unique<WebKit::ViewGestureController>(*priv->pageProxy);
 }
 
@@ -1651 +1640 @@
     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);
@@ -1668 +1656 @@
     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*);