Changeset 140153 in webkit

Timestamp:

Jan 18, 2013 8:27:12 AM (11 years ago)

Author:

Martin Robinson

Message:

[GTK] Add property for IndexedDB database path to WebKitGTK+
​https://bugs.webkit.org/show_bug.cgi?id=106136

Reviewed by Gustavo Noronha Silva.

Source/WebKit/gtk:

Make the web database directory affect both the legacy SQLite web
database API and the newer indexed database API. This will allow us
to run IDB tests in WebKit1.

• webkit/webkitglobals.cpp:

(webkitPageGroupName): Added this helper to get the default page
group name.

• webkit/webkitglobalsprivate.h: Added a declaration for the helper.
• webkit/webkitwebdatabase.cpp:

(webkit_get_web_database_directory_path): Just return the cached value.
This is always set by webkitInit.
(webkit_set_web_database_directory_path): Set both the IDB and legacy
database paths.

• webkit/webkitwebview.cpp:

(webkit_web_view_init): Use the new page group name helper.

Tools:

During testing, set the web database directory to DUMPRENDERTREE_TEMP
before falling back to the old default. This is necessary because
indexed database tests require that each DRT shard is using a different
IDB database location.

• DumpRenderTree/gtk/DumpRenderTree.cpp:

(temporaryDatabaseDirectory): Added this helper for getting the
database directory.
(setDefaultsToConsistentStateValuesForTesting): Use the new helper.

Location:

trunk

Files:

• Source/WebKit/gtk/ChangeLog (modified) (1 diff)
• Source/WebKit/gtk/webkit/webkitglobals.cpp (modified) (1 diff)
• Source/WebKit/gtk/webkit/webkitglobalsprivate.h (modified) (1 diff)
• Source/WebKit/gtk/webkit/webkitwebdatabase.cpp (modified) (5 diffs)
• Source/WebKit/gtk/webkit/webkitwebview.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (modified) (2 diffs)

trunk/Source/WebKit/gtk/ChangeLog

@@ +1 @@
+2013-01-18  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Add property for IndexedDB database path to WebKitGTK+
+        https://bugs.webkit.org/show_bug.cgi?id=106136
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Make the web database directory affect both the legacy SQLite web
+        database API and the newer indexed database API. This will allow us
+        to run IDB tests in WebKit1.
+
+        * webkit/webkitglobals.cpp:
+        (webkitPageGroupName): Added this helper to get the default page
+        group name.
+        * webkit/webkitglobalsprivate.h: Added a declaration for the helper.
+        * webkit/webkitwebdatabase.cpp:
+        (webkit_get_web_database_directory_path): Just return the cached value.
+        This is always set by webkitInit.
+        (webkit_set_web_database_directory_path): Set both the IDB and legacy
+        database paths.
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_init): Use the new page group name helper.
+
 2013-01-18  Seokju Kwon  <seokju.kwon@gmail.com>
 

trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp

@@ -571 +571 @@
     atexit(webkitExit);
 }
+
+const char* webkitPageGroupName()
+{
+    return "org.webkit.gtk.WebKitGTK";
+}

trunk/Source/WebKit/gtk/webkit/webkitglobalsprivate.h

@@ -34 +34 @@
 
 void webkitInit();
+const char* webkitPageGroupName();
 
 }

trunk/Source/WebKit/gtk/webkit/webkitwebdatabase.cpp

@@ -23 +23 @@
 #include "DatabaseDetails.h"
 #include "DatabaseManager.h"
+#include "FileSystem.h"
+#include "GroupSettings.h"
+#include "PageGroup.h"
 #include "webkitglobalsprivate.h"
 #include "webkitsecurityoriginprivate.h"
@@ -75 +78 @@
 };
 
-static gchar* webkit_database_directory_path = NULL;
+static CString gWebKitWebDatabasePath;
 static guint64 webkit_default_database_quota = 5 * 1024 * 1024;
 
@@ -458 +461 @@
  *
  * Returns the current path to the directory WebKit will write Web 
- * Database databases. By default this path will be in the user data
- * directory.
- *
- * Returns: the current database directory path
+ * Database and Indexed Database databases. By default this path will
+ * be in the user data directory.
+ *
+ * Returns: the current database directory path in the filesystem encoding
  *
  * Since: 1.1.14
@@ -467 +470 @@
 const gchar* webkit_get_web_database_directory_path()
 {
-#if ENABLE(SQL_DATABASE)
-    WTF::String path = WebCore::DatabaseManager::manager().databaseDirectoryPath();
-
-    if (path.isEmpty())
-        return "";
-
-    g_free(webkit_database_directory_path);
-    webkit_database_directory_path = g_strdup(path.utf8().data());
-    return webkit_database_directory_path;
-#else
-    return "";
-#endif
+    return gWebKitWebDatabasePath.data();
 }
 
 /**
  * webkit_set_web_database_directory_path:
- * @path: the new database directory path
+ * @path: the new database directory path in the filesystem encoding
  *
  * Sets the current path to the directory WebKit will write Web 
- * Database databases. 
+ * Database and Indexed Database databases. 
  *
  * Since: 1.1.14
@@ -492 +484 @@
 void webkit_set_web_database_directory_path(const gchar* path)
 {
-#if ENABLE(SQL_DATABASE)
-    WTF::String corePath = WTF::String::fromUTF8(path);
-    WebCore::DatabaseManager::manager().setDatabaseDirectoryPath(corePath);
-
-    g_free(webkit_database_directory_path);
-    webkit_database_directory_path = g_strdup(corePath.utf8().data());
-#endif
+    gWebKitWebDatabasePath = path;
+
+    String pathString = WebCore::filenameToString(path);
+#if ENABLE(SQL_DATABASE)
+    WebCore::DatabaseManager::manager().setDatabaseDirectoryPath(pathString);
+#endif
+
+#if ENABLE(INDEXED_DATABASE)
+    WebCore::PageGroup::pageGroup(webkitPageGroupName())->groupSettings()->setIndexedDBDatabasePath(pathString);
+#endif
+
 }
 

trunk/Source/WebKit/gtk/webkit/webkitwebview.cpp

@@ -3660 +3660 @@
     // To keep the default behavior simple (and because no PageGroup API exist in WebKitGTK at the
     // time of writing this comment), we simply set all the pages to the same group.
-    priv->corePage->setGroupName("org.webkit.gtk.WebKitGTK");
+    priv->corePage->setGroupName(webkitPageGroupName());
 
     // We also add a simple wrapper class to provide the public

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-18  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Add property for IndexedDB database path to WebKitGTK+
+        https://bugs.webkit.org/show_bug.cgi?id=106136
+
+        Reviewed by Gustavo Noronha Silva.
+
+        During testing, set the web database directory to DUMPRENDERTREE_TEMP
+        before falling back to the old default. This is necessary because
+        indexed database tests require that each DRT shard is using a different
+        IDB database location.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (temporaryDatabaseDirectory): Added this helper for getting the
+        database directory.
+        (setDefaultsToConsistentStateValuesForTesting): Use the new helper.
+
 2013-01-18  Sudarsana Nagineni  <sudarsana.nagineni@intel.com>
 

trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp

@@ -651 +651 @@
 }
 
+static CString temporaryDatabaseDirectory()
+{
+    const char* directoryFromEnvironment = g_getenv("DUMPRENDERTREE_TEMP");
+    if (directoryFromEnvironment)
+        return directoryFromEnvironment;
+    GOwnPtr<char> fallback(g_build_filename(g_get_user_data_dir(), "gtkwebkitdrt", "databases", NULL));
+    return fallback.get();
+}
+
 static void setDefaultsToConsistentStateValuesForTesting()
 {
@@ -659 +668 @@
 #endif
 
-    gchar* databaseDirectory = g_build_filename(g_get_user_data_dir(), "gtkwebkitdrt", "databases", NULL);
-    webkit_set_web_database_directory_path(databaseDirectory);
-    g_free(databaseDirectory);
+    webkit_set_web_database_directory_path(temporaryDatabaseDirectory().data());
 
 #if defined(GTK_API_VERSION_2)