Attachment 369266 Details for Bug 197653 – Patch

[patch] Patch

wk2-gesture-crash.diff (text/plain), 1.59 KB, created by Carlos Garcia Campos on 2019-05-07 02:57:20 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2019-05-07 02:57:20 PDT

Size: 1.59 KB

patch

obsolete

>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index c3aa76e2105..4525f275912 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-05-07  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>+        [GTK] Crash in webkitWebViewBaseSetEnableBackForwardNavigationGesture
>+        https://bugs.webkit.org/show_bug.cgi?id=197653
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We still need to null-check the ViewGestureController there, since it can be called with a running process but
>+        not yet attached when using a related view.
>+
>+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
>+        (webkitWebViewBaseSetEnableBackForwardNavigationGesture):
>+
> 2019-05-04  Alex Christensen  <achristensen@webkit.org>
> 
>         Revert r244953 and r244954 because they broke internal builds.
>diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
>index 19a90b8d8f0..dea7771ca65 100644
>--- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
>+++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
>@@ -1197,8 +1197,8 @@ void webkitWebViewBaseSetEnableBackForwardNavigationGesture(WebKitWebViewBase* w
> 
>     priv->isBackForwardNavigationGestureEnabled = enabled;
> 
>-    if (priv->pageProxy->hasRunningProcess())
>-        webViewBase->priv->viewGestureController->setSwipeGestureEnabled(enabled);
>+    if (auto* controller = webkitWebViewBaseViewGestureController(webViewBase))
>+        controller->setSwipeGestureEnabled(enabled);
> 
>     priv->pageProxy->setShouldRecordNavigationSnapshots(enabled);
> }

Flags:

zan: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 197653: 369266