<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[184310] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/184310">184310</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-05-13 15:07:09 -0700 (Wed, 13 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp">trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh">trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextConfigurationRefcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp">trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184309 => 184310)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-05-13 Anders Carlsson <andersca@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2015-05-13 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] Sandbox violation reading SubmitDiagInfo.domains
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (184309 => 184310)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto configuration = ProcessPoolConfiguration::create();
</span><span class="cx">
</span><ins>+ configuration->m_shouldHaveLegacyDataStore = true;
</ins><span class="cx"> configuration->m_processModel = WebKit::ProcessModelSharedSecondaryProcess;
</span><span class="cx"> configuration->m_useNetworkProcess = false;
</span><span class="cx"> configuration->m_cacheModel = WebKit::CacheModelDocumentViewer;
</span><span class="lines">@@ -67,6 +68,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto copy = this->create();
</span><span class="cx">
</span><ins>+ copy->m_shouldHaveLegacyDataStore = this->m_shouldHaveLegacyDataStore;
</ins><span class="cx"> copy->m_processModel = this->m_processModel;
</span><span class="cx"> copy->m_useNetworkProcess = this->m_useNetworkProcess;
</span><span class="cx"> copy->m_maximumProcessCount = this->m_maximumProcessCount;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (184309 => 184310)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -45,6 +45,9 @@
</span><span class="cx">
</span><span class="cx"> Ref<ProcessPoolConfiguration> copy();
</span><span class="cx">
</span><ins>+ bool shouldHaveLegacyDataStore() const { return m_shouldHaveLegacyDataStore; }
+ void setShouldHaveLegacyDataStore(bool shouldHaveLegacyDataStore) { m_shouldHaveLegacyDataStore = shouldHaveLegacyDataStore; }
+
</ins><span class="cx"> WebKit::ProcessModel processModel() const { return m_processModel; }
</span><span class="cx"> void setProcessModel(WebKit::ProcessModel processModel) { m_processModel = processModel; }
</span><span class="cx">
</span><span class="lines">@@ -79,6 +82,8 @@
</span><span class="cx"> void setCachePartitionedURLSchemes(Vector<WTF::String>&& cachePartitionedURLSchemes) { m_cachePartitionedURLSchemes = WTF::move(cachePartitionedURLSchemes); }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ bool m_shouldHaveLegacyDataStore { false };
+
</ins><span class="cx"> WebKit::ProcessModel m_processModel { WebKit::ProcessModelMultipleSecondaryProcesses };
</span><span class="cx"> bool m_useNetworkProcess { true };
</span><span class="cx"> unsigned m_maximumProcessCount { 0 };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (184309 => 184310)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx">
</span><span class="cx"> WKWebsiteDataStoreRef WKContextGetWebsiteDataStore(WKContextRef context)
</span><span class="cx"> {
</span><del>- return toAPI(&toImpl(context)->websiteDataStore());
</del><ins>+ return toAPI(toImpl(context)->websiteDataStore());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKApplicationCacheManagerRef WKContextGetApplicationCacheManager(WKContextRef contextRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextConfigurationRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp (184309 => 184310)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -33,7 +33,13 @@
</span><span class="cx">
</span><span class="cx"> WKContextConfigurationRef WKContextConfigurationCreate()
</span><span class="cx"> {
</span><del>- return toAPI(&API::ProcessPoolConfiguration::create().leakRef());
</del><ins>+ 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());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKContextConfigurationCopyIndexedDBDatabaseDirectory(WKContextConfigurationRef configuration)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebKeyValueStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebKeyValueStorageManager.cpp (184309 => 184310)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> void WebKeyValueStorageManager::getKeyValueStorageOrigins(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- StorageManager* storageManager = processPool()->websiteDataStore().websiteDataStore().storageManager();
</del><ins>+ StorageManager* storageManager = processPool()->websiteDataStore()->websiteDataStore().storageManager();
</ins><span class="cx"> if (!storageManager) {
</span><span class="cx"> RunLoop::main().dispatch([callbackFunction] {
</span><span class="cx"> callbackFunction(API::Array::create().ptr(), CallbackBase::Error::None);
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx">
</span><span class="cx"> void WebKeyValueStorageManager::getStorageDetailsByOrigin(std::function<void (API::Array*, CallbackBase::Error)> callbackFunction)
</span><span class="cx"> {
</span><del>- StorageManager* storageManager = processPool()->websiteDataStore().websiteDataStore().storageManager();
</del><ins>+ StorageManager* storageManager = processPool()->websiteDataStore()->websiteDataStore().storageManager();
</ins><span class="cx"> if (!storageManager) {
</span><span class="cx"> RunLoop::main().dispatch([callbackFunction] {
</span><span class="cx"> callbackFunction(API::Array::create().ptr(), CallbackBase::Error::None);
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx">
</span><span class="cx"> void WebKeyValueStorageManager::deleteEntriesForOrigin(API::SecurityOrigin* origin)
</span><span class="cx"> {
</span><del>- StorageManager* storageManager = processPool()->websiteDataStore().websiteDataStore().storageManager();
</del><ins>+ StorageManager* storageManager = processPool()->websiteDataStore()->websiteDataStore().storageManager();
</ins><span class="cx"> if (!storageManager)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx">
</span><span class="cx"> void WebKeyValueStorageManager::deleteAllEntries()
</span><span class="cx"> {
</span><del>- StorageManager* storageManager = processPool()->websiteDataStore().websiteDataStore().storageManager();
</del><ins>+ StorageManager* storageManager = processPool()->websiteDataStore()->websiteDataStore().storageManager();
</ins><span class="cx"> if (!storageManager)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (184309 => 184310)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> , m_diskCacheSizeOverride(m_configuration->diskCacheSizeOverride())
</span><span class="cx"> , m_memorySamplerEnabled(false)
</span><span class="cx"> , m_memorySamplerInterval(1400.0)
</span><del>- , m_websiteDataStore(API::WebsiteDataStore::create(websiteDataStoreConfiguration(m_configuration.get())))
</del><ins>+ , m_websiteDataStore(m_configuration->shouldHaveLegacyDataStore() ? API::WebsiteDataStore::create(websiteDataStoreConfiguration(m_configuration)) : nullptr)
</ins><span class="cx"> #if USE(SOUP)
</span><span class="cx"> , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain)
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (184309 => 184310)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> // Disconnect the process from the context.
</span><span class="cx"> void disconnectProcess(WebProcessProxy*);
</span><span class="cx">
</span><del>- API::WebsiteDataStore& websiteDataStore() const { return *m_websiteDataStore; }
</del><ins>+ API::WebsiteDataStore* websiteDataStore() const { return m_websiteDataStore.get(); }
</ins><span class="cx">
</span><span class="cx"> PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebPageConfiguration);
</span><span class="cx">
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx"> RefPtr<WebPluginSiteDataManager> m_pluginSiteDataManager;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- RefPtr<API::WebsiteDataStore> m_websiteDataStore;
</del><ins>+ const RefPtr<API::WebsiteDataStore> m_websiteDataStore;
</ins><span class="cx">
</span><span class="cx"> typedef HashMap<const char*, RefPtr<WebContextSupplement>, PtrHash<const char*>> WebContextSupplementMap;
</span><span class="cx"> WebContextSupplementMap m_supplements;
</span></span></pre>
</div>
</div>
</body>
</html>