<!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>[185261] trunk</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/185261">185261</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-05 12:27:26 -0700 (Fri, 05 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the application cache directory part of WKContextConfigurationRef
https://bugs.webkit.org/show_bug.cgi?id=145704
Reviewed by Geoffrey Garen.
Source/WebKit2:
* UIProcess/API/APIProcessPoolConfiguration.cpp:
(API::ProcessPoolConfiguration::createWithLegacyOptions):
(API::ProcessPoolConfiguration::ProcessPoolConfiguration):
(API::ProcessPoolConfiguration::copy):
* UIProcess/API/APIProcessPoolConfiguration.h:
* UIProcess/API/C/WKContext.cpp:
(WKContextSetApplicationCacheDirectory): Deleted.
* UIProcess/API/C/WKContextConfigurationRef.cpp:
(WKContextConfigurationCopyApplicationCacheDirectory):
(WKContextConfigurationSetApplicationCacheDirectory):
* UIProcess/API/C/WKContextConfigurationRef.h:
* UIProcess/API/C/WKContextPrivate.h:
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::WebProcessPool):
(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::applicationCacheDirectory): Deleted.
* UIProcess/WebProcessPool.h:
Tools:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):</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="#trunkSourceWebKit2UIProcessAPICWKContextConfigurationRefh">trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h</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>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185260 => 185261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-05 19:08:47 UTC (rev 185260)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-05 19:27:26 UTC (rev 185261)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-06-05 Anders Carlsson <andersca@apple.com>
+
+ Make the application cache directory part of WKContextConfigurationRef
+ https://bugs.webkit.org/show_bug.cgi?id=145704
+
+ Reviewed by Geoffrey Garen.
+
+ * UIProcess/API/APIProcessPoolConfiguration.cpp:
+ (API::ProcessPoolConfiguration::createWithLegacyOptions):
+ (API::ProcessPoolConfiguration::ProcessPoolConfiguration):
+ (API::ProcessPoolConfiguration::copy):
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextSetApplicationCacheDirectory): Deleted.
+ * UIProcess/API/C/WKContextConfigurationRef.cpp:
+ (WKContextConfigurationCopyApplicationCacheDirectory):
+ (WKContextConfigurationSetApplicationCacheDirectory):
+ * UIProcess/API/C/WKContextConfigurationRef.h:
+ * UIProcess/API/C/WKContextPrivate.h:
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::WebProcessPool):
+ (WebKit::WebProcessPool::createNewWebProcess):
+ (WebKit::WebProcessPool::applicationCacheDirectory): Deleted.
+ * UIProcess/WebProcessPool.h:
+
</ins><span class="cx"> 2015-06-05 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> finally blocks should not set the exception stack trace when re-throwing the exception.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (185260 => 185261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-06-05 19:08:47 UTC (rev 185260)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-06-05 19:27:26 UTC (rev 185261)
</span><span class="lines">@@ -44,16 +44,19 @@
</span><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><ins>+
+ configuration->m_applicationCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory();
+ configuration->m_indexedDBDatabaseDirectory = WebKit::WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory();
</ins><span class="cx"> configuration->m_localStorageDirectory = WebKit::WebProcessPool::legacyPlatformDefaultLocalStorageDirectory();
</span><ins>+ configuration->m_mediaKeysStorageDirectory = WebKit::WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory();
</ins><span class="cx"> configuration->m_webSQLDatabaseDirectory = WebKit::WebProcessPool::legacyPlatformDefaultWebSQLDatabaseDirectory();
</span><del>- configuration->m_indexedDBDatabaseDirectory = WebKit::WebProcessPool::legacyPlatformDefaultIndexedDBDatabaseDirectory();
- configuration->m_mediaKeysStorageDirectory = WebKit::WebProcessPool::legacyPlatformDefaultMediaKeysStorageDirectory();
</del><span class="cx">
</span><span class="cx"> return configuration;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ProcessPoolConfiguration::ProcessPoolConfiguration()
</span><del>- : m_indexedDBDatabaseDirectory(WebsiteDataStore::defaultIndexedDBDatabaseDirectory())
</del><ins>+ : m_applicationCacheDirectory(WebsiteDataStore::defaultApplicationCacheDirectory())
+ , m_indexedDBDatabaseDirectory(WebsiteDataStore::defaultIndexedDBDatabaseDirectory())
</ins><span class="cx"> , m_localStorageDirectory(WebsiteDataStore::defaultLocalStorageDirectory())
</span><span class="cx"> , m_webSQLDatabaseDirectory(WebsiteDataStore::defaultWebSQLDatabaseDirectory())
</span><span class="cx"> , m_mediaKeysStorageDirectory(WebsiteDataStore::defaultMediaKeysStorageDirectory())
</span><span class="lines">@@ -74,11 +77,12 @@
</span><span class="cx"> copy->m_maximumProcessCount = this->m_maximumProcessCount;
</span><span class="cx"> copy->m_cacheModel = this->m_cacheModel;
</span><span class="cx"> copy->m_diskCacheSizeOverride = this->m_diskCacheSizeOverride;
</span><ins>+ copy->m_applicationCacheDirectory = this->m_applicationCacheDirectory;
</ins><span class="cx"> copy->m_indexedDBDatabaseDirectory = this->m_indexedDBDatabaseDirectory;
</span><span class="cx"> copy->m_injectedBundlePath = this->m_injectedBundlePath;
</span><span class="cx"> copy->m_localStorageDirectory = this->m_localStorageDirectory;
</span><ins>+ copy->m_mediaKeysStorageDirectory = this->m_mediaKeysStorageDirectory;
</ins><span class="cx"> copy->m_webSQLDatabaseDirectory = this->m_webSQLDatabaseDirectory;
</span><del>- copy->m_mediaKeysStorageDirectory = this->m_mediaKeysStorageDirectory;
</del><span class="cx"> copy->m_cachePartitionedURLSchemes = this->m_cachePartitionedURLSchemes;
</span><span class="cx">
</span><span class="cx"> return copy;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (185260 => 185261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-06-05 19:08:47 UTC (rev 185260)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-06-05 19:27:26 UTC (rev 185261)
</span><span class="lines">@@ -63,6 +63,9 @@
</span><span class="cx"> int64_t diskCacheSizeOverride() const { return m_diskCacheSizeOverride; }
</span><span class="cx"> void setDiskCacheSizeOverride(int64_t size) { m_diskCacheSizeOverride = size; }
</span><span class="cx">
</span><ins>+ WTF::String applicationCacheDirectory() const { return m_applicationCacheDirectory; }
+ void setApplicationCacheDirectory(const WTF::String& applicationCacheDirectory) { m_applicationCacheDirectory = applicationCacheDirectory; }
+
</ins><span class="cx"> WTF::String indexedDBDatabaseDirectory() const { return m_indexedDBDatabaseDirectory; }
</span><span class="cx"> void setIndexedDBDatabaseDirectory(const WTF::String& indexedDBDatabaseDirectory) { m_indexedDBDatabaseDirectory = indexedDBDatabaseDirectory; }
</span><span class="cx">
</span><span class="lines">@@ -89,8 +92,10 @@
</span><span class="cx"> unsigned m_maximumProcessCount { 0 };
</span><span class="cx"> WebKit::CacheModel m_cacheModel { WebKit::CacheModelPrimaryWebBrowser };
</span><span class="cx"> int64_t m_diskCacheSizeOverride { -1 };
</span><ins>+
+ WTF::String m_applicationCacheDirectory;
+ WTF::String m_indexedDBDatabaseDirectory;
</ins><span class="cx"> WTF::String m_injectedBundlePath;
</span><del>- WTF::String m_indexedDBDatabaseDirectory;
</del><span class="cx"> WTF::String m_localStorageDirectory;
</span><span class="cx"> WTF::String m_webSQLDatabaseDirectory;
</span><span class="cx"> WTF::String m_mediaKeysStorageDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (185260 => 185261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-06-05 19:08:47 UTC (rev 185260)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-06-05 19:27:26 UTC (rev 185261)
</span><span class="lines">@@ -504,11 +504,6 @@
</span><span class="cx"> toImpl(contextRef)->allowSpecificHTTPSCertificateForHost(toImpl(certificateRef), toImpl(hostRef)->string());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WK_EXPORT void WKContextSetApplicationCacheDirectory(WKContextRef contextRef, WKStringRef applicationCacheDirectory)
-{
- toImpl(contextRef)->setApplicationCacheDirectory(toImpl(applicationCacheDirectory)->string());
-}
-
</del><span class="cx"> WK_EXPORT void WKContextSetDiskCacheDirectory(WKContextRef contextRef, WKStringRef diskCacheDirectory)
</span><span class="cx"> {
</span><span class="cx"> toImpl(contextRef)->setDiskCacheDirectory(toImpl(diskCacheDirectory)->string());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextConfigurationRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp (185260 => 185261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp 2015-06-05 19:08:47 UTC (rev 185260)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp 2015-06-05 19:27:26 UTC (rev 185261)
</span><span class="lines">@@ -42,6 +42,16 @@
</span><span class="cx"> return toAPI(&configuration.leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WKStringRef WKContextConfigurationCopyApplicationCacheDirectory(WKContextConfigurationRef configuration)
+{
+ return toCopiedAPI(toImpl(configuration)->applicationCacheDirectory());
+}
+
+void WKContextConfigurationSetApplicationCacheDirectory(WKContextConfigurationRef configuration, WKStringRef applicationCacheDirectory)
+{
+ toImpl(configuration)->setApplicationCacheDirectory(toImpl(applicationCacheDirectory)->string());
+}
+
</ins><span class="cx"> WKStringRef WKContextConfigurationCopyIndexedDBDatabaseDirectory(WKContextConfigurationRef configuration)
</span><span class="cx"> {
</span><span class="cx"> return toCopiedAPI(toImpl(configuration)->indexedDBDatabaseDirectory());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextConfigurationRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h (185260 => 185261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h 2015-06-05 19:08:47 UTC (rev 185260)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h 2015-06-05 19:27:26 UTC (rev 185261)
</span><span class="lines">@@ -34,6 +34,9 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKContextConfigurationRef WKContextConfigurationCreate();
</span><span class="cx">
</span><ins>+WK_EXPORT WKStringRef WKContextConfigurationCopyApplicationCacheDirectory(WKContextConfigurationRef configuration);
+WK_EXPORT void WKContextConfigurationSetApplicationCacheDirectory(WKContextConfigurationRef configuration, WKStringRef applicationCacheDirectory);
+
</ins><span class="cx"> WK_EXPORT WKStringRef WKContextConfigurationCopyIndexedDBDatabaseDirectory(WKContextConfigurationRef configuration);
</span><span class="cx"> WK_EXPORT void WKContextConfigurationSetIndexedDBDatabaseDirectory(WKContextConfigurationRef configuration, WKStringRef indexedDBDatabaseDirectory);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h (185260 => 185261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2015-06-05 19:08:47 UTC (rev 185260)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2015-06-05 19:27:26 UTC (rev 185261)
</span><span class="lines">@@ -64,9 +64,6 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKContextAllowSpecificHTTPSCertificateForHost(WKContextRef context, WKCertificateInfoRef certificate, WKStringRef host);
</span><span class="cx">
</span><del>-// FIXME: These functions are only effective if called before the Web process is launched. But
-// we should really change these settings to be on WebPreferences and changeable at runtime.
-WK_EXPORT void WKContextSetApplicationCacheDirectory(WKContextRef context, WKStringRef applicationCacheDirectory);
</del><span class="cx"> WK_EXPORT void WKContextSetDiskCacheDirectory(WKContextRef context, WKStringRef diskCacheDirectory);
</span><span class="cx"> WK_EXPORT void WKContextSetCookieStorageDirectory(WKContextRef context, WKStringRef cookieStorageDirectory);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (185260 => 185261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-06-05 19:08:47 UTC (rev 185260)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-06-05 19:27:26 UTC (rev 185261)
</span><span class="lines">@@ -165,9 +165,10 @@
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain)
</span><span class="cx"> #endif
</span><del>- , m_webSQLDatabaseDirectory(configuration.webSQLDatabaseDirectory())
</del><ins>+ , m_applicationCacheDirectory(configuration.applicationCacheDirectory())
</ins><span class="cx"> , m_indexedDBDatabaseDirectory(configuration.indexedDBDatabaseDirectory())
</span><span class="cx"> , m_mediaKeysStorageDirectory(configuration.mediaKeysStorageDirectory())
</span><ins>+ , m_webSQLDatabaseDirectory(configuration.webSQLDatabaseDirectory())
</ins><span class="cx"> , m_shouldUseTestingNetworkSession(false)
</span><span class="cx"> , m_processTerminationEnabled(true)
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><span class="lines">@@ -609,7 +610,7 @@
</span><span class="cx"> if (!parameters.injectedBundlePath.isEmpty())
</span><span class="cx"> SandboxExtension::createHandle(parameters.injectedBundlePath, SandboxExtension::ReadOnly, parameters.injectedBundlePathExtensionHandle);
</span><span class="cx">
</span><del>- parameters.applicationCacheDirectory = applicationCacheDirectory();
</del><ins>+ parameters.applicationCacheDirectory = m_applicationCacheDirectory;
</ins><span class="cx"> if (!parameters.applicationCacheDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.applicationCacheDirectory, parameters.applicationCacheDirectoryExtensionHandle);
</span><span class="cx">
</span><span class="lines">@@ -1164,14 +1165,6 @@
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::StopMemorySampler());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebProcessPool::applicationCacheDirectory() const
-{
- if (!m_overrideApplicationCacheDirectory.isEmpty())
- return m_overrideApplicationCacheDirectory;
-
- return legacyPlatformDefaultApplicationCacheDirectory();
-}
-
</del><span class="cx"> void WebProcessPool::setIconDatabasePath(const String& path)
</span><span class="cx"> {
</span><span class="cx"> m_overrideIconDatabasePath = path;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (185260 => 185261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-06-05 19:08:47 UTC (rev 185260)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-06-05 19:27:26 UTC (rev 185261)
</span><span class="lines">@@ -243,7 +243,6 @@
</span><span class="cx"> };
</span><span class="cx"> static Statistics& statistics();
</span><span class="cx">
</span><del>- void setApplicationCacheDirectory(const String& dir) { m_overrideApplicationCacheDirectory = dir; }
</del><span class="cx"> void setIconDatabasePath(const String&);
</span><span class="cx"> String iconDatabasePath() const;
</span><span class="cx"> void setDiskCacheDirectory(const String& dir) { m_overrideDiskCacheDirectory = dir; }
</span><span class="lines">@@ -394,8 +393,6 @@
</span><span class="cx"> static void languageChanged(void* context);
</span><span class="cx"> void languageChanged();
</span><span class="cx">
</span><del>- String applicationCacheDirectory() const;
-
</del><span class="cx"> String platformDefaultIconDatabasePath() const;
</span><span class="cx">
</span><span class="cx"> String diskCacheDirectory() const;
</span><span class="lines">@@ -507,14 +504,14 @@
</span><span class="cx"> RetainPtr<NSObject> m_automaticDashSubstitutionNotificationObserver;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- String m_overrideApplicationCacheDirectory;
</del><span class="cx"> String m_overrideIconDatabasePath;
</span><span class="cx"> String m_overrideDiskCacheDirectory;
</span><span class="cx"> String m_overrideCookieStorageDirectory;
</span><span class="cx">
</span><del>- String m_webSQLDatabaseDirectory;
</del><ins>+ String m_applicationCacheDirectory;
</ins><span class="cx"> String m_indexedDBDatabaseDirectory;
</span><span class="cx"> String m_mediaKeysStorageDirectory;
</span><ins>+ String m_webSQLDatabaseDirectory;
</ins><span class="cx">
</span><span class="cx"> bool m_shouldUseTestingNetworkSession;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185260 => 185261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-06-05 19:08:47 UTC (rev 185260)
+++ trunk/Tools/ChangeLog 2015-06-05 19:27:26 UTC (rev 185261)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-05 Anders Carlsson <andersca@apple.com>
+
+ Make the application cache directory part of WKContextConfigurationRef
+ https://bugs.webkit.org/show_bug.cgi?id=145704
+
+ Reviewed by Geoffrey Garen.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize):
+
</ins><span class="cx"> 2015-06-04 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> check-webkit-style should recommend using nullptr instead of recommending using 0 for the null pointer in C++ code.
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (185260 => 185261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-06-05 19:08:47 UTC (rev 185260)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-06-05 19:27:26 UTC (rev 185261)
</span><span class="lines">@@ -358,6 +358,7 @@
</span><span class="cx">
</span><span class="cx"> const char separator = '/';
</span><span class="cx">
</span><ins>+ WKContextConfigurationSetApplicationCacheDirectory(configuration.get(), toWK(temporaryFolder + separator + "ApplicationCache").get());
</ins><span class="cx"> WKContextConfigurationSetIndexedDBDatabaseDirectory(configuration.get(), toWK(temporaryFolder + separator + "Databases" + separator + "IndexedDB").get());
</span><span class="cx"> WKContextConfigurationSetLocalStorageDirectory(configuration.get(), toWK(temporaryFolder + separator + "LocalStorage").get());
</span><span class="cx"> WKContextConfigurationSetWebSQLDatabaseDirectory(configuration.get(), toWK(temporaryFolder + separator + "Databases" + separator + "WebSQL").get());
</span><span class="lines">@@ -377,8 +378,7 @@
</span><span class="cx">
</span><span class="cx"> const char separator = '/';
</span><span class="cx">
</span><del>- // FIXME: These should be migrated to WKContextConfigurationRef.
- WKContextSetApplicationCacheDirectory(m_context.get(), toWK(temporaryFolder + separator + "ApplicationCache").get());
</del><ins>+ // FIXME: This should be migrated to WKContextConfigurationRef.
</ins><span class="cx"> WKContextSetDiskCacheDirectory(m_context.get(), toWK(temporaryFolder + separator + "Cache").get());
</span><span class="cx"> // Disable icon database to avoid fetching <http://127.0.0.1:8000/favicon.ico> and making tests flaky.
</span><span class="cx"> // Invividual tests can enable it using testRunner.setIconDatabaseEnabled, although it's not currently supported in WebKitTestRunner.
</span></span></pre>
</div>
</div>
</body>
</html>