Changeset 267729 in webkit

Timestamp:

Sep 29, 2020, 12:20:13 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Stop using the default website data store for the inspector
​https://bugs.webkit.org/show_bug.cgi?id=217034

Patch by Carlos Garcia Campos <​cgarcia@igalia.com> on 2020-09-29
Reviewed by Michael Catanzaro.

The GTK should never use the default website data store. Use a dedicated website data store for the inspector
with its own configuration to store persistent data.

• UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp:

(WebKit::inspectorWebsiteDataStore):
(WebKit::WebInspectorProxy::platformCreateFrontendPage):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-29  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Stop using the default website data store for the inspector
+        https://bugs.webkit.org/show_bug.cgi?id=217034
+
+        Reviewed by Michael Catanzaro.
+
+        The GTK should never use the default website data store. Use a dedicated website data store for the inspector
+        with its own configuration to store persistent data.
+
+        * UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp:
+        (WebKit::inspectorWebsiteDataStore):
+        (WebKit::WebInspectorProxy::platformCreateFrontendPage):
+
 2020-09-28  Peng Liu  <peng.liu6@apple.com>
 

trunk/Source/WebKit/UIProcess/Inspector/gtk/WebInspectorProxyGtk.cpp

@@ -43 +43 @@
 #include "WebProcessPool.h"
 #include "WebProcessProxy.h"
+#include "WebsiteDataStore.h"
 #include <WebCore/CertificateInfo.h>
 #include <WebCore/GtkUtilities.h>
@@ -138 +139 @@
 }
 
+static Ref<WebsiteDataStore> inspectorWebsiteDataStore()
+{
+    static const char* versionedDirectory = "webkitgtk-" WEBKITGTK_API_VERSION_STRING G_DIR_SEPARATOR_S "WebInspector" G_DIR_SEPARATOR_S;
+    String baseCacheDirectory = FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(g_get_user_cache_dir()), versionedDirectory);
+    String baseDataDirectory = FileSystem::pathByAppendingComponent(FileSystem::stringFromFileSystemRepresentation(g_get_user_data_dir()), versionedDirectory);
+
+    auto configuration = WebsiteDataStoreConfiguration::create(IsPersistent::Yes, WillCopyPathsFromExistingConfiguration::Yes);
+    configuration->setNetworkCacheDirectory(FileSystem::pathByAppendingComponent(baseCacheDirectory, "WebKitCache"));
+    configuration->setApplicationCacheDirectory(FileSystem::pathByAppendingComponent(baseCacheDirectory, "applications"));
+    configuration->setHSTSStorageDirectory(String(baseCacheDirectory));
+    configuration->setCacheStorageDirectory(FileSystem::pathByAppendingComponent(baseCacheDirectory, "CacheStorage"));
+    configuration->setLocalStorageDirectory(FileSystem::pathByAppendingComponent(baseDataDirectory, "localstorage"));
+    configuration->setIndexedDBDatabaseDirectory(FileSystem::pathByAppendingComponent(baseDataDirectory, "indexeddb"));
+    configuration->setWebSQLDatabaseDirectory(FileSystem::pathByAppendingComponent(baseDataDirectory, "databases"));
+    configuration->setResourceLoadStatisticsDirectory(FileSystem::pathByAppendingComponent(baseDataDirectory, "itp"));
+    configuration->setServiceWorkerRegistrationDirectory(FileSystem::pathByAppendingComponent(baseDataDirectory, "serviceworkers"));
+    configuration->setDeviceIdHashSaltsStorageDirectory(FileSystem::pathByAppendingComponent(baseDataDirectory, "deviceidhashsalts"));
+    return WebsiteDataStore::create(WTFMove(configuration), PAL::SessionID::defaultSessionID());
+}
+
 WebPageProxy* WebInspectorProxy::platformCreateFrontendPage()
 {
@@ -153 +174 @@
     });
     auto pageGroup = WebPageGroup::create(inspectorPageGroupIdentifierForPage(inspectedPage()));
+    auto websiteDataStore = inspectorWebsiteDataStore();
+    auto& processPool = inspectorProcessPool(inspectionLevel());
+    processPool.setPrimaryDataStore(websiteDataStore.get());
 
     auto pageConfiguration = API::PageConfiguration::create();
-    pageConfiguration->setProcessPool(&inspectorProcessPool(inspectionLevel()));
+    pageConfiguration->setProcessPool(&processPool);
     pageConfiguration->setPreferences(preferences.ptr());
     pageConfiguration->setPageGroup(pageGroup.ptr());
+    pageConfiguration->setWebsiteDataStore(websiteDataStore.ptr());
     m_inspectorView = GTK_WIDGET(webkitWebViewBaseCreate(*pageConfiguration.ptr()));
     g_object_add_weak_pointer(G_OBJECT(m_inspectorView), reinterpret_cast<void**>(&m_inspectorView));