Diff
Modified: trunk/Source/WebKit2/ChangeLog (184309 => 184310)
--- trunk/Source/WebKit2/ChangeLog 2015-05-13 22:06:45 UTC (rev 184309)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-13 22:07:09 UTC (rev 184310)
@@ -1,3 +1,33 @@
+2015-05-13 Anders Carlsson <[email protected]>
+
+ Don't create a per-pool data store when using the modern API
+ https://bugs.webkit.org/show_bug.cgi?id=144963
+ rdar://problem/20331756
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/API/APIProcessPoolConfiguration.cpp:
+ (API::ProcessPoolConfiguration::createWithLegacyOptions):
+ (API::ProcessPoolConfiguration::copy):
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+ Keep track of whether the process pool should have a data store.
+
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextGetWebsiteDataStore):
+ * UIProcess/WebKeyValueStorageManager.cpp:
+ (WebKit::WebKeyValueStorageManager::getKeyValueStorageOrigins):
+ (WebKit::WebKeyValueStorageManager::getStorageDetailsByOrigin):
+ (WebKit::WebKeyValueStorageManager::deleteEntriesForOrigin):
+ (WebKit::WebKeyValueStorageManager::deleteAllEntries):
+ Update now that WebProcessPool::dataStore() no longer returns a reference.
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::WebProcessPool):
+ Only create a data store if the configuration states that we should.
+
+ * UIProcess/WebProcessPool.h:
+ Change dataStore() to return a pointer instead of a reference.
+
2015-05-13 Alexey Proskuryakov <[email protected]>
[Mac] Sandbox violation reading SubmitDiagInfo.domains
Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (184309 => 184310)
--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-05-13 22:06:45 UTC (rev 184309)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-05-13 22:07:09 UTC (rev 184310)
@@ -40,6 +40,7 @@
{
auto configuration = ProcessPoolConfiguration::create();
+ configuration->m_shouldHaveLegacyDataStore = true;
configuration->m_processModel = WebKit::ProcessModelSharedSecondaryProcess;
configuration->m_useNetworkProcess = false;
configuration->m_cacheModel = WebKit::CacheModelDocumentViewer;
@@ -67,6 +68,7 @@
{
auto copy = this->create();
+ copy->m_shouldHaveLegacyDataStore = this->m_shouldHaveLegacyDataStore;
copy->m_processModel = this->m_processModel;
copy->m_useNetworkProcess = this->m_useNetworkProcess;
copy->m_maximumProcessCount = this->m_maximumProcessCount;
Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (184309 => 184310)
--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-05-13 22:06:45 UTC (rev 184309)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-05-13 22:07:09 UTC (rev 184310)
@@ -45,6 +45,9 @@
Ref<ProcessPoolConfiguration> copy();
+ bool shouldHaveLegacyDataStore() const { return m_shouldHaveLegacyDataStore; }
+ void setShouldHaveLegacyDataStore(bool shouldHaveLegacyDataStore) { m_shouldHaveLegacyDataStore = shouldHaveLegacyDataStore; }
+
WebKit::ProcessModel processModel() const { return m_processModel; }
void setProcessModel(WebKit::ProcessModel processModel) { m_processModel = processModel; }
@@ -79,6 +82,8 @@
void setCachePartitionedURLSchemes(Vector<WTF::String>&& cachePartitionedURLSchemes) { m_cachePartitionedURLSchemes = WTF::move(cachePartitionedURLSchemes); }
private:
+ bool m_shouldHaveLegacyDataStore { false };
+
WebKit::ProcessModel m_processModel { WebKit::ProcessModelMultipleSecondaryProcesses };
bool m_useNetworkProcess { true };
unsigned m_maximumProcessCount { 0 };
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (184309 => 184310)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-05-13 22:06:45 UTC (rev 184309)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-05-13 22:07:09 UTC (rev 184310)
@@ -416,7 +416,7 @@
WKWebsiteDataStoreRef WKContextGetWebsiteDataStore(WKContextRef context)
{
- return toAPI(&toImpl(context)->websiteDataStore());
+ return toAPI(toImpl(context)->websiteDataStore());
}
WKApplicationCacheManagerRef WKContextGetApplicationCacheManager(WKContextRef contextRef)
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp (184309 => 184310)
--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp 2015-05-13 22:06:45 UTC (rev 184309)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp 2015-05-13 22:07:09 UTC (rev 184310)
@@ -33,7 +33,13 @@
WKContextConfigurationRef WKContextConfigurationCreate()
{
- return toAPI(&API::ProcessPoolConfiguration::create().leakRef());
+ auto configuration = API::ProcessPoolConfiguration::create();
+
+ // FIXME: A context created like this shouldn't have a data store,
+ // instead there should be a WKPageConfigurationRef object that specifies the data store.
+ configuration->setShouldHaveLegacyDataStore(true);
+
+ return toAPI(&configuration.leakRef());
}
WKStringRef WKContextConfigurationCopyIndexedDBDatabaseDirectory(WKContextConfigurationRef configuration)
Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp (184309 => 184310)
--- trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2015-05-13 22:06:45 UTC (rev 184309)
+++ trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp 2015-05-13 22:07:09 UTC (rev 184310)
@@ -90,7 +90,7 @@
void WebKeyValueStorageManager::getKeyValueStorageOrigins(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
{
- StorageManager* storageManager = processPool()->websiteDataStore().websiteDataStore().storageManager();
+ StorageManager* storageManager = processPool()->websiteDataStore()->websiteDataStore().storageManager();
if (!storageManager) {
RunLoop::main().dispatch([callbackFunction] {
callbackFunction(API::Array::create().ptr(), CallbackBase::Error::None);
@@ -110,7 +110,7 @@
void WebKeyValueStorageManager::getStorageDetailsByOrigin(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
{
- StorageManager* storageManager = processPool()->websiteDataStore().websiteDataStore().storageManager();
+ StorageManager* storageManager = processPool()->websiteDataStore()->websiteDataStore().storageManager();
if (!storageManager) {
RunLoop::main().dispatch([callbackFunction] {
callbackFunction(API::Array::create().ptr(), CallbackBase::Error::None);
@@ -143,7 +143,7 @@
void WebKeyValueStorageManager::deleteEntriesForOrigin(API::SecurityOrigin* origin)
{
- StorageManager* storageManager = processPool()->websiteDataStore().websiteDataStore().storageManager();
+ StorageManager* storageManager = processPool()->websiteDataStore()->websiteDataStore().storageManager();
if (!storageManager)
return;
@@ -152,7 +152,7 @@
void WebKeyValueStorageManager::deleteAllEntries()
{
- StorageManager* storageManager = processPool()->websiteDataStore().websiteDataStore().storageManager();
+ StorageManager* storageManager = processPool()->websiteDataStore()->websiteDataStore().storageManager();
if (!storageManager)
return;
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (184309 => 184310)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-05-13 22:06:45 UTC (rev 184309)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-05-13 22:07:09 UTC (rev 184310)
@@ -158,7 +158,7 @@
, m_diskCacheSizeOverride(m_configuration->diskCacheSizeOverride())
, m_memorySamplerEnabled(false)
, m_memorySamplerInterval(1400.0)
- , m_websiteDataStore(API::WebsiteDataStore::create(websiteDataStoreConfiguration(m_configuration.get())))
+ , m_websiteDataStore(m_configuration->shouldHaveLegacyDataStore() ? API::WebsiteDataStore::create(websiteDataStoreConfiguration(m_configuration)) : nullptr)
#if USE(SOUP)
, m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain)
#endif
Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (184309 => 184310)
--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-05-13 22:06:45 UTC (rev 184309)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-05-13 22:07:09 UTC (rev 184310)
@@ -165,7 +165,7 @@
// Disconnect the process from the context.
void disconnectProcess(WebProcessProxy*);
- API::WebsiteDataStore& websiteDataStore() const { return *m_websiteDataStore; }
+ API::WebsiteDataStore* websiteDataStore() const { return m_websiteDataStore.get(); }
PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebPageConfiguration);
@@ -490,7 +490,7 @@
RefPtr<WebPluginSiteDataManager> m_pluginSiteDataManager;
#endif
- RefPtr<API::WebsiteDataStore> m_websiteDataStore;
+ const RefPtr<API::WebsiteDataStore> m_websiteDataStore;
typedef HashMap<const char*, RefPtr<WebContextSupplement>, PtrHash<const char*>> WebContextSupplementMap;
WebContextSupplementMap m_supplements;
