<!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>[176512] 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/176512">176512</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-23 23:24:01 -0800 (Sun, 23 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Add API to override the default local storage directory
https://bugs.webkit.org/show_bug.cgi?id=138828
Reviewed by Gustavo Noronha Silva.
Source/WebKit2:
Add WebKitWebContext:local-storage-directory construct-only
property. If not provided the default will be used.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkitWebContextGetProperty):
(webkitWebContextSetProperty):
(webkitWebContextConstructed):
(webkit_web_context_class_init):
Tools:
Add test to check that the local storage directory is created at
the path given on construction.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
(testWebContextConfiguration):
(beforeAll):
* TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:
(Test::Test):
(Test::~Test): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebContextcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkWebKit2GtkTestMainh">trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176511 => 176512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-24 05:21:13 UTC (rev 176511)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-24 07:24:01 UTC (rev 176512)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-11-23 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Add API to override the default local storage directory
+ https://bugs.webkit.org/show_bug.cgi?id=138828
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Add WebKitWebContext:local-storage-directory construct-only
+ property. If not provided the default will be used.
+
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (webkitWebContextGetProperty):
+ (webkitWebContextSetProperty):
+ (webkitWebContextConstructed):
+ (webkit_web_context_class_init):
+
</ins><span class="cx"> 2014-11-23 Conrad Shultz <conrad_shultz@apple.com>
</span><span class="cx">
</span><span class="cx"> Page previews should have titles
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (176511 => 176512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-11-24 05:21:13 UTC (rev 176511)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2014-11-24 07:24:01 UTC (rev 176512)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><span class="cx"> #include <WebCore/IconDatabase.h>
</span><span class="cx"> #include <WebCore/Language.h>
</span><ins>+#include <glib/gi18n-lib.h>
</ins><span class="cx"> #include <libintl.h>
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="lines">@@ -95,6 +96,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> enum {
</span><ins>+ PROP_0,
+
+ PROP_LOCAL_STORAGE_DIRECTORY
+};
+
+enum {
</ins><span class="cx"> DOWNLOAD_STARTED,
</span><span class="cx"> INITIALIZE_WEB_EXTENSIONS,
</span><span class="cx">
</span><span class="lines">@@ -169,6 +176,8 @@
</span><span class="cx">
</span><span class="cx"> CString webExtensionsDirectory;
</span><span class="cx"> GRefPtr<GVariant> webExtensionsInitializationUserData;
</span><ins>+
+ CString localStorageDirectory;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static guint signals[LAST_SIGNAL] = { 0, };
</span><span class="lines">@@ -212,6 +221,32 @@
</span><span class="cx"> return injectedBundlePath;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void webkitWebContextGetProperty(GObject* object, guint propID, GValue* value, GParamSpec* paramSpec)
+{
+ WebKitWebContext* context = WEBKIT_WEB_CONTEXT(object);
+
+ switch (propID) {
+ case PROP_LOCAL_STORAGE_DIRECTORY:
+ g_value_set_string(value, context->priv->localStorageDirectory.data());
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, paramSpec);
+ }
+}
+
+static void webkitWebContextSetProperty(GObject* object, guint propID, const GValue* value, GParamSpec* paramSpec)
+{
+ WebKitWebContext* context = WEBKIT_WEB_CONTEXT(object);
+
+ switch (propID) {
+ case PROP_LOCAL_STORAGE_DIRECTORY:
+ context->priv->localStorageDirectory = g_value_get_string(value);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, paramSpec);
+ }
+}
+
</ins><span class="cx"> static void webkitWebContextConstructed(GObject* object)
</span><span class="cx"> {
</span><span class="cx"> G_OBJECT_CLASS(webkit_web_context_parent_class)->constructed(object);
</span><span class="lines">@@ -220,9 +255,11 @@
</span><span class="cx"> WebContextConfiguration webContextConfiguration;
</span><span class="cx"> webContextConfiguration.injectedBundlePath = WebCore::filenameToString(bundleFilename.get());
</span><span class="cx"> WebContext::applyPlatformSpecificConfigurationDefaults(webContextConfiguration);
</span><del>-
</del><span class="cx"> WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object);
</span><span class="cx"> WebKitWebContextPrivate* priv = webContext->priv;
</span><ins>+ if (!priv->localStorageDirectory.isNull())
+ webContextConfiguration.localStorageDirectory = WebCore::filenameToString(priv->localStorageDirectory.data());
+
</ins><span class="cx"> priv->context = WebContext::create(WTF::move(webContextConfiguration));
</span><span class="cx">
</span><span class="cx"> priv->requestManager = priv->context->supplement<WebSoupCustomProtocolRequestManager>();
</span><span class="lines">@@ -265,10 +302,29 @@
</span><span class="cx"> bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
</span><span class="cx"> bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
</span><span class="cx">
</span><ins>+ gObjectClass->get_property = webkitWebContextGetProperty;
+ gObjectClass->set_property = webkitWebContextSetProperty;
</ins><span class="cx"> gObjectClass->constructed = webkitWebContextConstructed;
</span><span class="cx"> gObjectClass->dispose = webkitWebContextDispose;
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * WebKitWebContext:local-storage-directory:
+ *
+ * The directory where local storage data will be saved.
+ *
+ * Since: 2.8
+ */
+ g_object_class_install_property(
+ gObjectClass,
+ PROP_LOCAL_STORAGE_DIRECTORY,
+ g_param_spec_string(
+ "local-storage-directory",
+ _("Local Storage Directory"),
+ _("The directory where local storage data will be saved"),
+ nullptr,
+ static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
+
+ /**
</ins><span class="cx"> * WebKitWebContext::download-started:
</span><span class="cx"> * @context: the #WebKitWebContext
</span><span class="cx"> * @download: the #WebKitDownload associated with this event
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (176511 => 176512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-11-24 05:21:13 UTC (rev 176511)
+++ trunk/Tools/ChangeLog 2014-11-24 07:24:01 UTC (rev 176512)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-11-23 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Add API to override the default local storage directory
+ https://bugs.webkit.org/show_bug.cgi?id=138828
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Add test to check that the local storage directory is created at
+ the path given on construction.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
+ (testWebContextConfiguration):
+ (beforeAll):
+ * TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:
+ (Test::Test):
+ (Test::~Test): Deleted.
+
</ins><span class="cx"> 2014-11-21 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Simple line layout: Add "show simple line layout debug borders" setting to MiniBrowser.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp (176511 => 176512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2014-11-24 05:21:13 UTC (rev 176511)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2014-11-24 07:24:01 UTC (rev 176512)
</span><span class="lines">@@ -37,6 +37,12 @@
</span><span class="cx"> g_assert(webkit_web_context_get_default() != test->m_webContext.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void testWebContextConfiguration(WebViewTest* test, gconstpointer)
+{
+ GUniquePtr<char> localStorageDirectory(g_build_filename(Test::dataDirectory(), "local-storage", nullptr));
+ g_assert(g_file_test(localStorageDirectory.get(), G_FILE_TEST_IS_DIR));
+}
+
</ins><span class="cx"> class PluginsTest: public Test {
</span><span class="cx"> public:
</span><span class="cx"> MAKE_GLIB_TEST_FIXTURE(PluginsTest);
</span><span class="lines">@@ -411,6 +417,7 @@
</span><span class="cx"> kServer->run(serverCallback);
</span><span class="cx">
</span><span class="cx"> Test::add("WebKitWebContext", "default-context", testWebContextDefault);
</span><ins>+ WebViewTest::add("WebKitWebContext", "configuration", testWebContextConfiguration);
</ins><span class="cx"> PluginsTest::add("WebKitWebContext", "get-plugins", testWebContextGetPlugins);
</span><span class="cx"> URISchemeTest::add("WebKitWebContext", "uri-scheme", testWebContextURIScheme);
</span><span class="cx"> Test::add("WebKitWebContext", "spell-checker", testWebContextSpellChecker);
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkTestMainh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h (176511 => 176512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h 2014-11-24 05:21:13 UTC (rev 176511)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h 2014-11-24 07:24:01 UTC (rev 176512)
</span><span class="lines">@@ -66,8 +66,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Test()
</span><del>- : m_webContext(adoptGRef(webkit_web_context_new()))
</del><span class="cx"> {
</span><ins>+ GUniquePtr<char> localStorageDirectory(g_build_filename(dataDirectory(), "local-storage", nullptr));
+ m_webContext = adoptGRef(WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT, "local-storage-directory", localStorageDirectory.get(), nullptr)));
+
</ins><span class="cx"> g_signal_connect(m_webContext.get(), "initialize-web-extensions", G_CALLBACK(initializeWebExtensionsCallback), this);
</span><span class="cx"> GUniquePtr<char> diskCacheDirectory(g_build_filename(dataDirectory(), "disk-cache", nullptr));
</span><span class="cx"> webkit_web_context_set_disk_cache_directory(m_webContext.get(), diskCacheDirectory.get());
</span></span></pre>
</div>
</div>
</body>
</html>