Title: [251127] trunk/Source/WebKit
- Revision
- 251127
- Author
- carlo...@webkit.org
- Date
- 2019-10-15 02:11:39 -0700 (Tue, 15 Oct 2019)
Log Message
[GTK][WPE] WebKitWebContext should identify web views by their WebPageProxy identifier
https://bugs.webkit.org/show_bug.cgi?id=202924
Reviewed by Adrian Perez de Castro.
Instead of the WebPage identifier, since it maps WebPageProxy to WebKitWebView.
* UIProcess/API/glib/WebKitWebContext.cpp:
(webkitWebContextCreatePageForWebView):
(webkitWebContextWebViewDestroyed):
(webkitWebContextGetWebViewForPage):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (251126 => 251127)
--- trunk/Source/WebKit/ChangeLog 2019-10-15 08:59:11 UTC (rev 251126)
+++ trunk/Source/WebKit/ChangeLog 2019-10-15 09:11:39 UTC (rev 251127)
@@ -1,3 +1,17 @@
+2019-10-15 Carlos Garcia Campos <cgar...@igalia.com>
+
+ [GTK][WPE] WebKitWebContext should identify web views by their WebPageProxy identifier
+ https://bugs.webkit.org/show_bug.cgi?id=202924
+
+ Reviewed by Adrian Perez de Castro.
+
+ Instead of the WebPage identifier, since it maps WebPageProxy to WebKitWebView.
+
+ * UIProcess/API/glib/WebKitWebContext.cpp:
+ (webkitWebContextCreatePageForWebView):
+ (webkitWebContextWebViewDestroyed):
+ (webkitWebContextGetWebViewForPage):
+
2019-10-15 youenn fablet <you...@apple.com>
Handle service worker loads through NetworkResourceLoader
Modified: trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (251126 => 251127)
--- trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2019-10-15 08:59:11 UTC (rev 251126)
+++ trunk/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2019-10-15 09:11:39 UTC (rev 251127)
@@ -205,7 +205,7 @@
WebKitTLSErrorsPolicy tlsErrorsPolicy;
WebKitProcessModel processModel;
- HashMap<uint64_t, WebKitWebView*> webViews;
+ HashMap<WebPageProxyIdentifier, WebKitWebView*> webViews;
CString webExtensionsDirectory;
GRefPtr<GVariant> webExtensionsInitializationUserData;
@@ -1748,15 +1748,15 @@
page.setURLSchemeHandlerForScheme(WTFMove(handler), it.key);
}
- context->priv->webViews.set(webkit_web_view_get_page_id(webView), webView);
+ context->priv->webViews.set(page.identifier(), webView);
}
void webkitWebContextWebViewDestroyed(WebKitWebContext* context, WebKitWebView* webView)
{
- context->priv->webViews.remove(webkit_web_view_get_page_id(webView));
+ context->priv->webViews.remove(webkitWebViewGetPage(webView).identifier());
}
WebKitWebView* webkitWebContextGetWebViewForPage(WebKitWebContext* context, WebPageProxy* page)
{
- return page ? context->priv->webViews.get(page->webPageID().toUInt64()) : nullptr;
+ return page ? context->priv->webViews.get(page->identifier()) : nullptr;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
