<!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>[168999] 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/168999">168999</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-05-17 15:31:02 -0700 (Sat, 17 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace WKContextSetDatabaseDirectory with two WKContextConfiguration parameters
https://bugs.webkit.org/show_bug.cgi?id=133033
<rdar://problem/16830143>
Reviewed by Sam Weinig.
Source/WebKit2:
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
Rename databaseDirectory to webSQLDatabaseDirectory to better indicate the directory type.
* UIProcess/API/C/WKContext.cpp:
(WKContextSetDatabaseDirectory): Deleted.
This is no longer needed.
* UIProcess/API/C/WKContextConfigurationRef.cpp:
(WKContextConfigurationCopyIndexedDBDatabaseDirectory):
(WKContextConfigurationSetIndexedDBDatabaseDirectory):
(WKContextConfigurationCopyWebSQLDatabaseDirectory):
(WKContextConfigurationSetWebSQLDatabaseDirectory):
* UIProcess/API/C/WKContextConfigurationRef.h:
Add setters and getters.
* UIProcess/API/C/WKContextPrivate.h:
Remove WKContextSetDatabaseDirectory.
* UIProcess/APIContextConfiguration.cpp:
(API::ContextConfiguration::webContextConfiguration):
Set m_indexedDBDatabaseDirectory and m_webSQLDatabaseDirectory on the configuration.
* UIProcess/APIContextConfiguration.h:
(API::ContextConfiguration::indexedDBDatabaseDirectory):
(API::ContextConfiguration::setIndexedDBDatabaseDirectory):
(API::ContextConfiguration::webSQLDatabaseDirectory):
(API::ContextConfiguration::setWebSQLDatabaseDirectory):
Add getters and setters to the C++ part of WKContextConfigurationRef.
* UIProcess/WebContext.cpp:
(WebKit::WebContext::applyPlatformSpecificConfigurationDefaults):
Set webSQLDatabaseDirectory and indexedDBDatabaseDirectory.
(WebKit::WebContext::WebContext):
Initialize m_webSQLDatabaseDirectory and m_indexedDBDatabaseDirectory.
(WebKit::WebContext::ensureDatabaseProcess):
Set parameters.indexedDatabaseDirectory from m_indexedDBDatabaseDirectory.
(WebKit::WebContext::createNewWebProcess):
Set parameters.webSQLDatabaseDirectory from m_webSQLDatabaseDirectory.
* UIProcess/mac/WebContextMac.mm:
(WebKit::WebContext::platformDefaultWebSQLDatabaseDirectory):
Rename this to indicate that it's about WebSQL databases.
(WebKit::WebContext::platformDefaultIndexedDBDatabaseDirectory):
Add this.
* WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
(WebKit::WebDatabaseManager::initialize):
Update for WebProcessCreationParameters rename.
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::platformInitializeWebProcess):
Update for WebProcessCreationParameters rename.
Tools:
Set up the WebSQL and IndexedDB directories.
* 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="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.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="#trunkSourceWebKit2UIProcessAPIContextConfigurationcpp">trunk/Source/WebKit2/UIProcess/APIContextConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIContextConfigurationh">trunk/Source/WebKit2/UIProcess/APIContextConfiguration.h</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="#trunkSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagercpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.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 (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -1,3 +1,71 @@
</span><ins>+2014-05-17 Anders Carlsson <andersca@apple.com>
+
+ Replace WKContextSetDatabaseDirectory with two WKContextConfiguration parameters
+ https://bugs.webkit.org/show_bug.cgi?id=133033
+ <rdar://problem/16830143>
+
+ Reviewed by Sam Weinig.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ Rename databaseDirectory to webSQLDatabaseDirectory to better indicate the directory type.
+
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextSetDatabaseDirectory): Deleted.
+ This is no longer needed.
+
+ * UIProcess/API/C/WKContextConfigurationRef.cpp:
+ (WKContextConfigurationCopyIndexedDBDatabaseDirectory):
+ (WKContextConfigurationSetIndexedDBDatabaseDirectory):
+ (WKContextConfigurationCopyWebSQLDatabaseDirectory):
+ (WKContextConfigurationSetWebSQLDatabaseDirectory):
+ * UIProcess/API/C/WKContextConfigurationRef.h:
+ Add setters and getters.
+
+ * UIProcess/API/C/WKContextPrivate.h:
+ Remove WKContextSetDatabaseDirectory.
+
+ * UIProcess/APIContextConfiguration.cpp:
+ (API::ContextConfiguration::webContextConfiguration):
+ Set m_indexedDBDatabaseDirectory and m_webSQLDatabaseDirectory on the configuration.
+
+ * UIProcess/APIContextConfiguration.h:
+ (API::ContextConfiguration::indexedDBDatabaseDirectory):
+ (API::ContextConfiguration::setIndexedDBDatabaseDirectory):
+ (API::ContextConfiguration::webSQLDatabaseDirectory):
+ (API::ContextConfiguration::setWebSQLDatabaseDirectory):
+ Add getters and setters to the C++ part of WKContextConfigurationRef.
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebContext::applyPlatformSpecificConfigurationDefaults):
+ Set webSQLDatabaseDirectory and indexedDBDatabaseDirectory.
+
+ (WebKit::WebContext::WebContext):
+ Initialize m_webSQLDatabaseDirectory and m_indexedDBDatabaseDirectory.
+
+ (WebKit::WebContext::ensureDatabaseProcess):
+ Set parameters.indexedDatabaseDirectory from m_indexedDBDatabaseDirectory.
+
+ (WebKit::WebContext::createNewWebProcess):
+ Set parameters.webSQLDatabaseDirectory from m_webSQLDatabaseDirectory.
+
+ * UIProcess/mac/WebContextMac.mm:
+ (WebKit::WebContext::platformDefaultWebSQLDatabaseDirectory):
+ Rename this to indicate that it's about WebSQL databases.
+
+ (WebKit::WebContext::platformDefaultIndexedDBDatabaseDirectory):
+ Add this.
+
+ * WebProcess/WebCoreSupport/WebDatabaseManager.cpp:
+ (WebKit::WebDatabaseManager::initialize):
+ Update for WebProcessCreationParameters rename.
+
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+ Update for WebProcessCreationParameters rename.
+
</ins><span class="cx"> 2014-05-17 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Phone Number Detection] drop-down menu in the phone number detection box doesn't appear.
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -60,8 +60,8 @@
</span><span class="cx"> encoder << injectedBundlePathExtensionHandle;
</span><span class="cx"> encoder << applicationCacheDirectory;
</span><span class="cx"> encoder << applicationCacheDirectoryExtensionHandle;
</span><del>- encoder << databaseDirectory;
- encoder << databaseDirectoryExtensionHandle;
</del><ins>+ encoder << webSQLDatabaseDirectory;
+ encoder << webSQLDatabaseDirectoryExtensionHandle;
</ins><span class="cx"> encoder << diskCacheDirectory;
</span><span class="cx"> encoder << diskCacheDirectoryExtensionHandle;
</span><span class="cx"> encoder << cookieStorageDirectory;
</span><span class="lines">@@ -146,9 +146,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.applicationCacheDirectoryExtensionHandle))
</span><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.databaseDirectory))
</del><ins>+ if (!decoder.decode(parameters.webSQLDatabaseDirectory))
</ins><span class="cx"> return false;
</span><del>- if (!decoder.decode(parameters.databaseDirectoryExtensionHandle))
</del><ins>+ if (!decoder.decode(parameters.webSQLDatabaseDirectoryExtensionHandle))
</ins><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.diskCacheDirectory))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -66,8 +66,8 @@
</span><span class="cx">
</span><span class="cx"> String applicationCacheDirectory;
</span><span class="cx"> SandboxExtension::Handle applicationCacheDirectoryExtensionHandle;
</span><del>- String databaseDirectory;
- SandboxExtension::Handle databaseDirectoryExtensionHandle;
</del><ins>+ String webSQLDatabaseDirectory;
+ SandboxExtension::Handle webSQLDatabaseDirectoryExtensionHandle;
</ins><span class="cx"> String diskCacheDirectory;
</span><span class="cx"> SandboxExtension::Handle diskCacheDirectoryExtensionHandle;
</span><span class="cx"> String cookieStorageDirectory;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -487,11 +487,6 @@
</span><span class="cx"> toImpl(contextRef)->setApplicationCacheDirectory(toImpl(applicationCacheDirectory)->string());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKContextSetDatabaseDirectory(WKContextRef contextRef, WKStringRef databaseDirectory)
-{
- toImpl(contextRef)->setDatabaseDirectory(toImpl(databaseDirectory)->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 (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.cpp 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -36,6 +36,16 @@
</span><span class="cx"> return toAPI(API::ContextConfiguration::create().leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WKStringRef WKContextConfigurationCopyIndexedDBDatabaseDirectory(WKContextConfigurationRef configuration)
+{
+ return toCopiedAPI(toImpl(configuration)->indexedDBDatabaseDirectory());
+}
+
+void WKContextConfigurationSetIndexedDBDatabaseDirectory(WKContextConfigurationRef configuration, WKStringRef indexedDBDatabaseDirectory)
+{
+ toImpl(configuration)->setIndexedDBDatabaseDirectory(toImpl(indexedDBDatabaseDirectory)->string());
+}
+
</ins><span class="cx"> WKStringRef WKContextConfigurationCopyInjectedBundlePath(WKContextConfigurationRef configuration)
</span><span class="cx"> {
</span><span class="cx"> return toCopiedAPI(toImpl(configuration)->injectedBundlePath());
</span><span class="lines">@@ -55,3 +65,13 @@
</span><span class="cx"> {
</span><span class="cx"> toImpl(configuration)->setLocalStorageDirectory(toImpl(localStorageDirectory)->string());
</span><span class="cx"> }
</span><ins>+
+WKStringRef WKContextConfigurationCopyWebSQLDatabaseDirectory(WKContextConfigurationRef configuration)
+{
+ return toCopiedAPI(toImpl(configuration)->webSQLDatabaseDirectory());
+}
+
+void WKContextConfigurationSetWebSQLDatabaseDirectory(WKContextConfigurationRef configuration, WKStringRef webSQLDatabaseDirectory)
+{
+ toImpl(configuration)->setWebSQLDatabaseDirectory(toImpl(webSQLDatabaseDirectory)->string());
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextConfigurationRefh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextConfigurationRef.h 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -34,12 +34,18 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT WKContextConfigurationRef WKContextConfigurationCreate();
</span><span class="cx">
</span><ins>+WK_EXPORT WKStringRef WKContextConfigurationCopyIndexedDBDatabaseDirectory(WKContextConfigurationRef configuration);
+WK_EXPORT void WKContextConfigurationSetIndexedDBDatabaseDirectory(WKContextConfigurationRef configuration, WKStringRef indexedDBDatabaseDirectory);
+
</ins><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><span class="cx"> WK_EXPORT WKStringRef WKContextConfigurationCopyLocalStorageDirectory(WKContextConfigurationRef configuration);
</span><span class="cx"> WK_EXPORT void WKContextConfigurationSetLocalStorageDirectory(WKContextConfigurationRef configuration, WKStringRef localStorageDirectory);
</span><span class="cx">
</span><ins>+WK_EXPORT WKStringRef WKContextConfigurationCopyWebSQLDatabaseDirectory(WKContextConfigurationRef configuration);
+WK_EXPORT void WKContextConfigurationSetWebSQLDatabaseDirectory(WKContextConfigurationRef configuration, WKStringRef webSQLDatabaseDirectory);
+
</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 (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -63,7 +63,6 @@
</span><span class="cx"> // FIXME: These functions are only effective if called before the Web process is launched. But
</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><del>-WK_EXPORT void WKContextSetDatabaseDirectory(WKContextRef context, WKStringRef databaseDirectory);
</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="trunkSourceWebKit2UIProcessAPIContextConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/APIContextConfiguration.cpp (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/APIContextConfiguration.cpp 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/UIProcess/APIContextConfiguration.cpp 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -42,8 +42,10 @@
</span><span class="cx"> {
</span><span class="cx"> WebKit::WebContextConfiguration configuration;
</span><span class="cx">
</span><ins>+ configuration.indexedDBDatabaseDirectory = m_indexedDBDatabaseDirectory;
</ins><span class="cx"> configuration.injectedBundlePath = m_injectedBundlePath;
</span><span class="cx"> configuration.localStorageDirectory = m_localStorageDirectory;
</span><ins>+ configuration.webSQLDatabaseDirectory = m_webSQLDatabaseDirectory;
</ins><span class="cx">
</span><span class="cx"> WebKit::WebContext::applyPlatformSpecificConfigurationDefaults(configuration);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIContextConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/APIContextConfiguration.h (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/APIContextConfiguration.h 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/UIProcess/APIContextConfiguration.h 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -43,19 +43,27 @@
</span><span class="cx"> }
</span><span class="cx"> virtual ~ContextConfiguration();
</span><span class="cx">
</span><ins>+ String indexedDBDatabaseDirectory() const { return m_indexedDBDatabaseDirectory; }
+ void setIndexedDBDatabaseDirectory(const String& indexedDBDatabaseDirectory) { m_indexedDBDatabaseDirectory = indexedDBDatabaseDirectory; }
+
</ins><span class="cx"> String injectedBundlePath() const { return m_injectedBundlePath; }
</span><span class="cx"> void setInjectedBundlePath(const String& injectedBundlePath) { m_injectedBundlePath = injectedBundlePath; }
</span><span class="cx">
</span><span class="cx"> String localStorageDirectory() const { return m_localStorageDirectory; }
</span><span class="cx"> void setLocalStorageDirectory(const String& localStorageDirectory) { m_localStorageDirectory = localStorageDirectory; }
</span><span class="cx">
</span><ins>+ String webSQLDatabaseDirectory() const { return m_webSQLDatabaseDirectory; }
+ void setWebSQLDatabaseDirectory(const String& webSQLDatabaseDirectory) { m_webSQLDatabaseDirectory = webSQLDatabaseDirectory; }
+
</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><ins>+ String m_indexedDBDatabaseDirectory;
</ins><span class="cx"> String m_injectedBundlePath;
</span><span class="cx"> String m_localStorageDirectory;
</span><ins>+ String m_webSQLDatabaseDirectory;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace API
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -124,6 +124,12 @@
</span><span class="cx">
</span><span class="cx"> if (!configuration.localStorageDirectory)
</span><span class="cx"> configuration.localStorageDirectory = platformDefaultLocalStorageDirectory();
</span><ins>+
+ if (!configuration.webSQLDatabaseDirectory)
+ configuration.webSQLDatabaseDirectory = platformDefaultWebSQLDatabaseDirectory();
+
+ if (!configuration.indexedDBDatabaseDirectory)
+ configuration.indexedDBDatabaseDirectory = platformDefaultIndexedDBDatabaseDirectory();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<WebContext> WebContext::create(WebContextConfiguration configuration)
</span><span class="lines">@@ -164,6 +170,8 @@
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain)
</span><span class="cx"> #endif
</span><ins>+ , m_webSQLDatabaseDirectory(std::move(configuration.webSQLDatabaseDirectory))
+ , m_indexedDBDatabaseDirectory(std::move(configuration.indexedDBDatabaseDirectory))
</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">@@ -449,13 +457,11 @@
</span><span class="cx">
</span><span class="cx"> m_databaseProcess = DatabaseProcessProxy::create(this);
</span><span class="cx">
</span><ins>+ ASSERT(!m_indexedDBDatabaseDirectory.isEmpty());
+
</ins><span class="cx"> DatabaseProcessCreationParameters parameters;
</span><ins>+ parameters.indexedDatabaseDirectory = m_indexedDBDatabaseDirectory;
</ins><span class="cx">
</span><del>- // Indexed databases exist in a subdirectory of the "database directory path."
- // Currently, the top level of that directory contains entities related to WebSQL databases.
- // We should fix this, and move WebSQL into a subdirectory (https://bugs.webkit.org/show_bug.cgi?id=124807)
- // In the meantime, an entity name prefixed with three underscores will not conflict with any WebSQL entities.
- parameters.indexedDatabaseDirectory = pathByAppendingComponent(databaseDirectory(), "___IndexedDB");
</del><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.indexedDatabaseDirectory, parameters.indexedDatabaseDirectoryExtensionHandle);
</span><span class="cx">
</span><span class="cx"> m_databaseProcess->send(Messages::DatabaseProcess::InitializeDatabaseProcess(parameters), 0);
</span><span class="lines">@@ -565,9 +571,9 @@
</span><span class="cx"> if (!parameters.applicationCacheDirectory.isEmpty())
</span><span class="cx"> SandboxExtension::createHandleForReadWriteDirectory(parameters.applicationCacheDirectory, parameters.applicationCacheDirectoryExtensionHandle);
</span><span class="cx">
</span><del>- parameters.databaseDirectory = databaseDirectory();
- if (!parameters.databaseDirectory.isEmpty())
- SandboxExtension::createHandleForReadWriteDirectory(parameters.databaseDirectory, parameters.databaseDirectoryExtensionHandle);
</del><ins>+ parameters.webSQLDatabaseDirectory = m_webSQLDatabaseDirectory;
+ if (!parameters.webSQLDatabaseDirectory.isEmpty())
+ SandboxExtension::createHandleForReadWriteDirectory(parameters.webSQLDatabaseDirectory, parameters.webSQLDatabaseDirectoryExtensionHandle);
</ins><span class="cx">
</span><span class="cx"> parameters.diskCacheDirectory = diskCacheDirectory();
</span><span class="cx"> if (!parameters.diskCacheDirectory.isEmpty())
</span><span class="lines">@@ -1124,14 +1130,6 @@
</span><span class="cx"> return platformDefaultApplicationCacheDirectory();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::databaseDirectory() const
-{
- if (!m_overrideDatabaseDirectory.isEmpty())
- return m_overrideDatabaseDirectory;
-
- return platformDefaultDatabaseDirectory();
-}
-
</del><span class="cx"> void WebContext::setIconDatabasePath(const String& path)
</span><span class="cx"> {
</span><span class="cx"> m_overrideIconDatabasePath = path;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContext.h 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -98,6 +98,8 @@
</span><span class="cx"> struct WebContextConfiguration {
</span><span class="cx"> String injectedBundlePath;
</span><span class="cx"> String localStorageDirectory;
</span><ins>+ String webSQLDatabaseDirectory;
+ String indexedDBDatabaseDirectory;
</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">@@ -243,7 +245,6 @@
</span><span class="cx"> static Statistics& statistics();
</span><span class="cx">
</span><span class="cx"> void setApplicationCacheDirectory(const String& dir) { m_overrideApplicationCacheDirectory = dir; }
</span><del>- void setDatabaseDirectory(const String& dir) { m_overrideDatabaseDirectory = 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">@@ -409,12 +410,11 @@
</span><span class="cx"> String applicationCacheDirectory() const;
</span><span class="cx"> String platformDefaultApplicationCacheDirectory() const;
</span><span class="cx">
</span><del>- String databaseDirectory() const;
- String platformDefaultDatabaseDirectory() const;
-
</del><span class="cx"> String platformDefaultIconDatabasePath() const;
</span><span class="cx">
</span><span class="cx"> static String platformDefaultLocalStorageDirectory();
</span><ins>+ static String platformDefaultIndexedDBDatabaseDirectory();
+ static String platformDefaultWebSQLDatabaseDirectory();
</ins><span class="cx">
</span><span class="cx"> String diskCacheDirectory() const;
</span><span class="cx"> String platformDefaultDiskCacheDirectory() const;
</span><span class="lines">@@ -514,11 +514,13 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> String m_overrideApplicationCacheDirectory;
</span><del>- String m_overrideDatabaseDirectory;
</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><ins>+ String m_webSQLDatabaseDirectory;
+ String m_indexedDBDatabaseDirectory;
+
</ins><span class="cx"> bool m_shouldUseTestingNetworkSession;
</span><span class="cx">
</span><span class="cx"> bool m_processTerminationEnabled;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMac.mm 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> return [@"" stringByStandardizingPath];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String WebContext::platformDefaultDatabaseDirectory() const
</del><ins>+String WebContext::platformDefaultWebSQLDatabaseDirectory()
</ins><span class="cx"> {
</span><span class="cx"> NSString *databasesDirectory = [[NSUserDefaults standardUserDefaults] objectForKey:WebDatabaseDirectoryDefaultsKey];
</span><span class="cx"> if (!databasesDirectory || ![databasesDirectory isKindOfClass:[NSString class]])
</span><span class="lines">@@ -267,6 +267,15 @@
</span><span class="cx"> return [databasesDirectory stringByStandardizingPath];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String WebContext::platformDefaultIndexedDBDatabaseDirectory()
+{
+ // Indexed databases exist in a subdirectory of the "database directory path."
+ // Currently, the top level of that directory contains entities related to WebSQL databases.
+ // We should fix this, and move WebSQL into a subdirectory (https://bugs.webkit.org/show_bug.cgi?id=124807)
+ // In the meantime, an entity name prefixed with three underscores will not conflict with any WebSQL entities.
+ return pathByAppendingComponent(platformDefaultWebSQLDatabaseDirectory(), "___IndexedDB");
+}
+
</ins><span class="cx"> String WebContext::platformDefaultIconDatabasePath() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: <rdar://problem/9138817> - After this "backwards compatibility" radar is removed, this code should be removed to only return an empty String.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDatabaseManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDatabaseManager.cpp 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx">
</span><span class="cx"> void WebDatabaseManager::initialize(const WebProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><del>- DatabaseManager::manager().initialize(parameters.databaseDirectory);
</del><ins>+ DatabaseManager::manager().initialize(parameters.webSQLDatabaseDirectory);
</ins><span class="cx"> DatabaseManager::manager().setClient(this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SANDBOX_EXTENSIONS)
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.uiProcessBundleResourcePathExtensionHandle);
</span><del>- SandboxExtension::consumePermanently(parameters.databaseDirectoryExtensionHandle);
</del><ins>+ SandboxExtension::consumePermanently(parameters.webSQLDatabaseDirectoryExtensionHandle);
</ins><span class="cx"> SandboxExtension::consumePermanently(parameters.applicationCacheDirectoryExtensionHandle);
</span><span class="cx"> SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Tools/ChangeLog 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-17 Anders Carlsson <andersca@apple.com>
+
+ Replace WKContextSetDatabaseDirectory with two WKContextConfiguration parameters
+ https://bugs.webkit.org/show_bug.cgi?id=133033
+ <rdar://problem/16830143>
+
+ Reviewed by Sam Weinig.
+
+ Set up the WebSQL and IndexedDB directories.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize):
+
</ins><span class="cx"> 2014-05-16 Martin Hock <mhock@apple.com>
</span><span class="cx">
</span><span class="cx"> MemoryCache::addImageToCache should return the result of add().
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (168998 => 168999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-05-17 21:49:57 UTC (rev 168998)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-05-17 22:31:02 UTC (rev 168999)
</span><span class="lines">@@ -335,7 +335,9 @@
</span><span class="cx">
</span><span class="cx"> const char separator = '/';
</span><span class="cx">
</span><ins>+ WKContextConfigurationSetIndexedDBDatabaseDirectory(configuration.get(), toWK(temporaryFolder + separator + "Databases" + separator + "IndexedDB").get());
</ins><span class="cx"> WKContextConfigurationSetLocalStorageDirectory(configuration.get(), toWK(temporaryFolder + separator + "LocalStorage").get());
</span><ins>+ WKContextConfigurationSetWebSQLDatabaseDirectory(configuration.get(), toWK(temporaryFolder + separator + "Databases" + separator + "WebSQL").get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_context = adoptWK(WKContextCreateWithConfiguration(configuration.get()));
</span><span class="lines">@@ -353,7 +355,6 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: These should be migrated to WKContextConfigurationRef.
</span><span class="cx"> WKContextSetApplicationCacheDirectory(m_context.get(), toWK(temporaryFolder + separator + "ApplicationCache").get());
</span><del>- WKContextSetDatabaseDirectory(m_context.get(), toWK(temporaryFolder + separator + "Databases").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>