<!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>[184851] 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/184851">184851</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-25 08:15:38 -0700 (Mon, 25 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Add construct property to WebKitWebContext to set the IndexedDB database directory
https://bugs.webkit.org/show_bug.cgi?id=140882
Reviewed by Gustavo Noronha Silva.
Source/WebKit2:
Add WebKitWebContext:indexed-db-database-directory construct only property.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(webkitWebContextGetProperty):
(webkitWebContextSetProperty):
(webkitWebContextConstructed):
(webkit_web_context_class_init):
Tools:
Make sure unit tests write IndexedDB databases to the temporary
directory, and add a test case to check that the directory is
correctly created at the expected path.
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
(testWebContextConfiguration):
(serverCallback):
* TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:
(Test::Test):</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 (184850 => 184851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-25 07:05:03 UTC (rev 184850)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-25 15:15:38 UTC (rev 184851)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-05-25 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Add construct property to WebKitWebContext to set the IndexedDB database directory
+ https://bugs.webkit.org/show_bug.cgi?id=140882
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Add WebKitWebContext:indexed-db-database-directory construct only property.
+
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (webkitWebContextGetProperty):
+ (webkitWebContextSetProperty):
+ (webkitWebContextConstructed):
+ (webkit_web_context_class_init):
+
</ins><span class="cx"> 2015-05-24 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Crash when using a removed ScriptMessageHandler
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (184850 => 184851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-05-25 07:05:03 UTC (rev 184850)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-05-25 15:15:38 UTC (rev 184851)
</span><span class="lines">@@ -102,7 +102,8 @@
</span><span class="cx"> enum {
</span><span class="cx"> PROP_0,
</span><span class="cx">
</span><del>- PROP_LOCAL_STORAGE_DIRECTORY
</del><ins>+ PROP_LOCAL_STORAGE_DIRECTORY,
+ PROP_INDEXED_DB_DIRECTORY
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum {
</span><span class="lines">@@ -182,6 +183,7 @@
</span><span class="cx"> GRefPtr<GVariant> webExtensionsInitializationUserData;
</span><span class="cx">
</span><span class="cx"> CString localStorageDirectory;
</span><ins>+ CString indexedDBDirectory;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static guint signals[LAST_SIGNAL] = { 0, };
</span><span class="lines">@@ -235,6 +237,9 @@
</span><span class="cx"> case PROP_LOCAL_STORAGE_DIRECTORY:
</span><span class="cx"> g_value_set_string(value, context->priv->localStorageDirectory.data());
</span><span class="cx"> break;
</span><ins>+ case PROP_INDEXED_DB_DIRECTORY:
+ g_value_set_string(value, context->priv->indexedDBDirectory.data());
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, paramSpec);
</span><span class="cx"> }
</span><span class="lines">@@ -248,6 +253,9 @@
</span><span class="cx"> case PROP_LOCAL_STORAGE_DIRECTORY:
</span><span class="cx"> context->priv->localStorageDirectory = g_value_get_string(value);
</span><span class="cx"> break;
</span><ins>+ case PROP_INDEXED_DB_DIRECTORY:
+ context->priv->indexedDBDirectory = g_value_get_string(value);
+ break;
</ins><span class="cx"> default:
</span><span class="cx"> G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propID, paramSpec);
</span><span class="cx"> }
</span><span class="lines">@@ -266,6 +274,8 @@
</span><span class="cx"> WebKitWebContextPrivate* priv = webContext->priv;
</span><span class="cx"> if (!priv->localStorageDirectory.isNull())
</span><span class="cx"> configuration->setLocalStorageDirectory(WebCore::filenameToString(priv->localStorageDirectory.data()));
</span><ins>+ if (!priv->indexedDBDirectory.isNull())
+ configuration->setIndexedDBDatabaseDirectory(WebCore::filenameToString(priv->indexedDBDirectory.data()));
</ins><span class="cx">
</span><span class="cx"> priv->context = WebProcessPool::create(configuration.get());
</span><span class="cx">
</span><span class="lines">@@ -332,6 +342,23 @@
</span><span class="cx"> static_cast<GParamFlags>(WEBKIT_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)));
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * WebKitWebContext:indexed-db-directory:
+ *
+ * The directory where IndexedDB databases will be saved.
+ *
+ * Since: 2.10
+ */
+ g_object_class_install_property(
+ gObjectClass,
+ PROP_INDEXED_DB_DIRECTORY,
+ g_param_spec_string(
+ "indexed-db-directory",
+ _("IndexedDB Directory"),
+ _("The directory where IndexedDB databases 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 (184850 => 184851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-25 07:05:03 UTC (rev 184850)
+++ trunk/Tools/ChangeLog 2015-05-25 15:15:38 UTC (rev 184851)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-05-25 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Add construct property to WebKitWebContext to set the IndexedDB database directory
+ https://bugs.webkit.org/show_bug.cgi?id=140882
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Make sure unit tests write IndexedDB databases to the temporary
+ directory, and add a test case to check that the directory is
+ correctly created at the expected path.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
+ (testWebContextConfiguration):
+ (serverCallback):
+ * TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h:
+ (Test::Test):
+
+2015-05-25 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Enable IndexedDB
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=98932
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp (184850 => 184851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2015-05-25 07:05:03 UTC (rev 184850)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp 2015-05-25 15:15:38 UTC (rev 184851)
</span><span class="lines">@@ -41,6 +41,12 @@
</span><span class="cx"> {
</span><span class="cx"> GUniquePtr<char> localStorageDirectory(g_build_filename(Test::dataDirectory(), "local-storage", nullptr));
</span><span class="cx"> g_assert(g_file_test(localStorageDirectory.get(), G_FILE_TEST_IS_DIR));
</span><ins>+
+ test->loadURI(kServer->getURIForPath("/empty").data());
+ test->waitUntilLoadFinished();
+ test->runJavaScriptAndWaitUntilFinished("window.indexedDB.open('TestDatabase');", nullptr);
+ GUniquePtr<char> indexedDBDirectory(g_build_filename(Test::dataDirectory(), "indexeddb", nullptr));
+ g_assert(g_file_test(indexedDBDirectory.get(), G_FILE_TEST_IS_DIR));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class PluginsTest: public Test {
</span><span class="lines">@@ -330,6 +336,11 @@
</span><span class="cx"> soup_message_set_status(message, SOUP_STATUS_OK);
</span><span class="cx"> soup_message_body_append(message->response_body, SOUP_MEMORY_COPY, acceptLanguage, strlen(acceptLanguage));
</span><span class="cx"> soup_message_body_complete(message->response_body);
</span><ins>+ } else if (g_str_equal(path, "/empty")) {
+ const char* emptyHTML = "<html><body></body></html>";
+ soup_message_body_append(message->response_body, SOUP_MEMORY_STATIC, emptyHTML, strlen(emptyHTML));
+ soup_message_body_complete(message->response_body);
+ soup_message_set_status(message, SOUP_STATUS_OK);
</ins><span class="cx"> } else
</span><span class="cx"> soup_message_set_status(message, SOUP_STATUS_NOT_FOUND);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkWebKit2GtkTestMainh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h (184850 => 184851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h 2015-05-25 07:05:03 UTC (rev 184850)
+++ trunk/Tools/TestWebKitAPI/gtk/WebKit2Gtk/TestMain.h 2015-05-25 15:15:38 UTC (rev 184851)
</span><span class="lines">@@ -68,7 +68,11 @@
</span><span class="cx"> Test()
</span><span class="cx"> {
</span><span class="cx"> GUniquePtr<char> localStorageDirectory(g_build_filename(dataDirectory(), "local-storage", nullptr));
</span><del>- m_webContext = adoptGRef(WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT, "local-storage-directory", localStorageDirectory.get(), nullptr)));
</del><ins>+ GUniquePtr<char> indexedDBDirectory(g_build_filename(dataDirectory(), "indexeddb", nullptr));
+ m_webContext = adoptGRef(WEBKIT_WEB_CONTEXT(g_object_new(WEBKIT_TYPE_WEB_CONTEXT,
+ "local-storage-directory", localStorageDirectory.get(),
+ "indexed-db-directory", indexedDBDirectory.get(),
+ nullptr)));
</ins><span class="cx">
</span><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></pre>
</div>
</div>
</body>
</html>