<!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>[202140] 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/202140">202140</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-06-16 15:06:57 -0700 (Thu, 16 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>When a WebsiteDataStore finds no ProcessPools and creates one from scratch, it should represent the data store's config.
rdar://problem/26586991 and https://bugs.webkit.org/show_bug.cgi?id=158844
Reviewed by Anders Carlsson.
* UIProcess/API/APIProcessPoolConfiguration.cpp:
(API::ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration):
* UIProcess/API/APIProcessPoolConfiguration.h:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::WebsiteDataStore):
(WebKit::WebsiteDataStore::fetchData):
(WebKit::WebsiteDataStore::removeData):
(WebKit::WebsiteDataStore::processPools):
* UIProcess/WebsiteData/WebsiteDataStore.h:</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="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202139 => 202140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-16 21:47:06 UTC (rev 202139)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-16 22:06:57 UTC (rev 202140)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-06-16 Brady Eidson <beidson@apple.com>
+
+ When a WebsiteDataStore finds no ProcessPools and creates one from scratch, it should represent the data store's config.
+ rdar://problem/26586991 and https://bugs.webkit.org/show_bug.cgi?id=158844
+
+ Reviewed by Anders Carlsson.
+
+ * UIProcess/API/APIProcessPoolConfiguration.cpp:
+ (API::ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration):
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::WebsiteDataStore):
+ (WebKit::WebsiteDataStore::fetchData):
+ (WebKit::WebsiteDataStore::removeData):
+ (WebKit::WebsiteDataStore::processPools):
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+
</ins><span class="cx"> 2016-06-15 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] On iPad, indirect focussing of a text field doesn't always scroll to the correct location
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (202139 => 202140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2016-06-16 21:47:06 UTC (rev 202139)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2016-06-16 22:06:57 UTC (rev 202140)
</span><span class="lines">@@ -56,6 +56,22 @@
</span><span class="cx"> return configuration;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration(const WebKit::WebsiteDataStore::Configuration& legacyConfiguration)
+{
+ auto configuration = ProcessPoolConfiguration::create();
+
+ configuration->m_applicationCacheDirectory = legacyConfiguration.applicationCacheDirectory;
+ configuration->m_applicationCacheFlatFileSubdirectoryName = legacyConfiguration.applicationCacheFlatFileSubdirectoryName;
+ configuration->m_diskCacheDirectory = legacyConfiguration.networkCacheDirectory;
+ configuration->m_mediaCacheDirectory = legacyConfiguration.mediaCacheDirectory;
+ configuration->m_indexedDBDatabaseDirectory = WebKit::WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory();
+ configuration->m_localStorageDirectory = legacyConfiguration.localStorageDirectory;
+ configuration->m_mediaKeysStorageDirectory = legacyConfiguration.mediaKeysStorageDirectory;
+ configuration->m_webSQLDatabaseDirectory = legacyConfiguration.webSQLDatabaseDirectory;
+
+ return configuration;
+}
+
</ins><span class="cx"> ProcessPoolConfiguration::ProcessPoolConfiguration()
</span><span class="cx"> : m_applicationCacheDirectory(WebsiteDataStore::defaultApplicationCacheDirectory())
</span><span class="cx"> , m_applicationCacheFlatFileSubdirectoryName("Files")
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (202139 => 202140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2016-06-16 21:47:06 UTC (rev 202139)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2016-06-16 22:06:57 UTC (rev 202140)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "CacheModel.h"
</span><ins>+#include "WebsiteDataStore.h"
</ins><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -38,7 +39,8 @@
</span><span class="cx"> public:
</span><span class="cx"> static Ref<ProcessPoolConfiguration> create();
</span><span class="cx"> static Ref<ProcessPoolConfiguration> createWithLegacyOptions();
</span><del>-
</del><ins>+ static Ref<ProcessPoolConfiguration> createWithWebsiteDataStoreConfiguration(const WebKit::WebsiteDataStore::Configuration&);
+
</ins><span class="cx"> explicit ProcessPoolConfiguration();
</span><span class="cx"> virtual ~ProcessPoolConfiguration();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (202139 => 202140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-06-16 21:47:06 UTC (rev 202139)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-06-16 22:06:57 UTC (rev 202140)
</span><span class="lines">@@ -76,14 +76,9 @@
</span><span class="cx"> WebsiteDataStore::WebsiteDataStore(Configuration configuration)
</span><span class="cx"> : m_identifier(generateIdentifier())
</span><span class="cx"> , m_sessionID(WebCore::SessionID::defaultSessionID())
</span><del>- , 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))
- , m_mediaKeysStorageDirectory(WTFMove(configuration.mediaKeysStorageDirectory))
- , m_storageManager(StorageManager::create(WTFMove(configuration.localStorageDirectory)))
- , m_resourceLoadStatistics(WebResourceLoadStatisticsStore::create(WTFMove(configuration.resourceLoadStatisticsDirectory)))
</del><ins>+ , m_configuration(WTFMove(configuration))
+ , m_storageManager(StorageManager::create(m_configuration.localStorageDirectory))
+ , m_resourceLoadStatistics(WebResourceLoadStatisticsStore::create(m_configuration.resourceLoadStatisticsDirectory))
</ins><span class="cx"> , m_queue(WorkQueue::create("com.apple.WebKit.WebsiteDataStore"))
</span><span class="cx"> {
</span><span class="cx"> platformInitialize();
</span><span class="lines">@@ -92,6 +87,7 @@
</span><span class="cx"> WebsiteDataStore::WebsiteDataStore(WebCore::SessionID sessionID)
</span><span class="cx"> : m_identifier(generateIdentifier())
</span><span class="cx"> , m_sessionID(sessionID)
</span><ins>+ , m_configuration()
</ins><span class="cx"> , m_queue(WorkQueue::create("com.apple.WebKit.WebsiteDataStore"))
</span><span class="cx"> {
</span><span class="cx"> platformInitialize();
</span><span class="lines">@@ -260,7 +256,7 @@
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::DiskCache)) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- m_queue->dispatch([fetchOptions, mediaCacheDirectory = m_mediaCacheDirectory.isolatedCopy(), callbackAggregator] {
</del><ins>+ m_queue->dispatch([fetchOptions, mediaCacheDirectory = m_configuration.mediaCacheDirectory.isolatedCopy(), callbackAggregator] {
</ins><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> origins = WebCore::HTMLMediaElement::originsInMediaCache(mediaCacheDirectory);
</span><span class="cx"> WebsiteData websiteData;
</span><span class="cx">
</span><span class="lines">@@ -354,7 +350,7 @@
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::OfflineWebApplicationCache) && isPersistent()) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([fetchOptions, applicationCacheDirectory = m_applicationCacheDirectory.isolatedCopy(), applicationCacheFlatFileSubdirectoryName = m_applicationCacheFlatFileSubdirectoryName.isolatedCopy(), callbackAggregator] {
</del><ins>+ m_queue->dispatch([fetchOptions, applicationCacheDirectory = m_configuration.applicationCacheDirectory.isolatedCopy(), applicationCacheFlatFileSubdirectoryName = m_configuration.applicationCacheFlatFileSubdirectoryName.isolatedCopy(), callbackAggregator] {
</ins><span class="cx"> auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory, applicationCacheFlatFileSubdirectoryName);
</span><span class="cx">
</span><span class="cx"> WebsiteData websiteData;
</span><span class="lines">@@ -378,7 +374,7 @@
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::WebSQLDatabases) && isPersistent()) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([webSQLDatabaseDirectory = m_webSQLDatabaseDirectory.isolatedCopy(), callbackAggregator] {
</del><ins>+ m_queue->dispatch([webSQLDatabaseDirectory = m_configuration.webSQLDatabaseDirectory.isolatedCopy(), callbackAggregator] {
</ins><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx"> WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory)->origins(origins);
</span><span class="cx">
</span><span class="lines">@@ -408,7 +404,7 @@
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([mediaKeysStorageDirectory = m_mediaKeysStorageDirectory.isolatedCopy(), callbackAggregator] {
</del><ins>+ m_queue->dispatch([mediaKeysStorageDirectory = m_configuration.mediaKeysStorageDirectory.isolatedCopy(), callbackAggregator] {
</ins><span class="cx"> auto origins = mediaKeyOrigins(mediaKeysStorageDirectory);
</span><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator, origins = WTFMove(origins)]() mutable {
</span><span class="lines">@@ -545,7 +541,7 @@
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::DiskCache)) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- m_queue->dispatch([modifiedSince, mediaCacheDirectory = m_mediaCacheDirectory.isolatedCopy(), callbackAggregator] {
</del><ins>+ m_queue->dispatch([modifiedSince, mediaCacheDirectory = m_configuration.mediaCacheDirectory.isolatedCopy(), callbackAggregator] {
</ins><span class="cx"> WebCore::HTMLMediaElement::clearMediaCache(mediaCacheDirectory, modifiedSince);
</span><span class="cx">
</span><span class="cx"> WTF::RunLoop::main().dispatch([callbackAggregator] {
</span><span class="lines">@@ -623,7 +619,7 @@
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::OfflineWebApplicationCache) && isPersistent()) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([applicationCacheDirectory = m_applicationCacheDirectory.isolatedCopy(), applicationCacheFlatFileSubdirectoryName = m_applicationCacheFlatFileSubdirectoryName.isolatedCopy(), callbackAggregator] {
</del><ins>+ m_queue->dispatch([applicationCacheDirectory = m_configuration.applicationCacheDirectory.isolatedCopy(), applicationCacheFlatFileSubdirectoryName = m_configuration.applicationCacheFlatFileSubdirectoryName.isolatedCopy(), callbackAggregator] {
</ins><span class="cx"> auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory, applicationCacheFlatFileSubdirectoryName);
</span><span class="cx">
</span><span class="cx"> storage->deleteAllCaches();
</span><span class="lines">@@ -637,7 +633,7 @@
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::WebSQLDatabases) && isPersistent()) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([webSQLDatabaseDirectory = m_webSQLDatabaseDirectory.isolatedCopy(), callbackAggregator, modifiedSince] {
</del><ins>+ m_queue->dispatch([webSQLDatabaseDirectory = m_configuration.webSQLDatabaseDirectory.isolatedCopy(), callbackAggregator, modifiedSince] {
</ins><span class="cx"> WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory)->deleteDatabasesModifiedSince(modifiedSince);
</span><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator] {
</span><span class="lines">@@ -662,7 +658,7 @@
</span><span class="cx"> if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><del>- m_queue->dispatch([mediaKeysStorageDirectory = m_mediaKeysStorageDirectory.isolatedCopy(), callbackAggregator, modifiedSince] {
</del><ins>+ m_queue->dispatch([mediaKeysStorageDirectory = m_configuration.mediaKeysStorageDirectory.isolatedCopy(), callbackAggregator, modifiedSince] {
</ins><span class="cx"> removeMediaKeys(mediaKeysStorageDirectory, modifiedSince);
</span><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator] {
</span><span class="lines">@@ -785,7 +781,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO)
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- m_queue->dispatch([origins = WTFMove(origins), mediaCacheDirectory = m_mediaCacheDirectory.isolatedCopy(), callbackAggregator] {
</del><ins>+ m_queue->dispatch([origins = WTFMove(origins), mediaCacheDirectory = m_configuration.mediaCacheDirectory.isolatedCopy(), callbackAggregator] {
</ins><span class="cx"> WebCore::HTMLMediaElement::clearMediaCacheForOrigins(mediaCacheDirectory, origins);
</span><span class="cx">
</span><span class="cx"> WTF::RunLoop::main().dispatch([callbackAggregator] {
</span><span class="lines">@@ -875,7 +871,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- m_queue->dispatch([origins = WTFMove(origins), applicationCacheDirectory = m_applicationCacheDirectory.isolatedCopy(), applicationCacheFlatFileSubdirectoryName = m_applicationCacheFlatFileSubdirectoryName.isolatedCopy(), callbackAggregator] {
</del><ins>+ m_queue->dispatch([origins = WTFMove(origins), applicationCacheDirectory = m_configuration.applicationCacheDirectory.isolatedCopy(), applicationCacheFlatFileSubdirectoryName = m_configuration.applicationCacheFlatFileSubdirectoryName.isolatedCopy(), callbackAggregator] {
</ins><span class="cx"> auto storage = WebCore::ApplicationCacheStorage::create(applicationCacheDirectory, applicationCacheFlatFileSubdirectoryName);
</span><span class="cx">
</span><span class="cx"> for (const auto& origin : origins)
</span><span class="lines">@@ -895,7 +891,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- m_queue->dispatch([origins = WTFMove(origins), callbackAggregator, webSQLDatabaseDirectory = m_webSQLDatabaseDirectory.isolatedCopy()] {
</del><ins>+ m_queue->dispatch([origins = WTFMove(origins), callbackAggregator, webSQLDatabaseDirectory = m_configuration.webSQLDatabaseDirectory.isolatedCopy()] {
</ins><span class="cx"> auto databaseTracker = WebCore::DatabaseTracker::trackerWithDatabasePath(webSQLDatabaseDirectory);
</span><span class="cx">
</span><span class="cx"> for (const auto& origin : origins)
</span><span class="lines">@@ -928,7 +924,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><del>- m_queue->dispatch([mediaKeysStorageDirectory = m_mediaKeysStorageDirectory.isolatedCopy(), callbackAggregator, origins = WTFMove(origins)] {
</del><ins>+ m_queue->dispatch([mediaKeysStorageDirectory = m_configuration.mediaKeysStorageDirectory.isolatedCopy(), callbackAggregator, origins = WTFMove(origins)] {
</ins><span class="cx">
</span><span class="cx"> removeMediaKeys(mediaKeysStorageDirectory, origins);
</span><span class="cx">
</span><span class="lines">@@ -1059,8 +1055,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (processPools.isEmpty()) {
</span><del>- auto processPool = WebProcessPool::create(API::ProcessPoolConfiguration::create());
-
</del><ins>+ auto processPool = WebProcessPool::create(API::ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration(m_configuration));
</ins><span class="cx"> processPools.add(processPool.ptr());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (202139 => 202140)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2016-06-16 21:47:06 UTC (rev 202139)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2016-06-16 22:06:57 UTC (rev 202140)
</span><span class="lines">@@ -117,13 +117,8 @@
</span><span class="cx"> const uint64_t m_identifier;
</span><span class="cx"> const WebCore::SessionID m_sessionID;
</span><span class="cx">
</span><del>- const String m_networkCacheDirectory;
- const String m_applicationCacheDirectory;
- const String m_applicationCacheFlatFileSubdirectoryName;
- const String m_mediaCacheDirectory;
</del><ins>+ const Configuration m_configuration;
</ins><span class="cx">
</span><del>- const String m_webSQLDatabaseDirectory;
- const String m_mediaKeysStorageDirectory;
</del><span class="cx"> const RefPtr<StorageManager> m_storageManager;
</span><span class="cx"> const RefPtr<WebResourceLoadStatisticsStore> m_resourceLoadStatistics;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>