WebKit
diff --git a/‎Source/WebKit/PlatformGTK.cmake‎
Lines changed: 6 additions & 0 deletions b/‎Source/WebKit/PlatformGTK.cmake‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎Source/WebKit/PlatformWPE.cmake‎
Lines changed: 6 additions & 0 deletions b/‎Source/WebKit/PlatformWPE.cmake‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎Source/WebKit/SourcesGTK.txt‎
Lines changed: 1 addition & 0 deletions b/‎Source/WebKit/SourcesGTK.txt‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Source/WebKit/SourcesWPE.txt‎
Lines changed: 1 addition & 0 deletions b/‎Source/WebKit/SourcesWPE.txt‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Source/WebKit/UIProcess/API/glib/IconDatabase.cpp‎
Lines changed: 1 addition & 1 deletion b/‎Source/WebKit/UIProcess/API/glib/IconDatabase.cpp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Source/WebKit/UIProcess/API/glib/WebKitAutocleanups.h.in‎
Lines changed: 3 additions & 0 deletions b/‎Source/WebKit/UIProcess/API/glib/WebKitAutocleanups.h.in‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎Source/WebKit/UIProcess/API/glib/WebKitAutomationSession.cpp‎
Lines changed: 28 additions & 2 deletions b/‎Source/WebKit/UIProcess/API/glib/WebKitAutomationSession.cpp‎
Lines changed: 28 additions & 2 deletions
diff --git a/‎Source/WebKit/UIProcess/API/glib/WebKitNavigationClient.cpp‎
Lines changed: 16 additions & 0 deletions b/‎Source/WebKit/UIProcess/API/glib/WebKitNavigationClient.cpp‎
Lines changed: 16 additions & 0 deletions
@@ -182,6 +182,12 @@ set(WebKitGTK_HEADER_TEMPLATES
     ${WEBKIT_DIR}/UIProcess/API/gtk/WebKitWebViewBase.h.in
 )
 
+if (ENABLE_2022_GLIB_API)
+    list(APPEND WebKitGTK_HEADER_TEMPLATES
+        ${WEBKIT_DIR}/UIProcess/API/glib/WebKitNetworkSession.h.in
+    )
+endif ()
+
 set(WebKitGTK_INSTALLED_HEADERS
     ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitEnumTypes.h
     ${WebKitGTK_DERIVED_SOURCES_DIR}/webkit/WebKitVersion.h
 
@@ -194,6 +194,12 @@ set(WPE_API_HEADER_TEMPLATES
     ${WEBKIT_DIR}/UIProcess/API/glib/webkit.h.in
 )
 
+if (ENABLE_2022_GLIB_API)
+    list(APPEND WPE_API_HEADER_TEMPLATES
+        ${WEBKIT_DIR}/UIProcess/API/glib/WebKitNetworkSession.h.in
+    )
+endif ()
+
 set(WPE_API_INSTALLED_HEADERS
     ${DERIVED_SOURCES_WPE_API_DIR}/WebKitEnumTypes.h
     ${DERIVED_SOURCES_WPE_API_DIR}/WebKitVersion.h
 
@@ -157,6 +157,7 @@ UIProcess/API/glib/WebKitNavigationAction.cpp @no-unify
 UIProcess/API/glib/WebKitNavigationClient.cpp @no-unify
 UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp @no-unify
 UIProcess/API/glib/WebKitNetworkProxySettings.cpp @no-unify
+UIProcess/API/glib/WebKitNetworkSession.cpp @no-unify
 UIProcess/API/glib/WebKitNotification.cpp @no-unify
 UIProcess/API/glib/WebKitNotificationPermissionRequest.cpp @no-unify
 UIProcess/API/glib/WebKitNotificationProvider.cpp @no-unify
 
@@ -149,6 +149,7 @@ UIProcess/API/glib/WebKitNavigationAction.cpp @no-unify
 UIProcess/API/glib/WebKitNavigationClient.cpp @no-unify
 UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp @no-unify
 UIProcess/API/glib/WebKitNetworkProxySettings.cpp @no-unify
+UIProcess/API/glib/WebKitNetworkSession.cpp @no-unify
 UIProcess/API/glib/WebKitNotification.cpp @no-unify
 UIProcess/API/glib/WebKitNotificationPermissionRequest.cpp @no-unify
 UIProcess/API/glib/WebKitNotificationProvider.cpp @no-unify
 
@@ -56,7 +56,7 @@ IconDatabase::IconDatabase(const String& path, AllowDatabaseWrite allowDatabaseW
     // We initialize the database synchronously, it's hopefully fast enough because it makes
     // the implementation a lot simpler.
     m_workQueue->dispatchSync([&] {
-        if (allowDatabaseWrite == AllowDatabaseWrite::No && !FileSystem::fileExists(path))
+        if (allowDatabaseWrite == AllowDatabaseWrite::No && (path.isNull() || !FileSystem::fileExists(path)))
             return;
 
         auto databaseDirectory = FileSystem::parentPath(path);
 
@@ -45,6 +45,9 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitInputMethodContext, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitInstallMissingMediaPluginsPermissionRequest, g_object_unref)
 #endif
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitNavigationPolicyDecision, g_object_unref)
+#if ENABLE(2022_GLIB_API)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitNetworkSession, g_object_unref)
+#endif
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitNotification, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitNotificationPermissionRequest, g_object_unref)
 G_DEFINE_AUTOPTR_CLEANUP_FUNC (WebKitPermissionRequest, g_object_unref)
 
@@ -31,6 +31,10 @@
 #include <wtf/glib/WTFGType.h>
 #include <wtf/text/CString.h>
 
+#if ENABLE(2022_GLIB_API)
+#include "WebKitNetworkSession.h"
+#endif
+
 using namespace WebKit;
 
 /**
@@ -350,13 +354,27 @@ WebKitAutomationSession* webkitAutomationSessionCreate(WebKitWebCon
A3D3
text* webCont
 {
     auto* session = WEBKIT_AUTOMATION_SESSION(g_object_new(WEBKIT_TYPE_AUTOMATION_SESSION, "id", sessionID, nullptr));
     session->priv->webContext = webContext;
-    if (capabilities.acceptInsecureCertificates)
+#if ENABLE(2022_GLIB_API)
+    WebKitNetworkSession* networkSession = webkitWebContextGetNetworkSessionForAutomation(webContext);
+#endif
+
+    if (capabilities.acceptInsecureCertificates) {
+#if ENABLE(2022_GLIB_API)
+        webkit_network_session_set_tls_errors_policy(networkSession, WEBKIT_TLS_ERRORS_POLICY_IGNORE);
+#else
         webkit_website_data_manager_set_tls_errors_policy(webkit_web_context_get_website_data_manager(webContext), WEBKIT_TLS_ERRORS_POLICY_IGNORE);
+#endif
+    }
 
     for (auto& certificate : capabilities.certificates) {
         GRefPtr<GTlsCertificate> tlsCertificate = adoptGRef(g_tls_certificate_new_from_file(certificate.second.utf8().data(), nullptr));
-        if (tlsCertificate)
+        if (tlsCertificate) {
+#if ENABLE(2022_GLIB_API)
+            webkit_network_session_allow_tls_certificate_for_host(networkSession, tlsCertificate.get(), certificate.first.utf8().data());
+#else
             webkit_web_context_allow_tls_certificate_for_host(webContext, tlsCertificate.get(), certificate.first.utf8().data());
+#endif
+        }
     }
     if (capabilities.proxy) {
         if (capabilities.proxy->type == "pac"_s) {
@@ -365,13 +383,21 @@ WebKitAutomationSession* webkitAutomationSessionCreate(WebKitWebContext* webCont
             if (capabilities.proxy->autoconfigURL)
                 settings.defaultProxyURL = capabilities.proxy->autoconfigURL->utf8();
             if (!settings.isEmpty()) {
+#if ENABLE(2022_GLIB_API)
+                auto& dataStore = webkitWebsiteDataManagerGetDataStore(webkit_network_session_get_website_data_manager(networkSession));
+#else
                 auto& dataStore = webkitWebsiteDataManagerGetDataStore(webkit_web_context_get_website_data_manager(webContext));
+#endif
                 dataStore.setNetworkProxySettings(WTFMove(settings));
             }
         } else {
             WebKitNetworkProxySettings* proxySettings = nullptr;
             auto proxyMode = parseProxyCapabilities(*capabilities.proxy, &proxySettings);
+#if ENABLE(2022_GLIB_API)
+            webkit_network_session_set_proxy_settings(networkSession, proxyMode, proxySettings);
+#else
             webkit_website_data_manager_set_network_proxy_settings(webkit_web_context_get_website_data_manager(webContext), proxyMode, proxySettings);
+#endif
             if (proxySettings)
                 webkit_network_proxy_settings_free(proxySettings);
         }
 
@@ -34,6 +34,10 @@
 #include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
+#if ENABLE(2022_GLIB_API)
+#include "WebKitNetworkSessionPrivate.h"
+#endif
+
 using namespace WebKit;
 using namespace WebCore;
 
@@ -158,19 +162,31 @@ class NavigationClient : public API::NavigationClient {
     void navigationActionDidBecomeDownload(WebPageProxy&, API::NavigationAction&, DownloadProxy& downloadProxy) override
     {
         auto download = webkitDownloadCreate(downloadProxy, m_webView);
+#if ENABLE(2022_GLIB_API)
+        webkitNetworkSessionDownloadStarted(webkit_web_view_get_network_session(m_webView), download.get());
+#else
         webkitWebContextDownloadStarted(webkit_web_view_get_context(m_webView), download.get());
+#endif
     }
 
     void navigationResponseDidBecomeDownload(WebPageProxy&, API::NavigationResponse&, DownloadProxy& downloadProxy) override
     {
         auto download = webkitDownloadCreate(downloadProxy, m_webView);
+#if ENABLE(2022_GLIB_API)
+        webkitNetworkSessionDownloadStarted(webkit_web_view_get_network_session(m_webView), download.get());
+#else
         webkitWebContextDownloadStarted(webkit_web_view_get_context(m_webView), download.get());
+#endif
     }
 
     void contextMenuDidCreateDownload(WebPageProxy&, DownloadProxy& downloadProxy) override
     {
         auto download = webkitDownloadCreate(downloadProxy, m_webView);
+#if ENABLE(2022_GLIB_API)
+        webkitNetworkSessionDownloadStarted(webkit_web_view_get_network_session(m_webView), download.get());
+#else
         webkitWebContextDownloadStarted(webkit_web_view_get_context(m_webView), download.get());
+#endif
     }
 
     WebKitWebView* m_webView;