Attachment 371394 Details for Bug 198564 – Patch

[patch] Patch

bug-198564-20190605095240.patch (text/plain), 2.53 KB, created by Michael Catanzaro on 2019-06-05 07:52:41 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2019-06-05 07:52:41 PDT

Size: 2.53 KB

patch

obsolete

>Subversion Revision: 246104
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 44eb77faa2af8f6503fd71d505b73fc2a51776a7..2436e45ae5abc9f8066a479538e9cd4aa4a8bb72 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-06-05  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [WPE][GTK] Clean up use of initiatingPageID in implementation of webkit_uri_scheme_request_get_web_view()
>+        https://bugs.webkit.org/show_bug.cgi?id=198564
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Note that we have to use RefPtr rather than Ref here because the priv struct has to remain
>+        default-constructible.
>+
>+        * UIProcess/API/glib/WebKitURISchemeRequest.cpp:
>+        (webkitURISchemeRequestCreate):
>+        (webkit_uri_scheme_request_get_web_view):
>+
> 2019-06-01  Antoine Quint  <graouts@apple.com>
> 
>         [Pointer Events] Add support for chorded button interactions
>diff --git a/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp b/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp
>index debb8ee6e45a18fbb199f856b02593063bafcc97..54a240524b90e3be084cc59d2c52a6207a659b6a 100644
>--- a/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp
>+++ b/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp
>@@ -84,8 +84,12 @@ WebKitURISchemeRequest* webkitURISchemeRequestCreate(uint64_t requestID, WebKitW
>     request->priv->webContext = webContext;
>     request->priv->manager = &manager;
>     request->priv->uri = resourceRequest.url().string().utf8();
>-    request->priv->initiatingPage = WebProcessProxy::webPage(*resourceRequest.initiatingPageID());
>     request->priv->requestID = requestID;
>+
>+    ASSERT(resourceRequest.initiatingPageID());
>+    request->priv->initiatingPage = WebProcessProxy::webPage(*resourceRequest.initiatingPageID());
>+    ASSERT(request->priv->initiatingPage);
>+
>     return request;
> }
> 
>@@ -166,8 +170,7 @@ WebKitWebView* webkit_uri_scheme_request_get_web_view(WebKitURISchemeRequest* re
> {
>     g_return_val_if_fail(WEBKIT_IS_URI_SCHEME_REQUEST(request), 0);
> 
>-    // FIXME: initiatingPage is now always null, we need to re-implement this somehow.
>-    return request->priv->initiatingPage ? webkitWebContextGetWebViewForPage(request->priv->webContext, request->priv->initiatingPage.get()) : nullptr;
>+    return webkitWebContextGetWebViewForPage(request->priv->webContext, request->priv->initiatingPage.get());
> }
> 
> static void webkitURISchemeRequestReadCallback(GInputStream* inputStream, GAsyncResult* result, WebKitURISchemeRequest* schemeRequest)

Actions: View | Formatted Diff | Diff

Attachments on bug 198564: 371394