Changeset 259705 in webkit

Timestamp:

Apr 7, 2020 11:19:23 PM (4 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK][WPE] WTR: fix handling of WebsiteDataStore
​https://bugs.webkit.org/show_bug.cgi?id=210106

Reviewed by Adrian Perez de Castro.

Source/WebKit:

Add WKContextSetPrimaryWebsiteDataStore() to expose WebProcessPool::setPrimaryDataStore().

• UIProcess/API/C/WKContext.cpp:

(WKContextSetPrimaryWebsiteDataStore):

• UIProcess/API/C/WKContextPrivate.h:

Tools:

The TestController::defaultWebsiteDataStore() is created and used but never really assigned to the
context. Since we are not assigning a WebsiteDataStore to the context, and we don't use the default
WebsiteDataStore, when a new page is created, we end up creating the default one (with the default config,
instead of the one created by WTR).

• WebKitTestRunner/TestController.cpp:

(WTR::TestController::platformAdjustContext): Set defaultWebsiteDataStore() as the primary data store of the
context like the GLib API does.

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/API/C/WKContextPrivate.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-04-07  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][WPE] WTR: fix handling of WebsiteDataStore
+        https://bugs.webkit.org/show_bug.cgi?id=210106
+
+        Reviewed by Adrian Perez de Castro.
+
+        Add WKContextSetPrimaryWebsiteDataStore() to expose WebProcessPool::setPrimaryDataStore().
+
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextSetPrimaryWebsiteDataStore):
+        * UIProcess/API/C/WKContextPrivate.h:
+
 2020-04-07  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

@@ -671 +671 @@
     WebKit::toImpl(contextRef)->setUseSeparateServiceWorkerProcess(useSeparateServiceWorkerProcess);
 }
+
+void WKContextSetPrimaryWebsiteDataStore(WKContextRef contextRef, WKWebsiteDataStoreRef websiteDataStore)
+{
+    WebKit::toImpl(contextRef)->setPrimaryDataStore(*WebKit::toImpl(websiteDataStore));
+}

trunk/Source/WebKit/UIProcess/API/C/WKContextPrivate.h

@@ -120 +120 @@
 WK_EXPORT void WKContextSetUseSeparateServiceWorkerProcess(WKContextRef context, bool forceServiceWorkerProcess);
 
+WK_EXPORT void WKContextSetPrimaryWebsiteDataStore(WKContextRef context, WKWebsiteDataStoreRef websiteDataStore);
+
 #ifdef __cplusplus
 }

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-07  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK][WPE] WTR: fix handling of WebsiteDataStore
+        https://bugs.webkit.org/show_bug.cgi?id=210106
+
+        Reviewed by Adrian Perez de Castro.
+
+        The TestController::defaultWebsiteDataStore() is created and used but never really assigned to the
+        context. Since we are not assigning a WebsiteDataStore to the context, and we don't use the default
+        WebsiteDataStore, when a new page is created, we end up creating the default one (with the default config,
+        instead of the one created by WTR).
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::platformAdjustContext): Set defaultWebsiteDataStore() as the primary data store of the
+        context like the GLib API does.
+
 2020-04-07  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -3112 +3112 @@
 WKContextRef TestController::platformAdjustContext(WKContextRef context, WKContextConfigurationRef contextConfiguration)
 {
+#if PLATFORM(GTK) || PLATFORM(WPE)
+    WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(defaultWebsiteDataStore(), true);
+    WKContextSetPrimaryWebsiteDataStore(context, defaultWebsiteDataStore());
+#else
     WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(WKContextGetWebsiteDataStore(context), true);
+#endif
     return context;
 }