Attachment 368450 Details for Bug 197363 – ROLLOUT of r244648

[patch] ROLLOUT of r244648

bug-197363-20190429052114.patch (text/plain), 5.67 KB, created by WebKit Commit Bot on 2019-04-29 05:21:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: WebKit Commit Bot

Created: 2019-04-29 05:21:14 PDT

Size: 5.67 KB

patch

obsolete

>Subversion Revision: 244731
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index d66faca1bbc5a977a5dd754edcb64eaa685bce0f..17580430691d9fbd10fd7fe8f4361bd7bf5de868 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+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>
> 
>         [WPE][GTK] window-object-cleared documentation should reference webkit_frame_get_js_context_for_script_world()
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
>index 887f7b31c0e6d3aed12fc103d490ea5ea0b37973..af10d684c1d03b5d684c0b1bde96a84dd7ba17e0 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitWebView.cpp
>@@ -514,7 +514,11 @@ static void userAgentChanged(WebKitSettings* settings, GParamSpec*, WebKitWebVie
> static void enableBackForwardNavigationGesturesChanged(WebKitSettings* settings, GParamSpec*, WebKitWebView* webView)
> {
>     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);
> }
> 
> static void webkitWebViewUpdateFavicon(WebKitWebView* webView, cairo_surface_t* favicon)
>diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
>index 5e6f6f6b8b87f5d5f0ecde1762495ea15201f13f..816f0fa769f2bed40068bf6e75b17e91bfac7593 100644
>--- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
>+++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
>@@ -206,7 +206,6 @@ struct _WebKitWebViewBasePrivate {
>     std::unique_ptr<GestureController> gestureController;
> #endif
>     std::unique_ptr<ViewGestureController> viewGestureController;
>-    bool isBackForwardNavigationGestureEnabled { false };
> };
> 
> WEBKIT_DEFINE_TYPE(WebKitWebViewBase, webkit_web_view_base, GTK_TYPE_CONTAINER)
>@@ -1190,18 +1189,6 @@ GestureController& webkitWebViewBaseGestureController(WebKitWebViewBase* webView
> }
> #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)
> {
>     return *webViewBase->priv->viewGestureController;
>@@ -1433,6 +1420,8 @@ void webkitWebViewBaseCreateWebPage(WebKitWebViewBase* webkitWebViewBase, Ref<AP
>     priv->pageProxy->setIntrinsicDeviceScaleFactor(gtk_widget_get_scale_factor(GTK_WIDGET(webkitWebViewBase)));
>     g_signal_connect(webkitWebViewBase, "notify::scale-factor", G_CALLBACK(deviceScaleFactorChanged), nullptr);
> #endif
>+
>+    priv->viewGestureController = std::make_unique<WebKit::ViewGestureController>(*priv->pageProxy);
> }
> 
> void webkitWebViewBaseSetTooltipText(WebKitWebViewBase* webViewBase, const char* tooltip)
>@@ -1650,12 +1639,11 @@ void webkitWebViewBaseDidRelaunchWebProcess(WebKitWebViewBase* webkitWebViewBase
>     // Queue a resize to ensure the new DrawingAreaProxy is resized.
>     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);
> 
>@@ -1667,9 +1655,6 @@ void webkitWebViewBaseDidRelaunchWebProcess(WebKitWebViewBase* webkitWebViewBase
> #else
>     UNUSED_PARAM(webkitWebViewBase);
> #endif
>-
>-    priv->viewGestureController = std::make_unique<WebKit::ViewGestureController>(*priv->pageProxy);
>-    priv->viewGestureController->setSwipeGestureEnabled(priv->isBackForwardNavigationGestureEnabled);
> }
> 
> void webkitWebViewBasePageClosed(WebKitWebViewBase* webkitWebViewBase)
>diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
>index 10df80bd74baf4e070c9c0016d107fb9ecbed758..1360285bfa236b4c35c7444f259e1698f4a0451f 100644
>--- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
>+++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBasePrivate.h
>@@ -84,7 +84,6 @@ WebKit::GestureController& webkitWebViewBaseGestureController(WebKitWebViewBase*
> 
> RefPtr<WebKit::ViewSnapshot> webkitWebViewBaseTakeViewSnapshot(WebKitWebViewBase*);
> 
>-void webkitWebViewBaseSetEnableBackForwardNavigationGesture(WebKitWebViewBase*, bool enabled);
> WebKit::ViewGestureController& webkitWebViewBaseViewGestureController(WebKitWebViewBase*);
> 
> void webkitWebViewBaseDidStartProvisionalLoadForMainFrame(WebKitWebViewBase*);

Actions: View | Formatted Diff | Diff

Attachments on bug 197363: 368450