Merge webkit.org at r60469 : Initial merge by git.

Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234

1 files changed, 29 insertions, 0 deletions

diff --git a/LayoutTests/storage/resources/database-common.js b/LayoutTests/storage/resources/database-common.js
new file mode 100644
index 0000000..d1eb410
--- /dev/null
+++ b/LayoutTests/storage/resources/database-common.js
@@ -0,0 +1,29 @@
+var DB_TEST_SUFFIX = "_dom";
+
+function openDatabaseWithSuffix(name, version, description, size, callback)
+{
+    if (arguments.length > 4) {
+        return openDatabase(name + DB_TEST_SUFFIX, version, description, size, callback);
+    } else {
+        return openDatabase(name + DB_TEST_SUFFIX, version, description, size);
+    }
+}
+
+function log(message)
+{
+    document.getElementById("console").innerText += message + "\n";
+}
+
+function setLocationHash(hash) {
+    location.hash = hash;
+}
+
+function setupAndRunTest()
+{
+    if (window.layoutTestController) {
+        layoutTestController.dumpAsText();
+        layoutTestController.waitUntilDone();
+    }
+    document.getElementById("console").innerText = "";
+    runTest();
+}