<!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>[168625] 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/168625">168625</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-05-12 10:56:42 -0700 (Mon, 12 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace WKContextSetLocalStorageDirectory with a context configuration getter/setter
https://bugs.webkit.org/show_bug.cgi?id=132809
Reviewed by Dan Bernstein.
Source/WebKit2:
* UIProcess/API/C/WKContext.cpp:
(WKContextSetLocalStorageDirectory): Deleted.
* UIProcess/API/C/WKContextConfigurationRef.cpp:
(WKContextConfigurationCopyLocalStorageDirectory):
(WKContextConfigurationSetLocalStorageDirectory):
* UIProcess/API/C/WKContextConfigurationRef.h:
Add getters and setters for the local storage directory.
* UIProcess/API/C/WKContextPrivate.h:
Remove WKContextSetLocalStorageDirectory.
* UIProcess/API/Cocoa/WKProcessGroup.mm:
(-[WKProcessGroup initWithInjectedBundleURL:]):
Call WebContext::applyPlatformSpecificConfigurationDefaults.
* UIProcess/API/Cocoa/WKProcessPool.mm:
(-[WKProcessPool _initWithConfiguration:]):
Call WebContext::applyPlatformSpecificConfigurationDefaults (for now).
* UIProcess/APIContextConfiguration.cpp:
(API::ContextConfiguration::webContextConfiguration):
Set the local storage. Also, call WebContext::applyPlatformSpecificConfigurationDefaults.
* UIProcess/APIContextConfiguration.h:
(API::ContextConfiguration::injectedBundlePath):
This should be const.
(API::ContextConfiguration::localStorageDirectory):
(API::ContextConfiguration::setLocalStorageDirectory):
Add getter and setter.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::setLocalStorageDirectory):
ASSERT that the path isn't null.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::applyPlatformSpecificConfigurationDefaults):
New helper function that will fill in platform specific defaults for empty parameters.
(WebKit::WebContext::WebContext):
Get the local storage directory from the configuration.
(WebKit::WebContext::setLocalStorageDirectory): Deleted.
(WebKit::WebContext::localStorageDirectory): Deleted.
These are no longer needed.
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformDefaultLocalStorageDirectory):
This should be a static member function.
Tools:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):
Set the local storage directory using WKContextConfigurationSetLocalStorageDirectory.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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="#trunkSourceWebKit2UIProcessAPICocoaWKProcessGroupmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIContextConfigurationcpp">trunk/Source/WebKit2/UIProcess/APIContextConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIContextConfigurationh">trunk/Source/WebKit2/UIProcess/APIContextConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextcpp">trunk/Source/WebKit2/UIProcess/WebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContexth">trunk/Source/WebKit2/UIProcess/WebContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm</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 (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -1,3 +1,61 @@
</span><ins>+2014-05-11 Anders Carlsson <andersca@apple.com>
+
+ Replace WKContextSetLocalStorageDirectory with a context configuration getter/setter
+ https://bugs.webkit.org/show_bug.cgi?id=132809
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextSetLocalStorageDirectory): Deleted.
+
+ * UIProcess/API/C/WKContextConfigurationRef.cpp:
+ (WKContextConfigurationCopyLocalStorageDirectory):
+ (WKContextConfigurationSetLocalStorageDirectory):
+ * UIProcess/API/C/WKContextConfigurationRef.h:
+ Add getters and setters for the local storage directory.
+
+ * UIProcess/API/C/WKContextPrivate.h:
+ Remove WKContextSetLocalStorageDirectory.
+
+ * UIProcess/API/Cocoa/WKProcessGroup.mm:
+ (-[WKProcessGroup initWithInjectedBundleURL:]):
+ Call WebContext::applyPlatformSpecificConfigurationDefaults.
+
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ (-[WKProcessPool _initWithConfiguration:]):
+ Call WebContext::applyPlatformSpecificConfigurationDefaults (for now).
+
+ * UIProcess/APIContextConfiguration.cpp:
+ (API::ContextConfiguration::webContextConfiguration):
+ Set the local storage. Also, call WebContext::applyPlatformSpecificConfigurationDefaults.
+
+ * UIProcess/APIContextConfiguration.h:
+ (API::ContextConfiguration::injectedBundlePath):
+ This should be const.
+
+ (API::ContextConfiguration::localStorageDirectory):
+ (API::ContextConfiguration::setLocalStorageDirectory):
+ Add getter and setter.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::setLocalStorageDirectory):
+ ASSERT that the path isn't null.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::applyPlatformSpecificConfigurationDefaults):
+ New helper function that will fill in platform specific defaults for empty parameters.
+
+ (WebKit::WebContext::WebContext):
+ Get the local storage directory from the configuration.
+
+ (WebKit::WebContext::setLocalStorageDirectory): Deleted.
+ (WebKit::WebContext::localStorageDirectory): Deleted.
+ These are no longer needed.
+
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformDefaultLocalStorageDirectory):
+ This should be a static member function.
+
</ins><span class="cx"> 2014-05-12 Martin Hodovan <mhodovan.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Typo fix in generate-forwarding-headers
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -492,11 +492,6 @@
</span><span class="cx"> toImpl(contextRef)->setDatabaseDirectory(toImpl(databaseDirectory)->string());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKContextSetLocalStorageDirectory(WKContextRef contextRef, WKStringRef localStorageDirectory)
-{
- toImpl(contextRef)->setLocalStorageDirectory(toImpl(localStorageDirectory)->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 (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -45,3 +45,13 @@
</span><span class="cx"> {
</span><span class="cx"> toImpl(configuration)->setInjectedBundlePath(toImpl(injectedBundlePath)->string());
</span><span class="cx"> }
</span><ins>+
+WKStringRef WKContextConfigurationCopyLocalStorageDirectory(WKContextConfigurationRef configuration)
+{
+ return toCopiedAPI(toImpl(configuration)->localStorageDirectory());
+}
+
+void WKContextConfigurationSetLocalStorageDirectory(WKContextConfigurationRef configuration, WKStringRef localStorageDirectory)
+{
+ toImpl(configuration)->setLocalStorageDirectory(toImpl(localStorageDirectory)->string());
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextConfigurationRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -37,6 +37,9 @@
</span><span class="cx"> WK_EXPORT WKStringRef WKContextConfigurationCopyInjectedBundlePath(WKContextConfigurationRef configuration);
</span><span class="cx"> WK_EXPORT void WKContextConfigurationSetInjectedBundlePath(WKContextConfigurationRef configuration, WKStringRef injectedBundlePath);
</span><span class="cx">
</span><ins>+WK_EXPORT WKStringRef WKContextConfigurationCopyLocalStorageDirectory(WKContextConfigurationRef configuration);
+WK_EXPORT void WKContextConfigurationSetLocalStorageDirectory(WKContextConfigurationRef configuration, WKStringRef localStorageDirectory);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -64,7 +64,6 @@
</span><span class="cx"> // we should really change these settings to be on WebPreferences and changeable at runtime.
</span><span class="cx"> WK_EXPORT void WKContextSetApplicationCacheDirectory(WKContextRef context, WKStringRef applicationCacheDirectory);
</span><span class="cx"> WK_EXPORT void WKContextSetDatabaseDirectory(WKContextRef context, WKStringRef databaseDirectory);
</span><del>-WK_EXPORT void WKContextSetLocalStorageDirectory(WKContextRef context, WKStringRef localStorageDirectory);
</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="trunkSourceWebKit2UIProcessAPICocoaWKProcessGroupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -192,6 +192,8 @@
</span><span class="cx"> WebContextConfiguration webContextConfiguration;
</span><span class="cx"> webContextConfiguration.injectedBundlePath = bundleURL ? String(bundleURL.path) : String();
</span><span class="cx">
</span><ins>+ WebContext::applyPlatformSpecificConfigurationDefaults(webContextConfiguration);
+
</ins><span class="cx"> _context = WebContext::create(std::move(webContextConfiguration));
</span><span class="cx">
</span><span class="cx"> setUpConnectionClient(self, toAPI(_context.get()));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -125,6 +125,9 @@
</span><span class="cx"> webContextConfiguration.injectedBundlePath = bundleURL.path;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // FIXME: These are legacy configuration defaults and should not be applied when creating a WKProcessPool.
+ WebKit::WebContext::applyPlatformSpecificConfigurationDefaults(webContextConfiguration);
+
</ins><span class="cx"> API::Object::constructInWrapper<WebKit::WebContext>(self, std::move(webContextConfiguration));
</span><span class="cx"> _context->setHistoryClient(std::make_unique<WebKit::HistoryClient>());
</span><span class="cx"> _context->setUsesNetworkProcess(true);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIContextConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/APIContextConfiguration.cpp (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/APIContextConfiguration.cpp 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/UIProcess/APIContextConfiguration.cpp 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "APIContextConfiguration.h"
</span><span class="cx">
</span><span class="cx"> #include "WebContext.h"
</span><ins>+
</ins><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="cx"> ContextConfiguration::ContextConfiguration()
</span><span class="lines">@@ -42,7 +43,10 @@
</span><span class="cx"> WebKit::WebContextConfiguration configuration;
</span><span class="cx">
</span><span class="cx"> configuration.injectedBundlePath = m_injectedBundlePath;
</span><ins>+ configuration.localStorageDirectory = m_localStorageDirectory;
</ins><span class="cx">
</span><ins>+ WebKit::WebContext::applyPlatformSpecificConfigurationDefaults(configuration);
+
</ins><span class="cx"> return configuration;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIContextConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/APIContextConfiguration.h (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/APIContextConfiguration.h 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/UIProcess/APIContextConfiguration.h 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -43,15 +43,19 @@
</span><span class="cx"> }
</span><span class="cx"> virtual ~ContextConfiguration();
</span><span class="cx">
</span><del>- String injectedBundlePath() { return m_injectedBundlePath; }
</del><ins>+ String injectedBundlePath() const { return m_injectedBundlePath; }
</ins><span class="cx"> void setInjectedBundlePath(const String& injectedBundlePath) { m_injectedBundlePath = injectedBundlePath; }
</span><span class="cx">
</span><ins>+ String localStorageDirectory() const { return m_localStorageDirectory; }
+ void setLocalStorageDirectory(const String& localStorageDirectory) { m_localStorageDirectory = localStorageDirectory; }
+
</ins><span class="cx"> WebKit::WebContextConfiguration webContextConfiguration() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> ContextConfiguration();
</span><span class="cx">
</span><span class="cx"> String m_injectedBundlePath;
</span><ins>+ String m_localStorageDirectory;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace API
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -387,6 +387,8 @@
</span><span class="cx">
</span><span class="cx"> void StorageManager::setLocalStorageDirectory(const String& localStorageDirectory)
</span><span class="cx"> {
</span><ins>+ ASSERT(!localStorageDirectory.isNull());
+
</ins><span class="cx"> m_localStorageDatabaseTracker->setLocalStorageDirectory(localStorageDirectory);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -117,6 +117,15 @@
</span><span class="cx">
</span><span class="cx"> DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, webContextCounter, ("WebContext"));
</span><span class="cx">
</span><ins>+void WebContext::applyPlatformSpecificConfigurationDefaults(WebContextConfiguration& configuration)
+{
+ // FIXME: This function should not be needed; all ports should make sure that the configuration has the right
+ // values, and then we should get rid of the platform specific defaults inside WebContext.
+
+ if (!configuration.localStorageDirectory)
+ configuration.localStorageDirectory = platformDefaultLocalStorageDirectory();
+}
+
</ins><span class="cx"> PassRefPtr<WebContext> WebContext::create(WebContextConfiguration configuration)
</span><span class="cx"> {
</span><span class="cx"> InitializeWebKit2();
</span><span class="lines">@@ -214,7 +223,7 @@
</span><span class="cx"> webContextCounter.increment();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_storageManager->setLocalStorageDirectory(localStorageDirectory());
</del><ins>+ m_storageManager->setLocalStorageDirectory(configuration.localStorageDirectory);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(COCOA)
</span><span class="lines">@@ -1139,20 +1148,6 @@
</span><span class="cx"> return platformDefaultIconDatabasePath();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebContext::setLocalStorageDirectory(const String& directory)
-{
- m_overrideLocalStorageDirectory = directory;
- m_storageManager->setLocalStorageDirectory(localStorageDirectory());
-}
-
-String WebContext::localStorageDirectory() const
-{
- if (!m_overrideLocalStorageDirectory.isEmpty())
- return m_overrideLocalStorageDirectory;
-
- return platformDefaultLocalStorageDirectory();
-}
-
</del><span class="cx"> String WebContext::diskCacheDirectory() const
</span><span class="cx"> {
</span><span class="cx"> if (!m_overrideDiskCacheDirectory.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx">
</span><span class="cx"> struct WebContextConfiguration {
</span><span class="cx"> String injectedBundlePath;
</span><ins>+ String localStorageDirectory;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class WebContext : public API::ObjectImpl<API::Object::Type::Context>, private IPC::MessageReceiver
</span><span class="lines">@@ -105,6 +106,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> public:
</span><ins>+ static void applyPlatformSpecificConfigurationDefaults(WebContextConfiguration&);
+
</ins><span class="cx"> WebContext(WebContextConfiguration);
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<WebContext> create(WebContextConfiguration);
</span><span class="lines">@@ -243,7 +246,6 @@
</span><span class="cx"> void setDatabaseDirectory(const String& dir) { m_overrideDatabaseDirectory = dir; }
</span><span class="cx"> void setIconDatabasePath(const String&);
</span><span class="cx"> String iconDatabasePath() const;
</span><del>- void setLocalStorageDirectory(const String&);
</del><span class="cx"> void setDiskCacheDirectory(const String& dir) { m_overrideDiskCacheDirectory = dir; }
</span><span class="cx"> void setCookieStorageDirectory(const String& dir) { m_overrideCookieStorageDirectory = dir; }
</span><span class="cx">
</span><span class="lines">@@ -412,8 +414,7 @@
</span><span class="cx">
</span><span class="cx"> String platformDefaultIconDatabasePath() const;
</span><span class="cx">
</span><del>- String localStorageDirectory() const;
- String platformDefaultLocalStorageDirectory() const;
</del><ins>+ static String platformDefaultLocalStorageDirectory();
</ins><span class="cx">
</span><span class="cx"> String diskCacheDirectory() const;
</span><span class="cx"> String platformDefaultDiskCacheDirectory() const;
</span><span class="lines">@@ -515,7 +516,6 @@
</span><span class="cx"> String m_overrideApplicationCacheDirectory;
</span><span class="cx"> String m_overrideDatabaseDirectory;
</span><span class="cx"> String m_overrideIconDatabasePath;
</span><del>- String m_overrideLocalStorageDirectory;
</del><span class="cx"> String m_overrideDiskCacheDirectory;
</span><span class="cx"> String m_overrideCookieStorageDirectory;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> return [databasesDirectory stringByStandardizingPath];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::platformDefaultLocalStorageDirectory() const
</del><ins>+String WebContext::platformDefaultLocalStorageDirectory()
</ins><span class="cx"> {
</span><span class="cx"> NSString *localStorageDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebStorageDirectoryDefaultsKey];
</span><span class="cx"> if (!localStorageDirectory || ![localStorageDirectory isKindOfClass:[NSString class]])
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Tools/ChangeLog 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-05-11 Anders Carlsson <andersca@apple.com>
+
+ Replace WKContextSetLocalStorageDirectory with a context configuration getter/setter
+ https://bugs.webkit.org/show_bug.cgi?id=132809
+
+ Reviewed by Dan Bernstein.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize):
+ Set the local storage directory using WKContextConfigurationSetLocalStorageDirectory.
+
</ins><span class="cx"> 2014-05-12 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(CMAKE): [GTK] JavaScriptCore API tests are not built anymore
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (168624 => 168625)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-05-12 17:56:17 UTC (rev 168624)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-05-12 17:56:42 UTC (rev 168625)
</span><span class="lines">@@ -330,6 +330,14 @@
</span><span class="cx"> auto configuration = adoptWK(WKContextConfigurationCreate());
</span><span class="cx"> WKContextConfigurationSetInjectedBundlePath(configuration.get(), injectedBundlePath());
</span><span class="cx">
</span><ins>+ if (const char* dumpRenderTreeTemp = libraryPathForTesting()) {
+ String temporaryFolder = String::fromUTF8(dumpRenderTreeTemp);
+
+ const char separator = '/';
+
+ WKContextConfigurationSetLocalStorageDirectory(configuration.get(), toWK(temporaryFolder + separator + "LocalStorage").get());
+ }
+
</ins><span class="cx"> m_context = adoptWK(WKContextCreateWithConfiguration(configuration.get()));
</span><span class="cx"> m_geolocationProvider = adoptPtr(new GeolocationProviderMock(m_context.get()));
</span><span class="cx">
</span><span class="lines">@@ -341,13 +349,11 @@
</span><span class="cx"> if (const char* dumpRenderTreeTemp = libraryPathForTesting()) {
</span><span class="cx"> String temporaryFolder = String::fromUTF8(dumpRenderTreeTemp);
</span><span class="cx">
</span><del>- // WebCore::pathByAppendingComponent is not used here because of the namespace,
- // which leads us to this ugly #ifdef and file path concatenation.
</del><span class="cx"> const char separator = '/';
</span><span class="cx">
</span><ins>+ // FIXME: These should be migrated to WKContextConfigurationRef.
</ins><span class="cx"> WKContextSetApplicationCacheDirectory(m_context.get(), toWK(temporaryFolder + separator + "ApplicationCache").get());
</span><span class="cx"> WKContextSetDatabaseDirectory(m_context.get(), toWK(temporaryFolder + separator + "Databases").get());
</span><del>- WKContextSetLocalStorageDirectory(m_context.get(), toWK(temporaryFolder + separator + "LocalStorage").get());
</del><span class="cx"> WKContextSetDiskCacheDirectory(m_context.get(), toWK(temporaryFolder + separator + "Cache").get());
</span><span class="cx"> WKContextSetCookieStorageDirectory(m_context.get(), toWK(temporaryFolder + separator + "Cookies").get());
</span><span class="cx"> WKContextSetIconDatabasePath(m_context.get(), toWK(temporaryFolder + separator + "IconDatabase" + separator + "WebpageIcons.db").get());
</span></span></pre>
</div>
</div>
</body>
</html>