[webkit-changes] [246152] trunk/Source/WebKit

Thu, 06 Jun 2019 06:51:57 -0700

Title: [246152] trunk/Source/WebKit
Revision
246152
Author
[email protected]
Date
2019-06-06 06:51:13 -0700 (Thu, 06 Jun 2019)

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

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (246151 => 246152)


--- trunk/Source/WebKit/ChangeLog	2019-06-06 13:41:21 UTC (rev 246151)
+++ trunk/Source/WebKit/ChangeLog	2019-06-06 13:51:13 UTC (rev 246152)
@@ -1,3 +1,17 @@
+2019-06-06  Michael Catanzaro  <[email protected]>
+
+        [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  <[email protected]>
 
         [GTK][WPE] Enable PSON

Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp (246151 => 246152)


--- trunk/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp	2019-06-06 13:41:21 UTC (rev 246151)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitURISchemeRequest.cpp	2019-06-06 13:51:13 UTC (rev 246152)
@@ -84,8 +84,12 @@
     request->priv->webContext = webContext;
     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;
 }
 
@@ -166,8 +170,7 @@
 {
     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)

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to