Changeset 199842 in webkit

Timestamp:

Apr 21, 2016 4:06:41 PM (8 years ago)

Author:

andersca@apple.com

Message:

Get rid of the last uses of ApplicationCacheStorage::singleton() from WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=156876

Reviewed by Tim Horton.

• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):

• Shared/WebProcessCreationParameters.h:

Add and encode and decode a applicationCacheFlatFileSubdirectoryName.

• UIProcess/API/APIProcessPoolConfiguration.cpp:

(API::ProcessPoolConfiguration::createWithLegacyOptions):
Set m_applicationCacheFlatFileSubdirectoryName to "ApplicationCache".

(API::ProcessPoolConfiguration::ProcessPoolConfiguration):
Set m_applicationCacheFlatFileSubdirectoryName to "Files".

(API::ProcessPoolConfiguration::copy):
Copy m_applicationCacheFlatFileSubdirectoryName.

• UIProcess/API/APIProcessPoolConfiguration.h:

Add getter for applicationCacheFlatFileSubdirectoryName.

• UIProcess/WebProcessPool.cpp:

(WebKit::legacyWebsiteDataStoreConfiguration):
Initialize applicationCacheFlatFileSubdirectoryName from the process pool configuration.

(WebKit::WebProcessPool::createNewWebProcess):
Initialize parameters.applicationCacheFlatFileSubdirectoryName. Remove a call to
ApplicationCacheStorage::singleton().setDefaultOriginQuota since it had no effect (it was called in the UI process).

• UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::WebsiteDataStore):
Initialize m_applicationCacheFlatFileSubdirectoryName.

(WebKit::WebsiteDataStore::fetchData):
(WebKit::WebsiteDataStore::removeData):
Pass m_applicationCacheFlatFileSubdirectoryName when creating the application cache storage.

• UIProcess/WebsiteData/WebsiteDataStore.h:

Add new members.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::WebPage):
Set the application cache storage.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeWebProcess):
Initialize the application cache storage.

• WebProcess/WebProcess.h:

(WebKit::WebProcess::applicationCacheStorage):
Add new getter.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebProcessCreationParameters.cpp (modified) (2 diffs)
• Shared/WebProcessCreationParameters.h (modified) (1 diff)
• UIProcess/API/APIProcessPoolConfiguration.cpp (modified) (3 diffs)
• UIProcess/API/APIProcessPoolConfiguration.h (modified) (2 diffs)
• UIProcess/WebProcessPool.cpp (modified) (3 diffs)
• UIProcess/WebsiteData/WebsiteDataStore.cpp (modified) (5 diffs)
• UIProcess/WebsiteData/WebsiteDataStore.h (modified) (2 diffs)
• WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)
• WebProcess/WebProcess.cpp (modified) (1 diff)
• WebProcess/WebProcess.h (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-04-21  Anders Carlsson  <andersca@apple.com>
+
+        Get rid of the last uses of ApplicationCacheStorage::singleton() from WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=156876
+
+        Reviewed by Tim Horton.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        Add and encode and decode a applicationCacheFlatFileSubdirectoryName.
+
+        * UIProcess/API/APIProcessPoolConfiguration.cpp:
+        (API::ProcessPoolConfiguration::createWithLegacyOptions):
+        Set m_applicationCacheFlatFileSubdirectoryName to "ApplicationCache".
+
+        (API::ProcessPoolConfiguration::ProcessPoolConfiguration):
+        Set m_applicationCacheFlatFileSubdirectoryName to "Files".
+
+        (API::ProcessPoolConfiguration::copy):
+        Copy m_applicationCacheFlatFileSubdirectoryName.
+
+        * UIProcess/API/APIProcessPoolConfiguration.h:
+        Add getter for applicationCacheFlatFileSubdirectoryName.
+
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::legacyWebsiteDataStoreConfiguration):
+        Initialize applicationCacheFlatFileSubdirectoryName from the process pool configuration.
+
+        (WebKit::WebProcessPool::createNewWebProcess):
+        Initialize parameters.applicationCacheFlatFileSubdirectoryName. Remove a call to 
+        ApplicationCacheStorage::singleton().setDefaultOriginQuota since it had no effect (it was called in the UI process).
+
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::WebsiteDataStore):
+        Initialize m_applicationCacheFlatFileSubdirectoryName.
+
+        (WebKit::WebsiteDataStore::fetchData):
+        (WebKit::WebsiteDataStore::removeData):
+        Pass m_applicationCacheFlatFileSubdirectoryName when creating the application cache storage.
+
+        * UIProcess/WebsiteData/WebsiteDataStore.h:
+        Add new members.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage):
+        Set the application cache storage.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+        Initialize the application cache storage.
+
+        * WebProcess/WebProcess.h:
+        (WebKit::WebProcess::applicationCacheStorage):
+        Add new getter.
+
 2016-04-21  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -63 +63 @@
     encoder << initializationUserData;
     encoder << applicationCacheDirectory;
+    encoder << applicationCacheFlatFileSubdirectoryName;
     encoder << applicationCacheDirectoryExtensionHandle;
     encoder << webSQLDatabaseDirectory;
@@ -157 +158 @@
     if (!decoder.decode(parameters.applicationCacheDirectory))
         return false;
+    if (!decoder.decode(parameters.applicationCacheFlatFileSubdirectoryName))
+        return false;
     if (!decoder.decode(parameters.applicationCacheDirectoryExtensionHandle))
         return false;

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -69 +69 @@
     UserData initializationUserData;
 
-    String applicationCacheDirectory;    
+    String applicationCacheDirectory;
+    String applicationCacheFlatFileSubdirectoryName;
     SandboxExtension::Handle applicationCacheDirectoryExtensionHandle;
     String webSQLDatabaseDirectory;

trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp

@@ -46 +46 @@
 
     configuration->m_applicationCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory();
+    configuration->m_applicationCacheFlatFileSubdirectoryName = "ApplicationCache";
     configuration->m_diskCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory();
     configuration->m_mediaCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultMediaCacheDirectory();
@@ -58 +59 @@
 ProcessPoolConfiguration::ProcessPoolConfiguration()
     : m_applicationCacheDirectory(WebsiteDataStore::defaultApplicationCacheDirectory())
+    , m_applicationCacheFlatFileSubdirectoryName("Files")
     , m_diskCacheDirectory(WebsiteDataStore::defaultNetworkCacheDirectory())
     , m_mediaCacheDirectory(WebsiteDataStore::defaultMediaCacheDirectory())
@@ -81 +83 @@
     copy->m_diskCacheSizeOverride = this->m_diskCacheSizeOverride;
     copy->m_applicationCacheDirectory = this->m_applicationCacheDirectory;
+    copy->m_applicationCacheFlatFileSubdirectoryName = this->m_applicationCacheFlatFileSubdirectoryName;
     copy->m_diskCacheDirectory = this->m_diskCacheDirectory;
     copy->m_mediaCacheDirectory = this->m_mediaCacheDirectory;

trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h

@@ -63 +63 @@
     void setApplicationCacheDirectory(const WTF::String& applicationCacheDirectory) { m_applicationCacheDirectory = applicationCacheDirectory; }
 
+    const WTF::String& applicationCacheFlatFileSubdirectoryName() const { return m_applicationCacheFlatFileSubdirectoryName; }
+
     const WTF::String& diskCacheDirectory() const { return m_diskCacheDirectory; }
     void setDiskCacheDirectory(const WTF::String& diskCacheDirectory) { m_diskCacheDirectory = diskCacheDirectory; }
@@ -105 +107 @@
 
     WTF::String m_applicationCacheDirectory;
+    WTF::String m_applicationCacheFlatFileSubdirectoryName;
     WTF::String m_diskCacheDirectory;
     WTF::String m_mediaCacheDirectory;

trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp

@@ -129 +129 @@
     configuration.webSQLDatabaseDirectory = processPoolConfiguration.webSQLDatabaseDirectory();
     configuration.applicationCacheDirectory = processPoolConfiguration.applicationCacheDirectory();
+    configuration.applicationCacheFlatFileSubdirectoryName = processPoolConfiguration.applicationCacheFlatFileSubdirectoryName();
     configuration.mediaCacheDirectory = processPoolConfiguration.mediaCacheDirectory();
     configuration.mediaKeysStorageDirectory = processPoolConfiguration.mediaKeysStorageDirectory();
@@ -539 +540 @@
 
     parameters.applicationCacheDirectory = m_configuration->applicationCacheDirectory();
+    parameters.applicationCacheFlatFileSubdirectoryName = m_configuration->applicationCacheFlatFileSubdirectoryName();
+
     if (!parameters.applicationCacheDirectory.isEmpty())
         SandboxExtension::createHandleForReadWriteDirectory(parameters.applicationCacheDirectory, parameters.applicationCacheDirectoryExtensionHandle);
@@ -646 +649 @@
 #if PLATFORM(COCOA)
     process->send(Messages::WebProcess::SetQOS(webProcessLatencyQOS(), webProcessThroughputQOS()), 0);
-#endif
-#if PLATFORM(IOS)
-    ApplicationCacheStorage::singleton().setDefaultOriginQuota(25ULL * 1024 * 1024);
 #endif
 

trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp

@@ -79 +79 @@
     , m_networkCacheDirectory(WTFMove(configuration.networkCacheDirectory))
     , m_applicationCacheDirectory(WTFMove(configuration.applicationCacheDirectory))
+    , m_applicationCacheFlatFileSubdirectoryName(WTFMove(configuration.applicationCacheFlatFileSubdirectoryName))
     , m_mediaCacheDirectory(WTFMove(configuration.mediaCacheDirectory))
     , m_webSQLDatabaseDirectory(WTFMove(configuration.webSQLDatabaseDirectory))
@@ -356 +357 @@
     if (dataTypes.contains(WebsiteDataType::OfflineWebApplicationCache) && isPersistent()) {
         StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
-
-        callbackAggregator->addPendingCallback();
-
-        m_queue->dispatch([fetchOptions, applicationCacheDirectory, callbackAggregator] {
-            auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "ApplicationCache");
+        StringCapture applicationCacheFlatFileSubdirectoryName { m_applicationCacheFlatFileSubdirectoryName };
+
+        callbackAggregator->addPendingCallback();
+
+        m_queue->dispatch([fetchOptions, applicationCacheDirectory, applicationCacheFlatFileSubdirectoryName, callbackAggregator] {
+            auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), applicationCacheFlatFileSubdirectoryName.string());
 
             WebsiteData* websiteData = new WebsiteData;
@@ -633 +635 @@
     if (dataTypes.contains(WebsiteDataType::OfflineWebApplicationCache) && isPersistent()) {
         StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
-
-        callbackAggregator->addPendingCallback();
-
-        m_queue->dispatch([applicationCacheDirectory, callbackAggregator] {
-            auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "ApplicationCache");
+        StringCapture applicationCacheFlatFileSubdirectoryName { m_applicationCacheFlatFileSubdirectoryName };
+
+        callbackAggregator->addPendingCallback();
+
+        m_queue->dispatch([applicationCacheDirectory, applicationCacheFlatFileSubdirectoryName, callbackAggregator] {
+            auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), applicationCacheFlatFileSubdirectoryName.string());
 
             storage->deleteAllCaches();
@@ -885 +888 @@
     if (dataTypes.contains(WebsiteDataType::OfflineWebApplicationCache) && isPersistent()) {
         StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
+        StringCapture applicationCacheFlatFileSubdirectoryName { m_applicationCacheFlatFileSubdirectoryName };
 
         HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
@@ -893 +897 @@
 
         callbackAggregator->addPendingCallback();
-        m_queue->dispatch([origins, applicationCacheDirectory, callbackAggregator] {
-            auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), "ApplicationCache");
+        m_queue->dispatch([origins, applicationCacheDirectory, applicationCacheFlatFileSubdirectoryName, callbackAggregator] {
+            auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory.string(), applicationCacheFlatFileSubdirectoryName.string());
 
             for (const auto& origin : origins)

trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h

@@ -61 +61 @@
         String networkCacheDirectory;
         String applicationCacheDirectory;
+        String applicationCacheFlatFileSubdirectoryName;
 
         String mediaCacheDirectory;
@@ -119 +120 @@
     const String m_networkCacheDirectory;
     const String m_applicationCacheDirectory;
+    const String m_applicationCacheFlatFileSubdirectoryName;
     const String m_mediaCacheDirectory;
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -107 +107 @@
 #include "WebUserMediaClient.h"
 #include <JavaScriptCore/APICast.h>
+#include <WebCore/ApplicationCacheStorage.h>
 #include <WebCore/ArchiveResource.h>
 #include <WebCore/Chrome.h>
@@ -403 +404 @@
     pageConfiguration.diagnosticLoggingClient = new WebDiagnosticLoggingClient(*this);
 
+    pageConfiguration.applicationCacheStorage = &WebProcess::singleton().applicationCacheStorage();
     pageConfiguration.databaseProvider = WebDatabaseProvider::getOrCreate(m_pageGroup->pageGroupID());
     pageConfiguration.storageNamespaceProvider = WebStorageNamespaceProvider::getOrCreate(m_pageGroup->pageGroupID());

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -292 +292 @@
 #endif
 
-    if (!parameters.applicationCacheDirectory.isEmpty())
-        ApplicationCacheStorage::singleton().setCacheDirectory(parameters.applicationCacheDirectory);
+    // FIXME: This should be constructed per data store, not per process.
+    m_applicationCacheStorage = ApplicationCacheStorage::create(parameters.applicationCacheDirectory, parameters.applicationCacheFlatFileSubdirectoryName);
+#if PLATFORM(IOS)
+    m_applicationCacheStorage->setDefaultOriginQuota(25ULL * 1024 * 1024);
+#endif
 
     if (!parameters.mediaCacheDirectory.isEmpty())

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -62 +62 @@
 
 namespace WebCore {
+class ApplicationCacheStorage;
 class CertificateInfo;
 class PageGroup;
@@ -208 +209 @@
 #endif
 
+    WebCore::ApplicationCacheStorage& applicationCacheStorage() { return *m_applicationCacheStorage; }
+
     void prefetchDNS(const String&);
 
@@ -386 +389 @@
     WebCore::Timer m_statisticsChangedTimer;
 
+    RefPtr<WebCore::ApplicationCacheStorage> m_applicationCacheStorage;
+
 #if PLATFORM(IOS)
     WebSQLiteDatabaseTracker m_webSQLiteDatabaseTracker;