Changeset 246152 in webkit

Timestamp:

Jun 6, 2019 6:51:13 AM (5 years ago)

Author:

Michael Catanzaro

Message:

[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 Carlos Garcia Campos.

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):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/glib/WebKitURISchemeRequest.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-06-06  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 Carlos Garcia Campos.
+
+        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-06  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -85 +85 @@
     request->priv->manager = &manager;
     request->priv->uri = resourceRequest.url().string().utf8();
+    request->priv->requestID = requestID;
+
+    ASSERT(resourceRequest.initiatingPageID());
     request->priv->initiatingPage = WebProcessProxy::webPage(*resourceRequest.initiatingPageID());
-    request->priv->requestID = requestID;
+    ASSERT(request->priv->initiatingPage);
+
     return request;
 }
@@ -167 +171 @@
     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());
 }