Start removing Web Database support from workers
authorandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Jan 2015 20:30:21 +0000 (20:30 +0000)
committerandersca@apple.com <andersca@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 9 Jan 2015 20:30:21 +0000 (20:30 +0000)
https://bugs.webkit.org/show_bug.cgi?id=140271

Reviewed by Sam Weinig.

Source/WebCore:

Remove WorkerGlobalScopeWebDatabase which is the entry point for web database in workers.

* CMakeLists.txt:
* DerivedSources.make:
* Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp: Removed.
* Modules/webdatabase/WorkerGlobalScopeWebDatabase.h: Removed.
* Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl: Removed.
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:

LayoutTests:

Remove Web Database worker tests.

* fast/workers/storage/change-version-handle-reuse-sync-expected.txt: Removed.
* fast/workers/storage/change-version-handle-reuse-sync.html: Removed.
* fast/workers/storage/change-version-handle-reuse-worker-expected.txt: Removed.
* fast/workers/storage/change-version-handle-reuse-worker.html: Removed.
* fast/workers/storage/change-version-sync-expected.txt: Removed.
* fast/workers/storage/change-version-sync.html: Removed.
* fast/workers/storage/empty-statement-sync-expected.txt: Removed.
* fast/workers/storage/empty-statement-sync.html: Removed.
* fast/workers/storage/execute-sql-args-sync-expected.txt: Removed.
* fast/workers/storage/execute-sql-args-sync.html: Removed.
* fast/workers/storage/execute-sql-args-worker-expected.txt: Removed.
* fast/workers/storage/execute-sql-args-worker.html: Removed.
* fast/workers/storage/executesql-accepts-only-one-statement-sync-expected.txt: Removed.
* fast/workers/storage/executesql-accepts-only-one-statement-sync.html: Removed.
* fast/workers/storage/interrupt-database-expected.txt: Removed.
* fast/workers/storage/interrupt-database-sync-expected.txt: Removed.
* fast/workers/storage/interrupt-database-sync.html-disabled: Removed.
* fast/workers/storage/interrupt-database.html: Removed.
* fast/workers/storage/multiple-databases-garbage-collection-expected.txt: Removed.
* fast/workers/storage/multiple-databases-garbage-collection.html: Removed.
* fast/workers/storage/multiple-transactions-expected.txt: Removed.
* fast/workers/storage/multiple-transactions-on-different-handles-expected.txt: Removed.
* fast/workers/storage/multiple-transactions-on-different-handles-sync-expected.txt: Removed.
* fast/workers/storage/multiple-transactions-on-different-handles-sync.html: Removed.
* fast/workers/storage/multiple-transactions-on-different-handles.html: Removed.
* fast/workers/storage/multiple-transactions.html: Removed.
* fast/workers/storage/open-database-creation-callback-sync-expected.txt: Removed.
* fast/workers/storage/open-database-creation-callback-sync.html: Removed.
* fast/workers/storage/open-database-empty-version-sync-expected.txt: Removed.
* fast/workers/storage/open-database-empty-version-sync.html: Removed.
* fast/workers/storage/open-database-inputs-sync-expected.txt: Removed.
* fast/workers/storage/open-database-inputs-sync.html: Removed.
* fast/workers/storage/open-database-set-empty-version-sync-expected.txt: Removed.
* fast/workers/storage/open-database-set-empty-version-sync.html: Removed.
* fast/workers/storage/open-database-while-transaction-in-progress-expected.txt: Removed.
* fast/workers/storage/open-database-while-transaction-in-progress-sync-expected.txt: Removed.
* fast/workers/storage/open-database-while-transaction-in-progress-sync.html: Removed.
* fast/workers/storage/open-database-while-transaction-in-progress.html: Removed.
* fast/workers/storage/read-and-write-transactions-dont-run-together-expected.txt: Removed.
* fast/workers/storage/read-and-write-transactions-dont-run-together.html: Removed.
* fast/workers/storage/resources/change-version-handle-reuse-sync.js: Removed.
* fast/workers/storage/resources/change-version-sync-1.js: Removed.
* fast/workers/storage/resources/change-version-sync-2.js: Removed.
* fast/workers/storage/resources/database-worker-controller.js: Removed.
* fast/workers/storage/resources/database-worker.js: Removed.
* fast/workers/storage/resources/empty-statement-sync.js: Removed.
* fast/workers/storage/resources/execute-sql-args-sync.js: Removed.
* fast/workers/storage/resources/executesql-accepts-only-one-statement-sync.js: Removed.
* fast/workers/storage/resources/interrupt-database-sync.js: Removed.
* fast/workers/storage/resources/interrupt-database.js: Removed.
* fast/workers/storage/resources/multiple-transactions-on-different-handles-sync.js: Removed.
* fast/workers/storage/resources/multiple-transactions-sync.js: Removed.
* fast/workers/storage/resources/open-database-creation-callback-sync.js: Removed.
* fast/workers/storage/resources/open-database-empty-version-sync.js: Removed.
* fast/workers/storage/resources/open-database-inputs-sync.js: Removed.
* fast/workers/storage/resources/open-database-set-empty-version-sync.js: Removed.
* fast/workers/storage/resources/open-database-while-transaction-in-progress-sync.js: Removed.
* fast/workers/storage/resources/sql-data-types-sync.js: Removed.
* fast/workers/storage/resources/sql-exception-codes-sync.js: Removed.
* fast/workers/storage/resources/test-authorizer-sync.js: Removed.
* fast/workers/storage/resources/test-inputs-common.js: Removed.
* fast/workers/storage/resources/transaction-in-transaction-sync.js: Removed.
* fast/workers/storage/resources/use-same-database-in-page-and-workers.js: Removed.
* fast/workers/storage/sql-data-types-sync-expected.txt: Removed.
* fast/workers/storage/sql-data-types-sync.html: Removed.
* fast/workers/storage/sql-exception-codes-sync-expected.txt: Removed.
* fast/workers/storage/sql-exception-codes-sync.html: Removed.
* fast/workers/storage/test-authorizer-expected.txt: Removed.
* fast/workers/storage/test-authorizer-sync-expected.txt: Removed.
* fast/workers/storage/test-authorizer-sync.html: Removed.
* fast/workers/storage/test-authorizer.html: Removed.
* fast/workers/storage/transaction-in-transaction-sync-expected.txt: Removed.
* fast/workers/storage/transaction-in-transaction-sync.html: Removed.
* fast/workers/storage/use-same-database-in-page-and-workers-expected.txt: Removed.
* fast/workers/storage/use-same-database-in-page-and-workers.html: Removed.
* http/tests/security/cross-origin-worker-websql-allowed-expected.txt: Removed.
* http/tests/security/cross-origin-worker-websql-allowed.html: Removed.
* http/tests/security/cross-origin-worker-websql-expected.txt: Removed.
* http/tests/security/cross-origin-worker-websql.html: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@178188 268f45cc-cd09-0410-ab3c-d52691b4dbfc

89 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/workers/storage/change-version-handle-reuse-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/change-version-handle-reuse-sync.html [deleted file]
LayoutTests/fast/workers/storage/change-version-handle-reuse-worker-expected.txt [deleted file]
LayoutTests/fast/workers/storage/change-version-handle-reuse-worker.html [deleted file]
LayoutTests/fast/workers/storage/change-version-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/change-version-sync.html [deleted file]
LayoutTests/fast/workers/storage/empty-statement-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/empty-statement-sync.html [deleted file]
LayoutTests/fast/workers/storage/execute-sql-args-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/execute-sql-args-sync.html [deleted file]
LayoutTests/fast/workers/storage/execute-sql-args-worker-expected.txt [deleted file]
LayoutTests/fast/workers/storage/execute-sql-args-worker.html [deleted file]
LayoutTests/fast/workers/storage/executesql-accepts-only-one-statement-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/executesql-accepts-only-one-statement-sync.html [deleted file]
LayoutTests/fast/workers/storage/interrupt-database-expected.txt [deleted file]
LayoutTests/fast/workers/storage/interrupt-database-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/interrupt-database-sync.html-disabled [deleted file]
LayoutTests/fast/workers/storage/interrupt-database.html [deleted file]
LayoutTests/fast/workers/storage/multiple-databases-garbage-collection-expected.txt [deleted file]
LayoutTests/fast/workers/storage/multiple-databases-garbage-collection.html [deleted file]
LayoutTests/fast/workers/storage/multiple-transactions-expected.txt [deleted file]
LayoutTests/fast/workers/storage/multiple-transactions-on-different-handles-expected.txt [deleted file]
LayoutTests/fast/workers/storage/multiple-transactions-on-different-handles-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/multiple-transactions-on-different-handles-sync.html [deleted file]
LayoutTests/fast/workers/storage/multiple-transactions-on-different-handles.html [deleted file]
LayoutTests/fast/workers/storage/multiple-transactions.html [deleted file]
LayoutTests/fast/workers/storage/open-database-creation-callback-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/open-database-creation-callback-sync.html [deleted file]
LayoutTests/fast/workers/storage/open-database-empty-version-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/open-database-empty-version-sync.html [deleted file]
LayoutTests/fast/workers/storage/open-database-inputs-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/open-database-inputs-sync.html [deleted file]
LayoutTests/fast/workers/storage/open-database-set-empty-version-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/open-database-set-empty-version-sync.html [deleted file]
LayoutTests/fast/workers/storage/open-database-while-transaction-in-progress-expected.txt [deleted file]
LayoutTests/fast/workers/storage/open-database-while-transaction-in-progress-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/open-database-while-transaction-in-progress-sync.html [deleted file]
LayoutTests/fast/workers/storage/open-database-while-transaction-in-progress.html [deleted file]
LayoutTests/fast/workers/storage/read-and-write-transactions-dont-run-together-expected.txt [deleted file]
LayoutTests/fast/workers/storage/read-and-write-transactions-dont-run-together.html [deleted file]
LayoutTests/fast/workers/storage/resources/change-version-handle-reuse-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/change-version-sync-1.js [deleted file]
LayoutTests/fast/workers/storage/resources/change-version-sync-2.js [deleted file]
LayoutTests/fast/workers/storage/resources/database-worker-controller.js [deleted file]
LayoutTests/fast/workers/storage/resources/database-worker.js [deleted file]
LayoutTests/fast/workers/storage/resources/empty-statement-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/execute-sql-args-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/executesql-accepts-only-one-statement-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/interrupt-database-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/interrupt-database.js [deleted file]
LayoutTests/fast/workers/storage/resources/multiple-transactions-on-different-handles-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/multiple-transactions-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/open-database-creation-callback-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/open-database-empty-version-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/open-database-inputs-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/open-database-set-empty-version-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/open-database-while-transaction-in-progress-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/sql-data-types-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/sql-exception-codes-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/test-authorizer-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/test-inputs-common.js [deleted file]
LayoutTests/fast/workers/storage/resources/transaction-in-transaction-sync.js [deleted file]
LayoutTests/fast/workers/storage/resources/use-same-database-in-page-and-workers.js [deleted file]
LayoutTests/fast/workers/storage/sql-data-types-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/sql-data-types-sync.html [deleted file]
LayoutTests/fast/workers/storage/sql-exception-codes-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/sql-exception-codes-sync.html [deleted file]
LayoutTests/fast/workers/storage/test-authorizer-expected.txt [deleted file]
LayoutTests/fast/workers/storage/test-authorizer-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/test-authorizer-sync.html [deleted file]
LayoutTests/fast/workers/storage/test-authorizer.html [deleted file]
LayoutTests/fast/workers/storage/transaction-in-transaction-sync-expected.txt [deleted file]
LayoutTests/fast/workers/storage/transaction-in-transaction-sync.html [deleted file]
LayoutTests/fast/workers/storage/use-same-database-in-page-and-workers-expected.txt [deleted file]
LayoutTests/fast/workers/storage/use-same-database-in-page-and-workers.html [deleted file]
LayoutTests/http/tests/security/cross-origin-worker-websql-allowed-expected.txt [deleted file]
LayoutTests/http/tests/security/cross-origin-worker-websql-allowed.html [deleted file]
LayoutTests/http/tests/security/cross-origin-worker-websql-expected.txt [deleted file]
LayoutTests/http/tests/security/cross-origin-worker-websql.html [deleted file]
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/DerivedSources.make
Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp [deleted file]
Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.h [deleted file]
Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl [deleted file]
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj

index 9863ab5..2e67dca 100644 (file)
@@ -1,3 +1,92 @@
+2015-01-08  Anders Carlsson  <andersca@apple.com>
+
+        Start removing Web Database support from workers
+        https://bugs.webkit.org/show_bug.cgi?id=140271
+
+        Reviewed by Sam Weinig.
+
+        Remove Web Database worker tests.
+
+        * fast/workers/storage/change-version-handle-reuse-sync-expected.txt: Removed.
+        * fast/workers/storage/change-version-handle-reuse-sync.html: Removed.
+        * fast/workers/storage/change-version-handle-reuse-worker-expected.txt: Removed.
+        * fast/workers/storage/change-version-handle-reuse-worker.html: Removed.
+        * fast/workers/storage/change-version-sync-expected.txt: Removed.
+        * fast/workers/storage/change-version-sync.html: Removed.
+        * fast/workers/storage/empty-statement-sync-expected.txt: Removed.
+        * fast/workers/storage/empty-statement-sync.html: Removed.
+        * fast/workers/storage/execute-sql-args-sync-expected.txt: Removed.
+        * fast/workers/storage/execute-sql-args-sync.html: Removed.
+        * fast/workers/storage/execute-sql-args-worker-expected.txt: Removed.
+        * fast/workers/storage/execute-sql-args-worker.html: Removed.
+        * fast/workers/storage/executesql-accepts-only-one-statement-sync-expected.txt: Removed.
+        * fast/workers/storage/executesql-accepts-only-one-statement-sync.html: Removed.
+        * fast/workers/storage/interrupt-database-expected.txt: Removed.
+        * fast/workers/storage/interrupt-database-sync-expected.txt: Removed.
+        * fast/workers/storage/interrupt-database-sync.html-disabled: Removed.
+        * fast/workers/storage/interrupt-database.html: Removed.
+        * fast/workers/storage/multiple-databases-garbage-collection-expected.txt: Removed.
+        * fast/workers/storage/multiple-databases-garbage-collection.html: Removed.
+        * fast/workers/storage/multiple-transactions-expected.txt: Removed.
+        * fast/workers/storage/multiple-transactions-on-different-handles-expected.txt: Removed.
+        * fast/workers/storage/multiple-transactions-on-different-handles-sync-expected.txt: Removed.
+        * fast/workers/storage/multiple-transactions-on-different-handles-sync.html: Removed.
+        * fast/workers/storage/multiple-transactions-on-different-handles.html: Removed.
+        * fast/workers/storage/multiple-transactions.html: Removed.
+        * fast/workers/storage/open-database-creation-callback-sync-expected.txt: Removed.
+        * fast/workers/storage/open-database-creation-callback-sync.html: Removed.
+        * fast/workers/storage/open-database-empty-version-sync-expected.txt: Removed.
+        * fast/workers/storage/open-database-empty-version-sync.html: Removed.
+        * fast/workers/storage/open-database-inputs-sync-expected.txt: Removed.
+        * fast/workers/storage/open-database-inputs-sync.html: Removed.
+        * fast/workers/storage/open-database-set-empty-version-sync-expected.txt: Removed.
+        * fast/workers/storage/open-database-set-empty-version-sync.html: Removed.
+        * fast/workers/storage/open-database-while-transaction-in-progress-expected.txt: Removed.
+        * fast/workers/storage/open-database-while-transaction-in-progress-sync-expected.txt: Removed.
+        * fast/workers/storage/open-database-while-transaction-in-progress-sync.html: Removed.
+        * fast/workers/storage/open-database-while-transaction-in-progress.html: Removed.
+        * fast/workers/storage/read-and-write-transactions-dont-run-together-expected.txt: Removed.
+        * fast/workers/storage/read-and-write-transactions-dont-run-together.html: Removed.
+        * fast/workers/storage/resources/change-version-handle-reuse-sync.js: Removed.
+        * fast/workers/storage/resources/change-version-sync-1.js: Removed.
+        * fast/workers/storage/resources/change-version-sync-2.js: Removed.
+        * fast/workers/storage/resources/database-worker-controller.js: Removed.
+        * fast/workers/storage/resources/database-worker.js: Removed.
+        * fast/workers/storage/resources/empty-statement-sync.js: Removed.
+        * fast/workers/storage/resources/execute-sql-args-sync.js: Removed.
+        * fast/workers/storage/resources/executesql-accepts-only-one-statement-sync.js: Removed.
+        * fast/workers/storage/resources/interrupt-database-sync.js: Removed.
+        * fast/workers/storage/resources/interrupt-database.js: Removed.
+        * fast/workers/storage/resources/multiple-transactions-on-different-handles-sync.js: Removed.
+        * fast/workers/storage/resources/multiple-transactions-sync.js: Removed.
+        * fast/workers/storage/resources/open-database-creation-callback-sync.js: Removed.
+        * fast/workers/storage/resources/open-database-empty-version-sync.js: Removed.
+        * fast/workers/storage/resources/open-database-inputs-sync.js: Removed.
+        * fast/workers/storage/resources/open-database-set-empty-version-sync.js: Removed.
+        * fast/workers/storage/resources/open-database-while-transaction-in-progress-sync.js: Removed.
+        * fast/workers/storage/resources/sql-data-types-sync.js: Removed.
+        * fast/workers/storage/resources/sql-exception-codes-sync.js: Removed.
+        * fast/workers/storage/resources/test-authorizer-sync.js: Removed.
+        * fast/workers/storage/resources/test-inputs-common.js: Removed.
+        * fast/workers/storage/resources/transaction-in-transaction-sync.js: Removed.
+        * fast/workers/storage/resources/use-same-database-in-page-and-workers.js: Removed.
+        * fast/workers/storage/sql-data-types-sync-expected.txt: Removed.
+        * fast/workers/storage/sql-data-types-sync.html: Removed.
+        * fast/workers/storage/sql-exception-codes-sync-expected.txt: Removed.
+        * fast/workers/storage/sql-exception-codes-sync.html: Removed.
+        * fast/workers/storage/test-authorizer-expected.txt: Removed.
+        * fast/workers/storage/test-authorizer-sync-expected.txt: Removed.
+        * fast/workers/storage/test-authorizer-sync.html: Removed.
+        * fast/workers/storage/test-authorizer.html: Removed.
+        * fast/workers/storage/transaction-in-transaction-sync-expected.txt: Removed.
+        * fast/workers/storage/transaction-in-transaction-sync.html: Removed.
+        * fast/workers/storage/use-same-database-in-page-and-workers-expected.txt: Removed.
+        * fast/workers/storage/use-same-database-in-page-and-workers.html: Removed.
+        * http/tests/security/cross-origin-worker-websql-allowed-expected.txt: Removed.
+        * http/tests/security/cross-origin-worker-websql-allowed.html: Removed.
+        * http/tests/security/cross-origin-worker-websql-expected.txt: Removed.
+        * http/tests/security/cross-origin-worker-websql.html: Removed.
+
 2015-01-09  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Unreviewed test gardening.
diff --git a/LayoutTests/fast/workers/storage/change-version-handle-reuse-sync-expected.txt b/LayoutTests/fast/workers/storage/change-version-handle-reuse-sync-expected.txt
deleted file mode 100644 (file)
index 8c58718..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-Test that the database can be accessed after changing its version.
-PASS: changeVersion() transaction callback was called.
-PASS: No exception thrown while executing statements.
-PASS: No exception thrown while running a transaction.
-
diff --git a/LayoutTests/fast/workers/storage/change-version-handle-reuse-sync.html b/LayoutTests/fast/workers/storage/change-version-handle-reuse-sync.html
deleted file mode 100644 (file)
index c6d5ba6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/change-version-handle-reuse-sync.js')">
-Test that the database can be accessed after changing its version.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/change-version-handle-reuse-worker-expected.txt b/LayoutTests/fast/workers/storage/change-version-handle-reuse-worker-expected.txt
deleted file mode 100644 (file)
index 3f76481..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-This tests that a database can be accessed after changing its version. You should see an error about FooBar table below, not about mismatching versions.
-changeVersion: transaction callback
-changeVersion: success callback
-transaction: statement error callback: could not prepare statement (1 no such table: FooBar)
-TEST COMPLETE.
-
diff --git a/LayoutTests/fast/workers/storage/change-version-handle-reuse-worker.html b/LayoutTests/fast/workers/storage/change-version-handle-reuse-worker.html
deleted file mode 100644 (file)
index 44ad0de..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html> 
-<head>
-<script src="resources/database-worker-controller.js"></script> 
-</head> 
-<body onload="runTest('change-version-handle-reuse.js')"> 
-<div>This tests that a database can be accessed after changing its version. You should see an error about FooBar table below, not about mismatching versions.
-<pre id="console"> 
-FAILURE: test didn't run.
-</pre> 
-</body> 
-</html>
diff --git a/LayoutTests/fast/workers/storage/change-version-sync-expected.txt b/LayoutTests/fast/workers/storage/change-version-sync-expected.txt
deleted file mode 100644 (file)
index 59cca8c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Test that version updates in sync databases work correctly.
-PASS: db.version is 3 as expected.
-
diff --git a/LayoutTests/fast/workers/storage/change-version-sync.html b/LayoutTests/fast/workers/storage/change-version-sync.html
deleted file mode 100644 (file)
index f7cc02e..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-<html>
-<head>
-<script>
-function log(message)
-{
-    document.getElementById("console").innerHTML += message + "<br>";
-}
-
-function finishTest()
-{
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function runTest()
-{
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-
-    if (window.location.search == "?2") {
-        var worker = new Worker("resources/change-version-sync-2.js");
-        worker.onmessage = function(event) {
-            if (event.data == "done")
-                finishTest();
-            else
-                log(event.data);
-        };
-    } else {
-        var worker = new Worker("resources/change-version-sync-1.js");
-        worker.onmessage = function(event) {
-            if (event.data == "done")
-                window.location.href = window.location + "?2";
-            else if (event.data == "fail")
-                finishTest();
-            else
-                log(event.data);
-        };
-    }
-}
-</script>
-</head>
-<body onload="runTest()">
-Test that version updates in sync databases work correctly.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/empty-statement-sync-expected.txt b/LayoutTests/fast/workers/storage/empty-statement-sync-expected.txt
deleted file mode 100644 (file)
index bbb2f9e..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-This test tries to execute an empty statement.
-PASS: result is null
-PASS
-
diff --git a/LayoutTests/fast/workers/storage/empty-statement-sync.html b/LayoutTests/fast/workers/storage/empty-statement-sync.html
deleted file mode 100644 (file)
index 2174e6f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/empty-statement-sync.js')">
-This test tries to execute an empty statement.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/execute-sql-args-sync-expected.txt b/LayoutTests/fast/workers/storage/execute-sql-args-sync-expected.txt
deleted file mode 100644 (file)
index b33b45a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-Test various inputs to executeSql().
-PASS: executeSql("") did not throw an exception.
-PASS: executeSql("", null) did not throw an exception.
-PASS: executeSql("", undefined) did not throw an exception.
-PASS: executeSql("", []) did not throw an exception.
-PASS: executeSql("", [ "arg0" ]) did not throw an exception.
-PASS: executeSql("", { }) did not throw an exception.
-PASS: executeSql("", { length: 0 }) did not throw an exception.
-PASS: executeSql("", { length: 1, 0: "arg0" }) did not throw an exception.
-PASS: executeSql() threw an exception as expected.
-PASS: executeSql(null) threw an exception as expected.
-PASS: executeSql(undefined) threw an exception as expected.
-PASS: executeSql(0) threw an exception as expected.
-PASS: executeSql(throwOnToStringObject) threw an exception as expected.
-PASS: executeSql("", throwOnGetLengthObject) threw an exception as expected.
-PASS: executeSql("", throwOnGetZeroObject) threw an exception as expected.
-PASS: executeSql("", [ throwOnToStringObject ]) threw an exception as expected.
-PASS: executeSql("", 0) threw an exception as expected.
-PASS: executeSql("", "") threw an exception as expected.
-
diff --git a/LayoutTests/fast/workers/storage/execute-sql-args-sync.html b/LayoutTests/fast/workers/storage/execute-sql-args-sync.html
deleted file mode 100644 (file)
index 8b2176c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/execute-sql-args-sync.js')">
-Test various inputs to executeSql().
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/execute-sql-args-worker-expected.txt b/LayoutTests/fast/workers/storage/execute-sql-args-worker-expected.txt
deleted file mode 100644 (file)
index 0e30b4b..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-PASS. executeSql(null) did not throw an exception
-PASS. executeSql(undefined) did not throw an exception
-PASS. executeSql(0) did not throw an exception
-PASS. executeSql("") did not throw an exception
-PASS. executeSql("", null) did not throw an exception
-PASS. executeSql("", undefined) did not throw an exception
-PASS. executeSql("", []) did not throw an exception
-PASS. executeSql("", [ "arg0" ]) did not throw an exception
-PASS. executeSql("", { }) did not throw an exception
-PASS. executeSql("", { length: 0 }) did not throw an exception
-PASS. executeSql("", { length: 1, 0: "arg0" }) did not throw an exception
-PASS. executeSql("", null, null) did not throw an exception
-PASS. executeSql("", null, undefined) did not throw an exception
-PASS. executeSql("", null, { }) did not throw an exception
-PASS. executeSql("", null, null, null) did not throw an exception
-PASS. executeSql("", null, null, undefined) did not throw an exception
-PASS. executeSql("", null, null, { }) did not throw an exception
-PASS. executeSql() threw an exception as expected.
-PASS. executeSql(throwOnToStringObject) threw an exception as expected.
-PASS. executeSql("", throwOnGetLengthObject) threw an exception as expected.
-PASS. executeSql("", throwOnGetZeroObject) threw an exception as expected.
-PASS. executeSql("", [ throwOnToStringObject ]) threw an exception as expected.
-PASS. executeSql("", 0) threw an exception as expected.
-PASS. executeSql("", "") threw an exception as expected.
-PASS. executeSql("", null, 0) threw an exception as expected.
-PASS. executeSql("", null, "") threw an exception as expected.
-PASS. executeSql("", null, null, 0) threw an exception as expected.
-PASS. executeSql("", null, null, "") threw an exception as expected.
-
diff --git a/LayoutTests/fast/workers/storage/execute-sql-args-worker.html b/LayoutTests/fast/workers/storage/execute-sql-args-worker.html
deleted file mode 100644 (file)
index 3c5adbe..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head>
-<script src="resources/database-worker-controller.js"></script>
-</head>
-
-<body onload="runTest('execute-sql-args.js')">
-<pre id="console"> 
-FAILURE: test didn't run.
-</pre> 
-</body>
-
-</html>
diff --git a/LayoutTests/fast/workers/storage/executesql-accepts-only-one-statement-sync-expected.txt b/LayoutTests/fast/workers/storage/executesql-accepts-only-one-statement-sync-expected.txt
deleted file mode 100644 (file)
index 7b624e6..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-Test that executeSql() accepts only one statement.
-PASS: INSERT INTO Test VALUES (1), 
-PASS: INSERT INTO Test VALUES (2);, 
-PASS:    INSERT INTO Test VALUES (3)    , 
-PASS:    INSERT INTO Test VALUES (4);   , 
-PASS: INSERT INTO Test VALUES (5)   ;, 
-PASS: INSERT INTO Test VALUES (6); garbage, could not prepare statement (1, not an error)
-PASS: INSERT INTO Test VALUES (7); INSERT INTO Test VALUES (8), could not prepare statement (1, not an error)
-PASS:   INSERT INTO Test VALUES (9);   INSERT INTO Test VALUES (10);   , could not prepare statement (1, not an error)
-
diff --git a/LayoutTests/fast/workers/storage/executesql-accepts-only-one-statement-sync.html b/LayoutTests/fast/workers/storage/executesql-accepts-only-one-statement-sync.html
deleted file mode 100644 (file)
index 716e9fd..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/executesql-accepts-only-one-statement-sync.js')">
-Test that executeSql() accepts only one statement.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/interrupt-database-expected.txt b/LayoutTests/fast/workers/storage/interrupt-database-expected.txt
deleted file mode 100644 (file)
index 460a756..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-This test makes sure that all async database operations are immediately interrupted when the worker needs to terminate.
-PASS: database operations interrupted.
-
diff --git a/LayoutTests/fast/workers/storage/interrupt-database-sync-expected.txt b/LayoutTests/fast/workers/storage/interrupt-database-sync-expected.txt
deleted file mode 100644 (file)
index 3139ddc..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-CONSOLE MESSAGE: line 7: DATABASE_ERR: DOM SQL Exception 1: The operation failed for some reason related to the database.
-CONSOLE MESSAGE: line 11: UNKNOWN_ERR: DOM SQL Exception 0: The operation failed for reasons unrelated to the database.
-This test makes sure that all sync database operations are immediately interrupted when the worker needs to terminate.
-PASS: database operations interrupted.
-
diff --git a/LayoutTests/fast/workers/storage/interrupt-database-sync.html-disabled b/LayoutTests/fast/workers/storage/interrupt-database-sync.html-disabled
deleted file mode 100644 (file)
index df6c0f5..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<html>
-<head>
-<script src="../resources/worker-util.js"></script>
-<script>
-var worker;
-
-function log(message)
-{
-    document.getElementById("console").innerHTML += message + "<br>";
-}
-
-function finishTest()
-{
-    log("PASS: database operations interrupted.");
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function terminateWorker()
-{
-    worker.terminate();
-    waitUntilWorkerThreadsExit(finishTest)
-}
-
-function runTest()
-{
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-
-    worker = new Worker('resources/interrupt-database-sync.js');
-    worker.onmessage = function(event) {
-        if (event.data == "terminate")
-            terminateWorker();
-        else
-            log(event.data);
-    };
-}
-</script>
-</head>
-
-<body onload="runTest()">
-This test makes sure that all sync database operations are immediately interrupted when the worker needs to terminate.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/interrupt-database.html b/LayoutTests/fast/workers/storage/interrupt-database.html
deleted file mode 100644 (file)
index a0bb6b7..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<html>
-<head>
-<script src="../resources/worker-util.js"></script>
-<script>
-var worker;
-
-function log(message)
-{
-    document.getElementById("console").innerHTML += message + "<br>";
-}
-
-function finishTest()
-{
-    log("PASS: database operations interrupted.");
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function terminateWorker()
-{
-    worker.terminate();
-    waitUntilWorkerThreadsExit(finishTest)
-}
-
-function runTest()
-{
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-
-    worker = new Worker('resources/interrupt-database.js');
-    worker.onmessage = function(event) {
-        if (event.data == "terminate")
-            terminateWorker();
-        else
-            log(event.data);
-    };
-}
-</script>
-</head>
-
-<body onload="runTest()">
-This test makes sure that all async database operations are immediately interrupted when the worker needs to terminate.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/multiple-databases-garbage-collection-expected.txt b/LayoutTests/fast/workers/storage/multiple-databases-garbage-collection-expected.txt
deleted file mode 100644 (file)
index d01514a..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-This test opens two databases, queues up a series of operations on both, then "forgets" about one of them. After forcing GC, resources associated with that database should be freed gracefully.
-Forgotten Database Transaction Complete
-Persistent Database Transaction Complete
-
diff --git a/LayoutTests/fast/workers/storage/multiple-databases-garbage-collection.html b/LayoutTests/fast/workers/storage/multiple-databases-garbage-collection.html
deleted file mode 100644 (file)
index 0ec34f4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-<head>
-<script src="resources/database-worker-controller.js"></script>
-</head>
-<body onload="runTest('multiple-databases-garbage-collection.js');">
-This test opens two databases, queues up a series of operations on both, then "forgets" about one of them.
-After forcing GC, resources associated with that database should be freed gracefully.<br>
-<pre id="console"> 
-FAILURE: test didn't run.
-</pre> 
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/multiple-transactions-expected.txt b/LayoutTests/fast/workers/storage/multiple-transactions-expected.txt
deleted file mode 100644 (file)
index 3e9c0f6..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-This is a test to see if the database API allows multiple transactions to be queued on the same database at once:
-Transaction 1 Started
-Transaction 1 Succeeded
-Transaction 2 Started
-Transaction 2 Succeeded
-
diff --git a/LayoutTests/fast/workers/storage/multiple-transactions-on-different-handles-expected.txt b/LayoutTests/fast/workers/storage/multiple-transactions-on-different-handles-expected.txt
deleted file mode 100644 (file)
index ba6a2d1..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-This is a test to see if queueing up multiple transactions on different handles to the same database results in a deadlock.
-db1 read statement succeeded
-db1 write statement succeeded
-db1 transaction succeeded
-db2 read statement succeeded
-db2 write statement succeeded
-db2 transaction succeeded
-
diff --git a/LayoutTests/fast/workers/storage/multiple-transactions-on-different-handles-sync-expected.txt b/LayoutTests/fast/workers/storage/multiple-transactions-on-different-handles-sync-expected.txt
deleted file mode 100644 (file)
index 869f1bb..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Test that executing multiple transactions on different handles to the same database doesn't cause deadlocks.
-PASS
-
diff --git a/LayoutTests/fast/workers/storage/multiple-transactions-on-different-handles-sync.html b/LayoutTests/fast/workers/storage/multiple-transactions-on-different-handles-sync.html
deleted file mode 100644 (file)
index b080a51..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/multiple-transactions-on-different-handles-sync.js')">
-Test that executing multiple transactions on different handles to the same database doesn't cause deadlocks.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/multiple-transactions-on-different-handles.html b/LayoutTests/fast/workers/storage/multiple-transactions-on-different-handles.html
deleted file mode 100644 (file)
index d0620f2..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-<script src="resources/database-worker-controller.js"></script>
-</head>
-
-<body onload="runTest('multiple-transactions-on-different-handles.js')">
-This is a test to see if queueing up multiple transactions on different handles to the same database results in a deadlock.<br>
-<pre id="console"> 
-FAILURE: test didn't run.
-</pre> 
-</body>
-
-</html>
diff --git a/LayoutTests/fast/workers/storage/multiple-transactions.html b/LayoutTests/fast/workers/storage/multiple-transactions.html
deleted file mode 100644 (file)
index 60e13e6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-<script src="resources/database-worker-controller.js"></script>
-</head>
-
-<body onload="runTest('multiple-transactions.js')">
-This is a test to see if the database API allows multiple transactions to be queued on the same database at once:<br>
-<pre id="console"> 
-FAILURE: test didn't run.
-</pre> 
-</body>
-
-</html>
diff --git a/LayoutTests/fast/workers/storage/open-database-creation-callback-sync-expected.txt b/LayoutTests/fast/workers/storage/open-database-creation-callback-sync-expected.txt
deleted file mode 100644 (file)
index 156ecf3..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-CONSOLE MESSAGE: unable to open database, version mismatch, '1.0' does not match the currentVersion of ''
-This test tests openDatabaseSync()'s creation callback.
-PASS: Creation callback was called.
-PASS: Version set to empty string as expected.
-PASS: An exception was thrown and db1Fail is null as expected.
-
diff --git a/LayoutTests/fast/workers/storage/open-database-creation-callback-sync.html b/LayoutTests/fast/workers/storage/open-database-creation-callback-sync.html
deleted file mode 100644 (file)
index 7e583a6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/open-database-creation-callback-sync.js')">
-This test tests openDatabaseSync()'s creation callback.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/open-database-empty-version-sync-expected.txt b/LayoutTests/fast/workers/storage/open-database-empty-version-sync-expected.txt
deleted file mode 100644 (file)
index 4d4d479..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Test that no exception is thrown when the database is opened with an empty version.
-PASS
-
diff --git a/LayoutTests/fast/workers/storage/open-database-empty-version-sync.html b/LayoutTests/fast/workers/storage/open-database-empty-version-sync.html
deleted file mode 100644 (file)
index c6f1f43..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/open-database-empty-version-sync.js')">
-Test that no exception is thrown when the database is opened with an empty version.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/open-database-inputs-sync-expected.txt b/LayoutTests/fast/workers/storage/open-database-inputs-sync-expected.txt
deleted file mode 100644 (file)
index 1791685..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-This test makes sure that openDatabaseSync() accepts only valid parameters.
-PASS: Not enough arguments
-PASS: Not enough arguments
-PASS: undefined
-PASS: undefined
-PASS: undefined
-PASS: Argument 5 ('creationCallback') to WorkerGlobalScope.openDatabaseSync must be a function
-PASS: openDatabaseSync() succeeded.
-PASS: openDatabaseSync() succeeded.
-PASS: calling openDatabaseSync() with a creation callback succeeded.
-
diff --git a/LayoutTests/fast/workers/storage/open-database-inputs-sync.html b/LayoutTests/fast/workers/storage/open-database-inputs-sync.html
deleted file mode 100644 (file)
index 1a33a85..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/open-database-inputs-sync.js')">
-This test makes sure that openDatabaseSync() accepts only valid parameters.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/open-database-set-empty-version-sync-expected.txt b/LayoutTests/fast/workers/storage/open-database-set-empty-version-sync-expected.txt
deleted file mode 100644 (file)
index 7dd256c..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-CONSOLE MESSAGE: unable to open database, version mismatch, 'test' does not match the currentVersion of ''
-This tests that calling openDatabase with an empty version string sets the current version of that database to the empty string and subsequent attempts to open the database with a different expected version throw an exception.
-PASS
-
diff --git a/LayoutTests/fast/workers/storage/open-database-set-empty-version-sync.html b/LayoutTests/fast/workers/storage/open-database-set-empty-version-sync.html
deleted file mode 100644 (file)
index 5a716af..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/open-database-set-empty-version-sync.js')">
-This tests that calling openDatabase with an empty version string sets the current version of that database to the empty string and subsequent attempts to open the database with a different expected version throw an exception.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/open-database-while-transaction-in-progress-expected.txt b/LayoutTests/fast/workers/storage/open-database-while-transaction-in-progress-expected.txt
deleted file mode 100644 (file)
index acac8af..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a test to see if opening a database while a transaction is running on a different handle to the same database results in a deadlock.
-openDatabase() succeeded.
-
diff --git a/LayoutTests/fast/workers/storage/open-database-while-transaction-in-progress-sync-expected.txt b/LayoutTests/fast/workers/storage/open-database-while-transaction-in-progress-sync-expected.txt
deleted file mode 100644 (file)
index b2da76b..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Test that a second handle to the same database can be opened inside a transaction running on the first handle.
-PASS: second handle opened successfully.
-
diff --git a/LayoutTests/fast/workers/storage/open-database-while-transaction-in-progress-sync.html b/LayoutTests/fast/workers/storage/open-database-while-transaction-in-progress-sync.html
deleted file mode 100644 (file)
index 08bd396..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/open-database-while-transaction-in-progress-sync.js')">
-Test that a second handle to the same database can be opened inside a transaction running on the first handle.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/open-database-while-transaction-in-progress.html b/LayoutTests/fast/workers/storage/open-database-while-transaction-in-progress.html
deleted file mode 100644 (file)
index 3012cde..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-<script src="resources/database-worker-controller.js"></script>
-</head>
-
-<body onload="runTest('open-database-while-transaction-in-progress.js')">
-This is a test to see if opening a database while a transaction is running on a different handle to the same database results in a deadlock.<br>
-<pre id="console"> 
-FAILURE: test didn't run.
-</pre> 
-</body>
-
-</html>
diff --git a/LayoutTests/fast/workers/storage/read-and-write-transactions-dont-run-together-expected.txt b/LayoutTests/fast/workers/storage/read-and-write-transactions-dont-run-together-expected.txt
deleted file mode 100644 (file)
index cc8979c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-This test tests that read and write transactions on different handles to the same database don't run together.
-Transaction successful.
-Transaction successful.
-Transaction successful.
-Transaction successful.
-Transaction successful.
-Transaction successful.
-Transaction successful.
-Transaction successful.
-Transaction successful.
-Transaction successful.
-
diff --git a/LayoutTests/fast/workers/storage/read-and-write-transactions-dont-run-together.html b/LayoutTests/fast/workers/storage/read-and-write-transactions-dont-run-together.html
deleted file mode 100644 (file)
index 8aeffc8..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-<script src="resources/database-worker-controller.js"></script>
-</head>
-
-<body onload="runTest('read-and-write-transactions-dont-run-together.js')">
-This test tests that read and write transactions on different handles to the same database don't run together.<br>
-<pre id="console"> 
-FAILURE: test didn't run.
-</pre> 
-</body>
-
-</html>
diff --git a/LayoutTests/fast/workers/storage/resources/change-version-handle-reuse-sync.js b/LayoutTests/fast/workers/storage/resources/change-version-handle-reuse-sync.js
deleted file mode 100644 (file)
index 3733094..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-var db = null;
-try {
-    var dbName = "ChangeVersionHandleReuseTest" + (new Date()).getTime();
-    db = openDatabaseSync(dbName, "", "Test that the DB handle is valid after changing the version.", 1);
-    var version = db.version;
-    var newVersion = version ? (parseInt(version) + 1).toString() : "1";
-    db.changeVersion(version, newVersion, function(tx) {
-        postMessage("PASS: changeVersion() transaction callback was called.");
-    });
-} catch (err) {
-    postMessage("FAIL: changeVersion() threw an exception: " + err);
-}
-
-try {
-    db.transaction(function(tx) {
-        try {
-            tx.executeSql("CREATE TABLE IF NOT EXISTS Test (Foo INT)");
-            tx.executeSql("SELECT * from Test");
-            postMessage("PASS: No exception thrown while executing statements.");
-        } catch (err) {
-            postMessage("FAIL: An exception was thrown while executing statements: " + err);
-        }
-    });
-    postMessage("PASS: No exception thrown while running a transaction.");
-} catch (err) {
-    postMessage("FAIL: An exception was thrown while running a transaction: " + err);
-}
-
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/change-version-sync-1.js b/LayoutTests/fast/workers/storage/resources/change-version-sync-1.js
deleted file mode 100644 (file)
index 9c5a059..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-var EXPECTED_VERSION_AFTER_HIXIE_TEST = "2";
-var EXPECTED_VERSION_AFTER_RELOAD = "3";
-
-var db1 = openDatabaseSync("ChangeVersionTest", "1", "Test for the database.changeVersion() function", 1);
-var db2 = openDatabaseSync("ChangeVersionTest", "1", "Test for the database.changeVersion() function", 1);
-
-// First run Hixie's test to ensure basic changeVersion() functionality works (see bug 28418).
-db1.changeVersion("1", EXPECTED_VERSION_AFTER_HIXIE_TEST);
-if (db2.version != db1.version) {
-    postMessage("FAIL: changing db1's version (" + db1.version + ") did not change db2's version (" + db2.version + ") as expected.");
-    postMessage("fail");
-} else
-    postMessage("PASS: changing db1's version (" + db1.version + ") changed db2's version too.");
-
-db2.transaction(function(tx) {
-    try {
-        tx.executeSql("CREATE TABLE IF NOT EXISTS Test (Foo INT)");
-        postMessage("FAIL: The DB version changed, executing any statement on db2 should fail.");
-        postMessage("fail");
-    } catch(err) {
-      postMessage("PASS: Executing a statement on db2 threw an exception as expected.");
-    }
-});
-
-// Make sure any new handle to the same DB sees the new version
-try {
-    var db3 = openDatabaseSync("ChangeVersionTest", EXPECTED_VERSION_AFTER_HIXIE_TEST, "", 1);
-    postMessage("PASS: Successfully opened a new DB handle.");
-} catch (err) {
-    postMessage("FAIL: Unexpected exception thrown while trying to open a new DB handle: " + err);
-    postMessage("fail");
-}
-
-if (db1.version != db3.version) {
-    postMessage("FAIL: db1.version (" + db1.version + ") does not match db3.version(" + db3.version +")");
-    postMessage("fail");
-} else
-    postMessage("PASS: db1.version (" + db1.version + ") matches db3.version.");
-
-// Now try a test to ensure the version persists after reloading (see bug 27836)
-db1.changeVersion(EXPECTED_VERSION_AFTER_HIXIE_TEST, EXPECTED_VERSION_AFTER_RELOAD,
-                  function(tx) {
-                      tx.executeSql("DROP TABLE IF EXISTS Info");
-                      tx.executeSql("CREATE TABLE IF NOT EXISTS Info (Version INTEGER)");
-                      tx.executeSql("INSERT INTO Info VALUES (?)", [EXPECTED_VERSION_AFTER_RELOAD]);
-                  });
-
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/change-version-sync-2.js b/LayoutTests/fast/workers/storage/resources/change-version-sync-2.js
deleted file mode 100644 (file)
index 0602b93..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-var EXPECTED_VERSION_AFTER_RELOAD = '3';
-
-var db = openDatabaseSync("ChangeVersionTest", "", "Test the changeVersion() function.", 1);
-if (db.version == EXPECTED_VERSION_AFTER_RELOAD)
-    postMessage("PASS: db.version is " + EXPECTED_VERSION_AFTER_RELOAD + " as expected.");
-else
-    postMessage("FAIL: db.version is " + db.version + "; expected " + EXPECTED_VERSION_AFTER_RELOAD);
-
-// Reset the version; otherwise this test will fail the next time it's run
-db.changeVersion(db.version, "1");
-
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/database-worker-controller.js b/LayoutTests/fast/workers/storage/resources/database-worker-controller.js
deleted file mode 100644 (file)
index 993e841..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-var databaseWorker = new Worker('resources/database-worker.js');
-
-databaseWorker.onerror = function(event) {
-    log("Caught an error from the worker!");
-    log(event);
-    for (var i in event)
-        log("event[" + i + "]: " + event[i]);
-};
-
-databaseWorker.onmessage = function(event) {
-    if (event.data.indexOf('log:') == 0) {
-        log(event.data.substring(4));
-    } else if (event.data == 'notifyDone') {
-        if (window.testRunner)
-            testRunner.notifyDone();
-    } else if (event.data.indexOf('setLocationHash:') == '0') {
-        location.hash = event.data.substring('setLocationHash:'.length);
-    } else if (event.data == 'back') {
-        history.back();
-    } else
-        throw new Error("Unrecognized message: " + event);
-};
-
-function log(message)
-{
-    document.getElementById("console").innerText += message + "\n";
-}
-
-function runTest(testFile)
-{
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-    document.getElementById("console").innerText = "";
-    databaseWorker.postMessage("importScripts:../../../storage/websql/" + testFile);
-    databaseWorker.postMessage("runTest");
-}
-
diff --git a/LayoutTests/fast/workers/storage/resources/database-worker.js b/LayoutTests/fast/workers/storage/resources/database-worker.js
deleted file mode 100644 (file)
index 9d7ad7a..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-var window = {
-    testRunner: {
-        notifyDone: function() { postMessage("notifyDone"); }
-    }
-};
-var testRunner = window.testRunner;
-
-function log(s) {
-    postMessage("log:" + s);
-}
-
-onmessage = function(event) {
-    try {
-        if (event.data.indexOf("importScripts:") == 0) {
-            var scripts = event.data.substring("importScripts:".length).split(",");
-            for (var i in scripts)
-                scripts[i] = "../" + scripts[i];
-            importScripts(scripts);
-        } else if (event.data == "runTest")
-            runTest(); // Must be defined by some imported script.
-        else
-            log("Received unexpected message: " + event.data);
-    } catch (ex) {
-        log("Worker caught exception: " + ex);
-        window.testRunner.notifyDone();
-    }
-};
-
-var DB_TEST_SUFFIX = "_worker";
-
-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);
-    }
-}
-
diff --git a/LayoutTests/fast/workers/storage/resources/empty-statement-sync.js b/LayoutTests/fast/workers/storage/resources/empty-statement-sync.js
deleted file mode 100644 (file)
index 0f45e34..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-try {
-    var db = openDatabaseSync("EmptyStatementSync", "1.0", "Test an empty statement.", 1);
-    db.transaction(function(tx) {
-        var result = tx.executeSql("");
-        postMessage(result ? "FAIL: result is not null" : "PASS: result is null");
-    });
-    postMessage("PASS");
-} catch (err) {
-    postMessage("FAIL");
-}
-
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/execute-sql-args-sync.js b/LayoutTests/fast/workers/storage/resources/execute-sql-args-sync.js
deleted file mode 100644 (file)
index aca97b3..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-var throwOnToStringObject = { };
-throwOnToStringObject.toString = function () { throw "Cannot call toString on this object." };
-
-var throwOnGetLengthObject = { };
-throwOnGetLengthObject.__defineGetter__("length", function () { throw "Cannot get length of this object."; });
-
-var throwOnGetZeroObject = { length: 1 };
-throwOnGetZeroObject.__defineGetter__("0", function () { throw "Cannot get 0 property of this object."; });
-
-var expectNoException = [
-    '""',
-    '"", null',
-    '"", undefined',
-    '"", []',
-    '"", [ "arg0" ]',
-    '"", { }',
-    '"", { length: 0 }',
-    '"", { length: 1, 0: "arg0" }',
-];
-
-var expectException = [
-    '',
-    'null',
-    'undefined',
-    '0',
-    'throwOnToStringObject',
-    '"", throwOnGetLengthObject',
-    '"", throwOnGetZeroObject',
-    '"", [ throwOnToStringObject ]',
-    '"", 0',
-    '"", ""',
-];
-
-function tryExecuteSql(transaction, parameterList)
-{
-    try {
-        eval('transaction.executeSql(' + parameterList + ')');
-        return null;
-    } catch (exception) {
-        return exception;
-    }
-}
-
-function runTransactionTest(transaction, parameterList, expectException)
-{
-    var exception = tryExecuteSql(transaction, parameterList);
-    if (expectException) {
-        if (exception)
-            postMessage("PASS: executeSql(" + parameterList + ") threw an exception as expected.");
-        else
-            postMessage("FAIL: executeSql(" + parameterList + ") did not throw an exception.");
-    } else {
-        if (exception)
-            postMessage("FAIL: executeSql(" + parameterList + ") threw an exception: " + exception);
-        else
-            postMessage("PASS: executeSql(" + parameterList + ") did not throw an exception.");
-    }
-}
-
-function runTransactionTests(transaction)
-{
-    for (i in expectNoException)
-        runTransactionTest(transaction, expectNoException[i], false);
-    for (i in expectException)
-        runTransactionTest(transaction, expectException[i], true);
-}
-
-var db = openDatabaseSync("ExecuteSQLArgsTest", "1.0", "Test of handling of the arguments to SQLTransactionSync.executeSql", 1);
-db.transaction(runTransactionTests);
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/executesql-accepts-only-one-statement-sync.js b/LayoutTests/fast/workers/storage/resources/executesql-accepts-only-one-statement-sync.js
deleted file mode 100644 (file)
index 25360c0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-function executeStatement(tx, expectedToPass, statement)
-{
-    var message;
-    try {
-        tx.executeSql(statement);
-        message = expectedToPass ? "PASS: " : "FAIL: ";
-    } catch (err) {
-        message = !expectedToPass ? "PASS: " : "FAIL: ";
-    }
-    postMessage(message + statement + ", " + db.lastErrorMessage);
-}
-
-var db = openDatabaseSync("ExecuteSQLAcceptsOnlyOneStatementTest", "1.0", "", 1);
-db.transaction(function(tx) {
-    tx.executeSql("CREATE TABLE IF NOT EXISTS Test (Foo INT)");
-    executeStatement(tx, true, "INSERT INTO Test VALUES (1)");
-    executeStatement(tx, true, "INSERT INTO Test VALUES (2);");
-    executeStatement(tx, true, "   INSERT INTO Test VALUES (3)    ");
-    executeStatement(tx, true, "   INSERT INTO Test VALUES (4);   ");
-    executeStatement(tx, true, "INSERT INTO Test VALUES (5)   ;");
-    executeStatement(tx, false, "INSERT INTO Test VALUES (6); garbage");
-    executeStatement(tx, false, "INSERT INTO Test VALUES (7); INSERT INTO Test VALUES (8)");
-    executeStatement(tx, false, "  INSERT INTO Test VALUES (9);   INSERT INTO Test VALUES (10);   ");
-});
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/interrupt-database-sync.js b/LayoutTests/fast/workers/storage/resources/interrupt-database-sync.js
deleted file mode 100644 (file)
index e533f08..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-var db = openDatabaseSync("InterruptDatabaseSyncTest", "1", "", 1);
-db.transaction(function(tx) {
-    tx.executeSql("CREATE TABLE IF NOT EXISTS Test (Foo INT)");
-    var counter = 0;
-    while (true) {
-        // Put both statements on the same line, to make sure the exception is always reported on the same line.
-        tx.executeSql("INSERT INTO Test VALUES (1)"); tx.executeSql("DELETE FROM Test WHERE Foo = 1");
-        if (++counter == 100)
-            postMessage("terminate");
-    }
-});
diff --git a/LayoutTests/fast/workers/storage/resources/interrupt-database.js b/LayoutTests/fast/workers/storage/resources/interrupt-database.js
deleted file mode 100644 (file)
index 3f71a45..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-var counter = 0;
-function runTransaction()
-{
-    db.transaction(function(tx) {
-        tx.executeSql("INSERT INTO Test VALUES (1)");
-        tx.executeSql("DELETE FROM Test WHERE Foo = 1");
-        if (++counter == 100)
-            postMessage("terminate");
-    }, null, runTransaction);
-}
-
-var db = openDatabase("InterruptDatabaseTest", "1", "", 1);
-db.transaction(function(tx) {
-    tx.executeSql("CREATE TABLE IF NOT EXISTS Test (Foo INT)");
-}, function(error) {
-    postMessage("Error: " + error.message);
-}, function() {
-    runTransaction();
-});
diff --git a/LayoutTests/fast/workers/storage/resources/multiple-transactions-on-different-handles-sync.js b/LayoutTests/fast/workers/storage/resources/multiple-transactions-on-different-handles-sync.js
deleted file mode 100644 (file)
index f08e449..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-function runTransaction(db)
-{
-    db.transaction(function(tx) {
-       // Execute a read-only statement
-       tx.executeSql("SELECT COUNT(*) FROM Test;");
-
-       // Execute a write statement to make sure SQLite tries to acquire an exclusive lock on the DB file
-       tx.executeSql("INSERT INTO Test VALUES (?);", [1]);
-    });
-}
-
-var db1 = openDatabaseSync("MultipleTransactionsOnDifferentHandlesTest", "1.0",
-                           "Test transactions on different handles to the same DB.", 1);
-db1.transaction(function(tx) {
-    tx.executeSql("CREATE TABLE IF NOT EXISTS Test (Foo int);");
-});
-
-var db2 = openDatabaseSync("MultipleTransactionsOnDifferentHandlesTest", "1.0",
-                           "Test transactions on different handles to the same DB.", 1);
-if (db1 == db2)
-    postMessage("FAIL: db1 == db2");
-else {
-    try {
-        runTransaction(db1);
-        runTransaction(db2);
-        postMessage("PASS");
-    } catch (err) {
-        postMessage("FAIL: " + err);
-    }
-}
-
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/multiple-transactions-sync.js b/LayoutTests/fast/workers/storage/resources/multiple-transactions-sync.js
deleted file mode 100644 (file)
index 2feb3ad..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-var complete = 0;
-
-function checkCompletion()
-{
-    if (++complete == 2 && window.testRunner)
-        testRunner.notifyDone();
-}
-
-function runTest()
-{
-    var db = openDatabaseWithSuffix("MultipleTransactionsTest", "1.0", "Test to make sure multiple transactions can be queued at once for an HTML5 database", 32768);
-
-    db.transaction(function(tx) {
-        log("Transaction 1 Started");
-    }, function(err) {
-        log("Transaction 1 Errored - " + err);
-        checkCompletion();
-    }, function() {
-        log("Transaction 1 Succeeded");
-        checkCompletion();
-    });
-
-    db.transaction(function(tx) {
-        log("Transaction 2 Started");
-    }, function(err) {
-        log("Transaction 2 Errored - " + err);
-        checkCompletion();
-    }, function() {
-        log("Transaction 2 Succeeded");
-        checkCompletion();
-    });
-}
diff --git a/LayoutTests/fast/workers/storage/resources/open-database-creation-callback-sync.js b/LayoutTests/fast/workers/storage/resources/open-database-creation-callback-sync.js
deleted file mode 100644 (file)
index 70ad676..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-var creationCallbackCalled1 = false;
-var db1Name = "OpenDatabaseCreationCallback1" + (new Date()).getTime();
-var db2Name = "OpenDatabaseCreationCallback2" + (new Date()).getTime();
-var db1 = openDatabaseSync(db1Name, "1.0", "", 1,
-                           function(db) {
-                               postMessage("PASS: Creation callback was called.");
-                               if (db.version != "")
-                                   postMessage("FAIL: Wrong version " + db.version + "; empty string expected.");
-                               else
-                                   postMessage("PASS: Version set to empty string as expected.");
-                           });
-
-var db1Fail = null;
-try {
-    db1Fail = openDatabaseSync(db1Name, "1.0", "", 1);
-    postMessage("FAIL: An INVALID_STATE_ERR exception should've been thrown.");
-} catch(err) {
-    if (db1Fail)
-        postMessage("FAIL: db1Fail should have been null.");
-    else
-        postMessage("PASS: An exception was thrown and db1Fail is null as expected.");
-}
-
-// Open a handle to another database, first without a creation callback, then with one.
-// Make sure the creation callback is not called.
-var db2 = openDatabaseSync(db2Name, "1.0", "", 1);
-db2 = openDatabaseSync(db2Name, "1.0", "", 1, function(db) { postMessage("FAIL: Creation callback should not have been called."); });
-
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/open-database-empty-version-sync.js b/LayoutTests/fast/workers/storage/resources/open-database-empty-version-sync.js
deleted file mode 100644 (file)
index fab21ab..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-try {
-    var db = openDatabaseSync("OpenDatabaseEmptyVersionTest", "", "Test that we can open databases with an empty version.", 1);
-    postMessage("PASS");
-} catch (err) {
-    postMessage("FAIL: " + err);
-}
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/open-database-inputs-sync.js b/LayoutTests/fast/workers/storage/resources/open-database-inputs-sync.js
deleted file mode 100644 (file)
index 1e0495a..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-var db;
-
-var notAString = {
-    toString: function() { throw "foo"; }
-};
-
-try {
-    db = openDatabaseSync();
-    postMessage("FAIL: calling openDatabaseSync() without any argument should throw an exception.");
-} catch (err) {
-    postMessage("PASS: " + err.message);
-}
-
-try {
-    db = openDatabaseSync("DBName", "DBVersion");
-    postMessage("FAIL: calling openDatabaseSync() with fewer than four arguments should throw an exception.");
-} catch (err) {
-    postMessage("PASS: " + err.message);
-}
-
-try {
-    db = openDatabaseSync(notAString, "DBVersion", "DBDescription", 1024);
-    postMessage("FAIL: the first argument to openDatabaseSync() must be a string.");
-} catch (err) {
-    postMessage("PASS: " + err.message);
-}
-
-try {
-    db = openDatabaseSync("DBName", notAString, "DBDescription", 1024);
-    postMessage("FAIL: the second argument to openDatabaseSync() must be a string.");
-} catch (err) {
-    postMessage("PASS: " + err.message);
-}
-
-try {
-    db = openDatabaseSync("DBName", "DBVersion", notAString, 1024);
-    postMessage("FAIL: the third argument to openDatabaseSync() must be a string.");
-} catch (err) {
-    postMessage("PASS: " + err.message);
-}
-
-try {
-    db = openDatabaseSync("DBName", "DBVersion", "DBDescription", 1024, 0);
-    postMessage("FAIL: the fifth argument to openDatabaseSync() must be an object, if present.");
-} catch (err) {
-    postMessage("PASS: " + err.message);
-}
-
-try {
-    db = openDatabaseSync("DBName", "DBVersion", "DBDescription", 1024);
-    postMessage("PASS: openDatabaseSync() succeeded.");
-} catch (err) {
-    postMessage("FAIL: " + err.message);
-}
-
-// Run this test case one more time, to test the code with an existing database.
-try {
-    db = openDatabaseSync("DBName", "DBVersion", "DBDescription", 1024);
-    postMessage("PASS: openDatabaseSync() succeeded.");
-} catch (err) {
-    postMessage("FAIL: " + err.message);
-}
-
-try {
-    // Need to create a new database, otherwise the creation callback won't be invoked.
-    db = openDatabaseSync("DBNameCreationCallback" + (new Date()).getTime(), "DBVersion", "DBDescription", 1024,
-                          function(db) {
-                              postMessage("PASS: calling openDatabaseSync() with a creation callback succeeded.");
-                          });
-} catch (err) {
-    postMessage("FAIL: " + err.message);
-}
-
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/open-database-set-empty-version-sync.js b/LayoutTests/fast/workers/storage/resources/open-database-set-empty-version-sync.js
deleted file mode 100644 (file)
index 77727f8..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-var db = openDatabaseSync("OpenDatabaseSetEmptyVersionTest", "", "Test that the DB version is set to the empty string.", 1);
-
-try {
-    var db2 = openDatabaseSync("OpenDatabaseSetEmptyVersionTest", "test", "Test that the DB version is set to the empty string.", 1);
-    postMessage("FAIL: An exception should've been thrown.");
-} catch (err) {
-    postMessage("PASS");
-}
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/open-database-while-transaction-in-progress-sync.js b/LayoutTests/fast/workers/storage/resources/open-database-while-transaction-in-progress-sync.js
deleted file mode 100644 (file)
index ee4241f..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-function openTestDatabase()
-{
-    return openDatabaseSync("OpenDatabaseWhileTransactionInProgressTest",
-                            "1.0",
-                            "Test to make sure that calling openDatabase() while a transaction is in progress on a different handle to the same database does not result in a deadlock.",
-                            2100000); // 2MB + epsilon
-}
-
-// See https://bugs.webkit.org/show_bug.cgi?id=28207
-// In order to trigger this bug, the transaction must acquire an exclusive
-// lock on the DB file before trying to obtain a second handle to the same DB.
-// The only way to force SQLite to obtain an exclusive lock is to change more
-// than cache_size * page_size bytes in the database. The default value for
-// cache_size is 2000 pages, and the default page_size is 1024 bytes. So the
-// size of the blob must be at least 2MB.
-var db1 = openTestDatabase();
-db1.transaction(function(tx) {
-    tx.executeSql("CREATE TABLE IF NOT EXISTS Test (Foo BLOB);");
-    tx.executeSql("INSERT INTO Test VALUES (ZEROBLOB(2097152));");
-    var db2 = openTestDatabase();
-    postMessage("PASS: second handle opened successfully.");
-
-    // Clean up the DB to allow for repeated runs of this test
-    // without needing to increase the default allowed quota (5MB)
-    tx.executeSql("DELETE FROM Test;");
-});
-
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/sql-data-types-sync.js b/LayoutTests/fast/workers/storage/resources/sql-data-types-sync.js
deleted file mode 100644 (file)
index b088792..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-var testValues = {
-    timestamp: new Date("Wed Feb 06 2008 12:16:52 GMT+0200 (EET)").valueOf(),
-    id: 1001,
-    real: 101.444,
-    text: "WebKit db TEXT",
-    blob: "supercalifragilistic"
-};
-
-function shouldBeSameTypeAndValue(propName, testValue, result) {
-    if (testValue == result && typeof testValue == typeof result)
-        postMessage("PASS: property '" + propName + "' OK, type was " + typeof result);
-    else
-        postMessage("FAIL: property '" + propName + "' failed; " +
-                    "expected " + typeof testValue + ":'" + testValue + "', " +
-                    "got " + typeof result + ":'" + result +"'");
-}
-
-function testDBValues(result) {
-    var i = "timestamp"; shouldBeSameTypeAndValue(i, testValues[i], result[i]);
-    i = "id"; shouldBeSameTypeAndValue(i, testValues[i], result[i]);
-    i = "real"; shouldBeSameTypeAndValue(i, testValues[i], result[i]);
-    i = "text"; shouldBeSameTypeAndValue(i, testValues[i], result[i]);
-    i = "blob"; shouldBeSameTypeAndValue(i, testValues[i], result[i]);
-}
-
-var db = openDatabaseSync("SQLDataTypesTest", "1.0", "Database for SQL data type test", 1);
-db.transaction(function(tx) {
-    tx.executeSql("CREATE TABLE IF NOT EXISTS DataTypeTestTable (id INTEGER UNIQUE, real REAL, timestamp INTEGER, text TEXT, blob BLOB)");
-    tx.executeSql("INSERT INTO DataTypeTestTable (id, real, timestamp, text, blob) VALUES (?,?,?,?,?)",
-                  [testValues.id, testValues.real, testValues.timestamp, testValues.text, testValues.blob]);
-    var result = tx.executeSql("SELECT * FROM DataTypeTestTable");
-    testDBValues(result.rows.item(0));
-    tx.executeSql("DROP TABLE DataTypeTestTable");
-});
-
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/sql-exception-codes-sync.js b/LayoutTests/fast/workers/storage/resources/sql-exception-codes-sync.js
deleted file mode 100644 (file)
index d9e4b1a..0000000
+++ /dev/null
@@ -1,86 +0,0 @@
-var dbName = "SQLExceptionCodesTest" + (new Date()).getTime();
-
-function testTransaction(db, executeStatementsCallback, expectedErrorCodeName)
-{
-    db.transaction(function(tx) {
-        try {
-            executeStatementsCallback(tx);
-            postMessage("FAIL: an exception (" + expectedErrorCodeName + ") should've been thrown.");
-        } catch (err) {
-            if (err.code == err[expectedErrorCodeName])
-                postMessage("PASS: expected and got error code " + expectedErrorCodeName);
-            else
-                postMessage("FAIL: expected error code " + expectedErrorCodeName + " (" +
-                            err[expectedErrorCodeName] + "), got " + err.code);
-        }
-      });
-}
-
-function testTransactionThrowsException(db)
-{
-    testTransaction(db, function(tx) { throw "Exception thrown in transaction callback."; }, "UNKNOWN_ERR");
-}
-
-function testInvalidStatement(db)
-{
-    testTransaction(db, function(tx) { tx.executeSql("BAD STATEMENT"); }, "SYNTAX_ERR");
-}
-
-function testIncorrectNumberOfBindParameters(db)
-{
-    testTransaction(db,
-                    function(tx) {
-                        tx.executeSql("CREATE TABLE IF NOT EXISTS BadBindNumberTest (Foo INT, Bar INT)");
-                        tx.executeSql("INSERT INTO BadBindNumberTest VALUES (?, ?)", [1]);
-                    }, "SYNTAX_ERR");
-}
-
-function testBindParameterOfWrongType(db)
-{
-    var badString = { };
-    badString.toString = function() { throw "Cannot call toString() on this object." };
-
-    testTransaction(db, function(tx) {
-        tx.executeSql("CREATE TABLE IF NOT EXISTS BadBindTypeTest (Foo TEXT)");
-        tx.executeSql("INSERT INTO BadBindTypeTest VALUES (?)", [badString]);
-    }, "UNKNOWN_ERR");
-}
-
-function testQuotaExceeded(db)
-{
-    // Sometimes, SQLite automatically rolls back a transaction if executing a statement fails.
-    // This seems to be one of those cases.
-    try {
-        testTransaction(db,
-                        function(tx) {
-                            tx.executeSql("CREATE TABLE IF NOT EXISTS QuotaTest (Foo BLOB)");
-                            tx.executeSql("INSERT INTO QuotaTest VALUES (ZEROBLOB(10 * 1024 * 1024))");
-                        }, "QUOTA_ERR");
-        postMessage("FAIL: Transaction should've been rolled back by SQLite.");
-    } catch (err) {
-        if (err.code == err["DATABASE_ERR"])
-            postMessage("PASS: Transaction was rolled back by SQLite as expected.");
-        else
-            postMessage("FAIL: An unexpected exception was thrown: " + err);
-    }
-}
-
-function testVersionMismatch(db)
-{
-    var db2 = openDatabaseSync(dbName, "1.0", "Tests the error codes.", 1);
-    db2.changeVersion("1.0", "2.0", function(tx) { });
-    testTransaction(db,
-                    function(tx) {
-                        tx.executeSql("THIS STATEMENT SHOULD NEVER GET EXECUTED");
-                    }, "VERSION_ERR");
-}
-
-var db = openDatabaseSync(dbName, "1.0", "Tests the exception codes.", 1);
-testTransactionThrowsException(db);
-testInvalidStatement(db);
-testIncorrectNumberOfBindParameters(db);
-testBindParameterOfWrongType(db);
-testQuotaExceeded(db);
-testVersionMismatch(db);
-
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/test-authorizer-sync.js b/LayoutTests/fast/workers/storage/resources/test-authorizer-sync.js
deleted file mode 100644 (file)
index de7b2b0..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-function cleanup(db)
-{
-    db.transaction(function(tx) {
-            tx.executeSql("DROP TABLE IF EXISTS Test");
-            tx.executeSql("DROP INDEX IF EXISTS TestIndex");
-            tx.executeSql("DROP VIEW IF EXISTS TestView");
-            tx.executeSql("DROP TRIGGER IF EXISTS TestTrigger");
-    });
-}
-
-function executeStatement(tx, statement, operation)
-{
-    try {
-        tx.executeSql(statement);
-        postMessage(operation + " allowed.");
-    } catch (err) {
-        postMessage(operation + " not allowed: " + err + " (" + err.code + ")");
-    }
-}
-
-function createTableCallback(tx)
-{
-    executeStatement(tx, "CREATE TABLE Test (Foo int)", "SQLITE_CREATE_TABLE");
-}
-
-function createStatementsCallback(tx)
-{
-    executeStatement(tx, "CREATE INDEX TestIndex ON Test (Foo)", "SQLITE_CREATE_INDEX");
-
-    // Even though the following query should trigger a SQLITE_CREATE_TEMP_INDEX operation
-    // (according to http://www.sqlite.org/tempfiles.html), it doesn't, and I'm not aware
-    // of any other way to trigger this operation. So we'll skip it for now.
-    //executeStatement(tx, "SELECT * FROM Test WHERE Foo IN (1, 2, 3)", "SQLITE_CREATE_TEMP_INDEX");
-
-    executeStatement(tx, "CREATE TEMP TABLE TestTempTable (Foo int)", "SQLITE_CREATE_TEMP_TABLE");
-    executeStatement(tx, "CREATE TEMP TRIGGER TestTempTrigger INSERT ON Test BEGIN SELECT COUNT(*) FROM Test; END", "SQLITE_CREATE_TEMP_TRIGGER");
-    executeStatement(tx, "CREATE TEMP VIEW TestTempView AS SELECT COUNT(*) FROM Test", "SQLITE_CREATE_TEMP_VIEW");
-    executeStatement(tx, "CREATE TRIGGER TestTrigger INSERT ON Test BEGIN SELECT COUNT(*) FROM Test; END", "SQLITE_CREATE_TRIGGER");
-    executeStatement(tx, "CREATE VIEW TestView AS SELECT COUNT(*) FROM Test", "SQLITE_CREATE_VIEW");
-
-    // We should try to create a virtual table using fts3, when WebKit's sqlite library supports it.
-    executeStatement(tx, "CREATE VIRTUAL TABLE TestVirtualTable USING UnsupportedModule", "SQLITE_CREATE_VTABLE");
-}
-
-function otherStatementsCallback(tx)
-{
-    executeStatement(tx, "SELECT COUNT(*) FROM Test", "SQLITE_READ");
-    executeStatement(tx, "SELECT COUNT(*) FROM Test", "SQLITE_SELECT");
-    executeStatement(tx, "DELETE FROM Test", "SQLITE_DELETE");
-    executeStatement(tx, "INSERT INTO Test VALUES (1)", "SQLITE_INSERT");
-    executeStatement(tx, "UPDATE Test SET Foo = 2 WHERE Foo = 1", "SQLITE_UPDATE");
-    executeStatement(tx, "PRAGMA cache_size", "SQLITE_PRAGMA");
-
-    executeStatement(tx, "ALTER TABLE Test RENAME TO TestTable", "SQLITE_ALTER_TABLE");
-    // Rename the table back to its original name
-    executeStatement(tx, "ALTER TABLE TestTable RENAME To Test", "SQLITE_ALTER_TABLE");
-
-    executeStatement(tx, "BEGIN TRANSACTION", "SQLITE_TRANSACTION");
-    executeStatement(tx, "ATTACH main AS TestMain", "SQLITE_ATTACH");
-    executeStatement(tx, "DETACH TestMain", "SQLITE_DETACH");
-    executeStatement(tx, "REINDEX", "SQLITE_REINDEX");
-    executeStatement(tx, "ANALYZE", "SQLITE_ANALYZE");
-
-    // SQLITE_FUNCTION: allowed in write mode
-    // There is no SQL/Javascript API to add user-defined functions to SQLite,
-    // so we cannot test this operation
-}
-
-function dropStatementsCallback(tx)
-{
-    executeStatement(tx, "DROP INDEX TestIndex", "SQLITE_DROP_INDEX");
-
-    // SQLITE_DROP_TEMP_INDEX: allowed in write mode
-    // Not sure how to test this: temp indexes are automatically dropped when
-    // the database is closed, but HTML5 doesn't specify a closeDatabase() call.
-
-    executeStatement(tx, "DROP TABLE TestTempTable", "SQLITE_DROP_TEMP_TABLE");
-    executeStatement(tx, "DROP TRIGGER TestTempTrigger", "SQLITE_DROP_TEMP_TRIGGER");
-    executeStatement(tx, "DROP VIEW TestTempView", "SQLITE_DROP_TEMP_VIEW");
-    executeStatement(tx, "DROP TRIGGER TestTrigger", "SQLITE_DROP_TRIGGER");
-    executeStatement(tx, "DROP VIEW TestView", "SQLITE_DROP_VIEW");
-
-    // SQLITE_DROP_VTABLE: allowed in write mode
-    // Not sure how to test this: we cannot create a virtual table because we do not
-    // have SQL/Javascript APIs to register a module that implements a virtual table.
-    // Therefore, trying to drop a virtual table will always fail (no such table)
-    // before even getting to the authorizer.
-
-    executeStatement(tx, "DROP TABLE Test", "SQLITE_DROP_TABLE");
-}
-
-function testReadWriteMode(db)
-{
-    db.transaction(function(tx) {
-        postMessage("Beginning write transaction:");
-        createTableCallback(tx);
-        createStatementsCallback(tx);
-        otherStatementsCallback(tx);
-        dropStatementsCallback(tx);
-        postMessage("Write transaction succeeded.\n");
-    });
-}
-
-function testReadOnlyMode(db)
-{
-    postMessage("Beginning read transactions:");
-    // Test the 'CREATE TABLE' operation; it should be disallowed
-    db.readTransaction(createTableCallback);
-
-    // In order to test all other 'CREATE' operations, we must create the table first
-    db.transaction(createTableCallback);
-    db.readTransaction(createStatementsCallback);
-
-    // In order to test the 'DROP' and 'other' operations, we need to first create the respective entities
-    db.transaction(createStatementsCallback);
-    db.readTransaction(otherStatementsCallback);
-    db.readTransaction(dropStatementsCallback);
-    postMessage("Read transactions succeeded.");
-}
-
-var db = openDatabaseSync("TestAuthorizerTest", "1.0", "Test the database authorizer.", 1);
-cleanup(db);
-testReadWriteMode(db);
-testReadOnlyMode(db);
-
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/test-inputs-common.js b/LayoutTests/fast/workers/storage/resources/test-inputs-common.js
deleted file mode 100644 (file)
index 3183b22..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-function log(message)
-{
-    document.getElementById("console").innerHTML += message + "<br>";
-}
-
-function finishTest()
-{
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function runTest(workerJSFile)
-{
-    if (!workerJSFile) {
-        log("FAIL: no JS file specified for the worker.");
-    }
-
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-
-    var worker = new Worker(workerJSFile);
-    worker.onmessage = function(event) {
-        if (event.data == "done")
-            finishTest();
-        else
-            log(event.data);
-    }
-}
diff --git a/LayoutTests/fast/workers/storage/resources/transaction-in-transaction-sync.js b/LayoutTests/fast/workers/storage/resources/transaction-in-transaction-sync.js
deleted file mode 100644 (file)
index c61b96d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-var db = openDatabaseSync("TransactionInTransactionTest", "1.0", "Test that trying to run a nested transaction fails.", 1);
-db.transaction(function(tx) {
-    try {
-        db.transaction(function(nestedTx) { });
-        postMessage("FAIL: Trying to run a nested transaction should throw an exception." + db.lastErrorMessage);
-    } catch (err) {
-        postMessage("PASS: Exception thrown while trying to run a nested transaction (" + db.lastErrorMessage + ").");
-    }
-});
-
-postMessage("done");
diff --git a/LayoutTests/fast/workers/storage/resources/use-same-database-in-page-and-workers.js b/LayoutTests/fast/workers/storage/resources/use-same-database-in-page-and-workers.js
deleted file mode 100644 (file)
index e73f280..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-var db = openDatabase("UseSameDatabaseInPageAndWorkers", "", "", 1);
-for (var i = 0; i < 100; i++) {
-    db.transaction(function(tx) {
-        tx.executeSql("INSERT INTO Test VALUES (?)", [i], null,
-                      function(tx, error) { postMessage(error.message); });
-      }, function(error) { postMessage(error.message); },
-      function() { postMessage("transactionSuccessful"); });
-}
diff --git a/LayoutTests/fast/workers/storage/sql-data-types-sync-expected.txt b/LayoutTests/fast/workers/storage/sql-data-types-sync-expected.txt
deleted file mode 100644 (file)
index 95b8db5..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-Test that the values returned by DB queries are of the same type as the values inserted in the database.
-PASS: property 'timestamp' OK, type was number
-PASS: property 'id' OK, type was number
-PASS: property 'real' OK, type was number
-PASS: property 'text' OK, type was string
-PASS: property 'blob' OK, type was string
-
diff --git a/LayoutTests/fast/workers/storage/sql-data-types-sync.html b/LayoutTests/fast/workers/storage/sql-data-types-sync.html
deleted file mode 100644 (file)
index cd639f6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/sql-data-types-sync.js')">
-Test that the values returned by DB queries are of the same type as the values inserted in the database.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/sql-exception-codes-sync-expected.txt b/LayoutTests/fast/workers/storage/sql-exception-codes-sync-expected.txt
deleted file mode 100644 (file)
index 6bdaa15..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-Test that the correct exceptions are thrown in exceptional situations.
-PASS: expected and got error code UNKNOWN_ERR
-PASS: expected and got error code SYNTAX_ERR
-PASS: expected and got error code SYNTAX_ERR
-PASS: expected and got error code UNKNOWN_ERR
-PASS: expected and got error code QUOTA_ERR
-PASS: Transaction was rolled back by SQLite as expected.
-PASS: expected and got error code VERSION_ERR
-
diff --git a/LayoutTests/fast/workers/storage/sql-exception-codes-sync.html b/LayoutTests/fast/workers/storage/sql-exception-codes-sync.html
deleted file mode 100644 (file)
index 2cb4901..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/sql-exception-codes-sync.js')">
-Test that the correct exceptions are thrown in exceptional situations.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/test-authorizer-expected.txt b/LayoutTests/fast/workers/storage/test-authorizer-expected.txt
deleted file mode 100644 (file)
index bbfafd4..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-This test tests the database authorizer.
-SQLITE_CREATE_TABLE statement succeeded.
-SQLITE_CREATE_INDEX statement succeeded.
-SQLITE_CREATE_TEMP_TABLE statement succeeded.
-SQLITE_CREATE_TEMP_TRIGGER statement succeeded.
-SQLITE_CREATE_TEMP_VIEW statement succeeded.
-SQLITE_CREATE_TRIGGER statement succeeded.
-SQLITE_CREATE_VIEW statement succeeded.
-SQLITE_CREATE_VTABLE statement failed: could not prepare statement (23 not authorized)
-SQLITE_READ statement succeeded.
-SQLITE_SELECT statement succeeded.
-SQLITE_DELETE statement succeeded.
-SQLITE_INSERT statement succeeded.
-SQLITE_UPDATE statement succeeded.
-SQLITE_PRAGMA statement failed: could not prepare statement (23 not authorized)
-SQLITE_ALTER_TABLE statement succeeded.
-SQLITE_ALTER_TABLE statement succeeded.
-SQLITE_TRANSACTION statement failed: could not prepare statement (23 not authorized)
-SQLITE_ATTACH statement failed: could not prepare statement (23 not authorized)
-SQLITE_DETACH statement failed: could not prepare statement (23 not authorized)
-SQLITE_REINDEX statement succeeded.
-SQLITE_ANALYZE statement failed: could not prepare statement (23 not authorized)
-SQLITE_DROP_INDEX statement succeeded.
-SQLITE_DROP_TEMP_TABLE statement succeeded.
-SQLITE_DROP_TEMP_TRIGGER statement succeeded.
-SQLITE_DROP_TEMP_VIEW statement succeeded.
-SQLITE_DROP_TRIGGER statement succeeded.
-SQLITE_DROP_VIEW statement succeeded.
-SQLITE_DROP_TABLE statement succeeded.
-Write transaction succeeded.
-SQLITE_CREATE_TABLE statement failed: could not prepare statement (1 not authorized)
-SQLITE_CREATE_TABLE statement succeeded.
-SQLITE_CREATE_INDEX statement failed: could not prepare statement (23 not authorized)
-SQLITE_CREATE_TEMP_TABLE statement failed: could not prepare statement (1 not authorized)
-SQLITE_CREATE_TEMP_TRIGGER statement failed: could not prepare statement (1 not authorized)
-SQLITE_CREATE_TEMP_VIEW statement failed: could not prepare statement (23 not authorized)
-SQLITE_CREATE_TRIGGER statement failed: could not prepare statement (1 not authorized)
-SQLITE_CREATE_VIEW statement failed: could not prepare statement (23 not authorized)
-SQLITE_CREATE_VTABLE statement failed: could not prepare statement (23 not authorized)
-SQLITE_CREATE_INDEX statement succeeded.
-SQLITE_CREATE_TEMP_TABLE statement succeeded.
-SQLITE_CREATE_TEMP_TRIGGER statement succeeded.
-SQLITE_CREATE_TEMP_VIEW statement succeeded.
-SQLITE_CREATE_TRIGGER statement succeeded.
-SQLITE_CREATE_VIEW statement succeeded.
-SQLITE_CREATE_VTABLE statement failed: could not prepare statement (23 not authorized)
-SQLITE_READ statement succeeded.
-SQLITE_SELECT statement succeeded.
-SQLITE_DELETE statement failed: could not prepare statement (23 not authorized)
-SQLITE_INSERT statement failed: could not prepare statement (23 not authorized)
-SQLITE_UPDATE statement failed: could not prepare statement (23 not authorized)
-SQLITE_PRAGMA statement failed: could not prepare statement (23 not authorized)
-SQLITE_ALTER_TABLE statement failed: could not prepare statement (23 not authorized)
-SQLITE_ALTER_TABLE statement failed: could not prepare statement (1 no such table: TestTable)
-SQLITE_TRANSACTION statement failed: could not prepare statement (23 not authorized)
-SQLITE_ATTACH statement failed: could not prepare statement (23 not authorized)
-SQLITE_DETACH statement failed: could not prepare statement (23 not authorized)
-SQLITE_REINDEX statement failed: could not prepare statement (23 not authorized)
-SQLITE_ANALYZE statement failed: could not prepare statement (23 not authorized)
-SQLITE_DROP_INDEX statement failed: could not prepare statement (23 not authorized)
-SQLITE_DROP_TEMP_TABLE statement failed: could not prepare statement (23 not authorized)
-SQLITE_DROP_TEMP_TRIGGER statement failed: could not prepare statement (23 not authorized)
-SQLITE_DROP_TEMP_VIEW statement failed: could not prepare statement (23 not authorized)
-SQLITE_DROP_TRIGGER statement failed: could not prepare statement (23 not authorized)
-SQLITE_DROP_VIEW statement failed: could not prepare statement (23 not authorized)
-SQLITE_DROP_TABLE statement failed: could not prepare statement (23 not authorized)
-Read transactions succeeded.
-
diff --git a/LayoutTests/fast/workers/storage/test-authorizer-sync-expected.txt b/LayoutTests/fast/workers/storage/test-authorizer-sync-expected.txt
deleted file mode 100644 (file)
index 1c8cef2..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-Test the database authorizer.
-Beginning write transaction:
-SQLITE_CREATE_TABLE allowed.
-SQLITE_CREATE_INDEX allowed.
-SQLITE_CREATE_TEMP_TABLE allowed.
-SQLITE_CREATE_TEMP_TRIGGER allowed.
-SQLITE_CREATE_TEMP_VIEW allowed.
-SQLITE_CREATE_TRIGGER allowed.
-SQLITE_CREATE_VIEW allowed.
-SQLITE_CREATE_VTABLE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_READ allowed.
-SQLITE_SELECT allowed.
-SQLITE_DELETE allowed.
-SQLITE_INSERT allowed.
-SQLITE_UPDATE allowed.
-SQLITE_PRAGMA not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_ALTER_TABLE allowed.
-SQLITE_ALTER_TABLE allowed.
-SQLITE_TRANSACTION not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_ATTACH not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_DETACH not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_REINDEX allowed.
-SQLITE_ANALYZE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_DROP_INDEX allowed.
-SQLITE_DROP_TEMP_TABLE allowed.
-SQLITE_DROP_TEMP_TRIGGER allowed.
-SQLITE_DROP_TEMP_VIEW allowed.
-SQLITE_DROP_TRIGGER allowed.
-SQLITE_DROP_VIEW allowed.
-SQLITE_DROP_TABLE allowed.
-Write transaction succeeded.
-
-Beginning read transactions:
-SQLITE_CREATE_TABLE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_CREATE_TABLE allowed.
-SQLITE_CREATE_INDEX not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_CREATE_TEMP_TABLE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_CREATE_TEMP_TRIGGER not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_CREATE_TEMP_VIEW not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_CREATE_TRIGGER not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_CREATE_VIEW not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_CREATE_VTABLE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_CREATE_INDEX allowed.
-SQLITE_CREATE_TEMP_TABLE allowed.
-SQLITE_CREATE_TEMP_TRIGGER allowed.
-SQLITE_CREATE_TEMP_VIEW allowed.
-SQLITE_CREATE_TRIGGER allowed.
-SQLITE_CREATE_VIEW allowed.
-SQLITE_CREATE_VTABLE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_READ allowed.
-SQLITE_SELECT allowed.
-SQLITE_DELETE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_INSERT not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_UPDATE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_PRAGMA not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_ALTER_TABLE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_ALTER_TABLE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_TRANSACTION not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_ATTACH not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_DETACH not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_REINDEX not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_ANALYZE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_DROP_INDEX not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_DROP_TEMP_TABLE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_DROP_TEMP_TRIGGER not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_DROP_TEMP_VIEW not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_DROP_TRIGGER not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_DROP_VIEW not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-SQLITE_DROP_TABLE not allowed: Error: SYNTAX_ERR: DOM SQL Exception 5 (5)
-Read transactions succeeded.
-
diff --git a/LayoutTests/fast/workers/storage/test-authorizer-sync.html b/LayoutTests/fast/workers/storage/test-authorizer-sync.html
deleted file mode 100644 (file)
index 75622ed..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/test-authorizer-sync.js')">
-Test the database authorizer.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/test-authorizer.html b/LayoutTests/fast/workers/storage/test-authorizer.html
deleted file mode 100644 (file)
index 946b1c0..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-<html>
-<head>
-<script src="resources/database-worker-controller.js"></script>
-</head>
-
-<body onload="runTest('test-authorizer.js')">
-This test tests the database authorizer.<br>
-<pre id="console"> 
-FAILURE: test didn't run.
-</pre> 
-</body>
-
-</html>
diff --git a/LayoutTests/fast/workers/storage/transaction-in-transaction-sync-expected.txt b/LayoutTests/fast/workers/storage/transaction-in-transaction-sync-expected.txt
deleted file mode 100644 (file)
index c045d7f..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Test that trying to run a transaction inside another transaction throws an exception.
-PASS: Exception thrown while trying to run a nested transaction (unable to start a transaction from within a transaction).
-
diff --git a/LayoutTests/fast/workers/storage/transaction-in-transaction-sync.html b/LayoutTests/fast/workers/storage/transaction-in-transaction-sync.html
deleted file mode 100644 (file)
index 033ba1f..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<script src="resources/test-inputs-common.js"></script>
-</head>
-
-<body onload="runTest('resources/transaction-in-transaction-sync.js')">
-Test that trying to run a transaction inside another transaction throws an exception.
-<pre id="console">
-</pre>
-</body>
-</html>
diff --git a/LayoutTests/fast/workers/storage/use-same-database-in-page-and-workers-expected.txt b/LayoutTests/fast/workers/storage/use-same-database-in-page-and-workers-expected.txt
deleted file mode 100644 (file)
index 0e4c7db..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Test that we can successfully use the same database in the page and in multiple workers at the same time.
-PASS
-
diff --git a/LayoutTests/fast/workers/storage/use-same-database-in-page-and-workers.html b/LayoutTests/fast/workers/storage/use-same-database-in-page-and-workers.html
deleted file mode 100644 (file)
index 09b91cc..0000000
+++ /dev/null
@@ -1,88 +0,0 @@
-<html>
-<head>
-<script>
-function finishTest()
-{
-    if (window.testRunner)
-        testRunner.notifyDone();
-}
-
-function log(message)
-{
-    document.getElementById("console").innerHTML += message + "<br>";
-}
-
-function runTest()
-{
-    if (window.testRunner) {
-        testRunner.dumpAsText();
-        testRunner.waitUntilDone();
-    }
-
-    var db = openDatabase("UseSameDatabaseInPageAndWorkers", "", "", 1);
-    db.transaction(function(tx) {
-        tx.executeSql("CREATE TABLE IF NOT EXISTS Test(Foo INT)", [],
-                      function(tx, data) {
-                          startWorkers();
-                          insertData(db);
-                      }, function(tx, error) {
-                          log("Creating table Test failed: " + error.message);
-                          finishTest();
-                      });
-    });
-}
-
-var successfulTransactions = 0
-var WORKER_COUNT = 3;
-function startWorkers()
-{
-    var databaseWorkers = new Array(WORKER_COUNT);
-    for (var i = 0; i < WORKER_COUNT; i++) {
-        databaseWorkers[i] = new Worker('resources/use-same-database-in-page-and-workers.js');
-        databaseWorkers[i].onerror = function(event) {
-            log("Caught an error from a worker: " + event.data);
-            finishTest();
-        }
-        databaseWorkers[i].onmessage = function(event) {
-            if (event.data == "transactionSuccessful")
-                successCallback();
-            else
-                log("Unexpected worker message: " + event.data);
-        }
-    }
-}
-
-function successCallback()
-{
-    successfulTransactions++;
-    if (successfulTransactions == 100 * (WORKER_COUNT + 1)) {
-        log("PASS");
-        finishTest();
-    }
-}
-
-function errorCallback(error)
-{
-    log("executeSql failed: " + error.message);
-    finishTest();
-}
-
-function insertData(db)
-{
-    for (var i = 0; i < 100; i++) {
-        db.transaction(function(tx) {
-            tx.executeSql("INSERT INTO Test VALUES (?)", [i], null,
-                          function(tx, error) { errorCallback(error); });
-        }, errorCallback, successCallback);
-    }
-}
-</script>
-</head>
-
-<body onload="runTest()">
-Test that we can successfully use the same database in the page and in multiple workers at the same time.
-<pre id="console">
-</pre>
-</body>
-
-</html>
diff --git a/LayoutTests/http/tests/security/cross-origin-worker-websql-allowed-expected.txt b/LayoutTests/http/tests/security/cross-origin-worker-websql-allowed-expected.txt
deleted file mode 100644 (file)
index 9946bb4..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-This iframe should not return any errors:
-
-
-This iframe should not return any errors:
-
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-No exception
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-No exception
diff --git a/LayoutTests/http/tests/security/cross-origin-worker-websql-allowed.html b/LayoutTests/http/tests/security/cross-origin-worker-websql-allowed.html
deleted file mode 100644 (file)
index 807880e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<head>
-<script>
-var frames = 2;
-if (window.testRunner) {
-       testRunner.dumpAsText();
-       testRunner.dumpChildFramesAsText();
-       testRunner.waitUntilDone();
-}
-
-function decrement() {
-       --frames;
-       if (!frames && window.testRunner)
-               testRunner.notifyDone();
-}
-
-window.onmessage = decrement;
-</script>
-</head>
-<body>
-<p>This iframe should not return any errors:</p>
-<iframe src="http://localhost:8000/security/resources/cross-origin-iframe-for-worker-websql.html"></iframe>
-<p>This iframe should not return any errors:</p>
-<iframe src="http://127.0.0.1:8000/security/resources/cross-origin-iframe-for-worker-websql.html"></iframe>
-</body>
-</html>
diff --git a/LayoutTests/http/tests/security/cross-origin-worker-websql-expected.txt b/LayoutTests/http/tests/security/cross-origin-worker-websql-expected.txt
deleted file mode 100644 (file)
index eb3fdb7..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-This iframe should return a security error:
-
-
-This iframe should not return any errors:
-
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-SecurityError
-
---------
-Frame: '<!--framePath //<!--frame1-->-->'
---------
-No exception
diff --git a/LayoutTests/http/tests/security/cross-origin-worker-websql.html b/LayoutTests/http/tests/security/cross-origin-worker-websql.html
deleted file mode 100644 (file)
index c6c1b02..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<script>
-
-if (window.testRunner) {
-       testRunner.dumpAsText();
-       testRunner.dumpChildFramesAsText();
-       testRunner.waitUntilDone();
-       testRunner.setCanOpenWindows(true);
-       testRunner.setCloseRemainingWindowsWhenComplete(true);
-       internals.settings.setStorageBlockingPolicy('BlockThirdParty');
-}
-
-document.location = "resources/document-for-cross-origin-worker-websql.html"
-</script>
-</head>
-<body>
-</body>
-</html>
index 195f8fe..ec3639f 100644 (file)
@@ -2762,16 +2762,6 @@ if (ENABLE_ENCRYPTED_MEDIA OR ENABLE_ENCRYPTED_MEDIA_V2)
     )
 endif ()
 
-if (ENABLE_SQL_DATABASE)
-    list(APPEND WebCore_SOURCES
-        Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp
-    )
-
-    list(APPEND WebCore_IDL_FILES
-        Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl
-    )
-endif ()
-
 list(APPEND WebCore_CSS_PROPERTY_NAMES
     ${WEBCORE_DIR}/css/SVGCSSPropertyNames.in
 )
index d282e13..d5130e1 100644 (file)
@@ -1,3 +1,21 @@
+2015-01-08  Anders Carlsson  <andersca@apple.com>
+
+        Start removing Web Database support from workers
+        https://bugs.webkit.org/show_bug.cgi?id=140271
+
+        Reviewed by Sam Weinig.
+
+        Remove WorkerGlobalScopeWebDatabase which is the entry point for web database in workers.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp: Removed.
+        * Modules/webdatabase/WorkerGlobalScopeWebDatabase.h: Removed.
+        * Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl: Removed.
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+
 2015-01-09  Brent Fulgham  <bfulgham@apple.com>
 
         [Win] Layout Test fast/canvas/canvas-path-addPath.html is failing
index cf74a3a..0e9eaec 100644 (file)
@@ -209,7 +209,6 @@ NON_SVG_BINDING_IDLS = \
     $(WebCore)/Modules/webdatabase/SQLTransactionErrorCallback.idl \
     $(WebCore)/Modules/webdatabase/SQLTransactionSync.idl \
     $(WebCore)/Modules/webdatabase/SQLTransactionSyncCallback.idl \
-    $(WebCore)/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl \
     $(WebCore)/Modules/websockets/CloseEvent.idl \
     $(WebCore)/Modules/websockets/WebSocket.idl \
     $(WebCore)/crypto/CryptoKey.idl \
diff --git a/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp b/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.cpp
deleted file mode 100644 (file)
index 076e2ea..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- * Copyright (C) 2009, 2011 Google Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
- */
-
-#include "config.h"
-
-#if ENABLE(SQL_DATABASE)
-
-#include "WorkerGlobalScopeWebDatabase.h"
-
-#include "Database.h"
-#include "DatabaseCallback.h"
-#include "DatabaseManager.h"
-#include "DatabaseSync.h"
-#include "SecurityOrigin.h"
-#include "WorkerGlobalScope.h"
-
-namespace WebCore {
-
-PassRefPtr<Database> WorkerGlobalScopeWebDatabase::openDatabase(WorkerGlobalScope* context, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
-{
-    DatabaseManager& dbManager = DatabaseManager::manager();
-    RefPtr<Database> database;
-    DatabaseError error = DatabaseError::None;
-    if (dbManager.isAvailable() && context->securityOrigin()->canAccessDatabase(context->topOrigin())) {
-        database = dbManager.openDatabase(context, name, version, displayName, estimatedSize, creationCallback, error);
-        ASSERT(database || error != DatabaseError::None);
-        ec = DatabaseManager::exceptionCodeForDatabaseError(error);
-    } else
-        ec = SECURITY_ERR;
-
-    return database.release();
-}
-
-PassRefPtr<DatabaseSync> WorkerGlobalScopeWebDatabase::openDatabaseSync(WorkerGlobalScope* context, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
-{
-    DatabaseManager& dbManager = DatabaseManager::manager();
-    RefPtr<DatabaseSync> database;
-    DatabaseError error =  DatabaseError::None;
-    if (dbManager.isAvailable() && context->securityOrigin()->canAccessDatabase(context->topOrigin())) {
-        database = dbManager.openDatabaseSync(context, name, version, displayName, estimatedSize, creationCallback, error);
-
-        ASSERT(database || error != DatabaseError::None);
-        ec = DatabaseManager::exceptionCodeForDatabaseError(error);
-    } else
-        ec = SECURITY_ERR;
-
-    return database.release();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
diff --git a/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.h b/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.h
deleted file mode 100644 (file)
index cb51a50..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef WorkerGlobalScopeWebDatabase_h
-#define WorkerGlobalScopeWebDatabase_h
-
-#if ENABLE(SQL_DATABASE)
-
-#include "ExceptionCode.h"
-#include <wtf/Forward.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class Database;
-class DatabaseCallback;
-class DatabaseSync;
-class WorkerGlobalScope;
-
-class WorkerGlobalScopeWebDatabase {
-public:
-    static PassRefPtr<Database> openDatabase(WorkerGlobalScope*, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
-    static PassRefPtr<DatabaseSync> openDatabaseSync(WorkerGlobalScope*, const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
-
-private:
-    WorkerGlobalScopeWebDatabase() { };
-    ~WorkerGlobalScopeWebDatabase() { };
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(SQL_DATABASE)
-
-#endif // WorkerGlobalScopeWebDatabase_h
diff --git a/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl b/Source/WebCore/Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl
deleted file mode 100644 (file)
index 7effc05..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Inc. All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- *
- */
-
-[
-    Conditional=SQL_DATABASE,
-] partial interface WorkerGlobalScope {
-    [RaisesException] Database openDatabase(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback creationCallback);
-
-    [RaisesException] DatabaseSync openDatabaseSync(DOMString name, DOMString version, DOMString displayName, unsigned long estimatedSize, optional DatabaseCallback creationCallback);
-};
-
index eae4714..3270d0a 100644 (file)
     <ClCompile Include="..\Modules\webdatabase\SQLTransactionCoordinator.cpp" />
     <ClCompile Include="..\Modules\webdatabase\SQLTransactionStateMachine.cpp" />
     <ClCompile Include="..\Modules\webdatabase\SQLTransactionSync.cpp" />
-    <ClCompile Include="..\Modules\webdatabase\WorkerGlobalScopeWebDatabase.cpp" />
     <ClCompile Include="..\Modules\websockets\ThreadableWebSocketChannel.cpp" />
     <ClCompile Include="..\Modules\websockets\ThreadableWebSocketChannelClientWrapper.cpp" />
     <ClCompile Include="..\Modules\websockets\WebSocket.cpp" />
     <ClInclude Include="..\Modules\webdatabase\SQLTransactionStateMachine.h" />
     <ClInclude Include="..\Modules\webdatabase\SQLTransactionSync.h" />
     <ClInclude Include="..\Modules\webdatabase\SQLTransactionSyncCallback.h" />
-    <ClInclude Include="..\Modules\webdatabase\WorkerGlobalScopeWebDatabase.h" />
     <ClInclude Include="..\Modules\websockets\CloseEvent.h" />
     <ClInclude Include="..\Modules\websockets\ThreadableWebSocketChannel.h" />
     <ClInclude Include="..\Modules\websockets\ThreadableWebSocketChannelClientWrapper.h" />
index 6b7ac7e..d0cbd1a 100644 (file)
     <ClCompile Include="..\Modules\webdatabase\SQLTransactionSync.cpp">
       <Filter>Modules\webdatabase</Filter>
     </ClCompile>
-    <ClCompile Include="..\Modules\webdatabase\WorkerGlobalScopeWebDatabase.cpp">
-      <Filter>Modules\webdatabase</Filter>
-    </ClCompile>
     <ClCompile Include="..\Modules\websockets\ThreadableWebSocketChannel.cpp">
       <Filter>Modules\websockets</Filter>
     </ClCompile>
     <ClInclude Include="..\Modules\webdatabase\SQLTransactionSyncCallback.h">
       <Filter>Modules\webdatabase</Filter>
     </ClInclude>
-    <ClInclude Include="..\Modules\webdatabase\WorkerGlobalScopeWebDatabase.h">
-      <Filter>Modules\webdatabase</Filter>
-    </ClInclude>
     <ClInclude Include="..\Modules\websockets\CloseEvent.h">
       <Filter>Modules\websockets</Filter>
     </ClInclude>
index 9064ecd..83f7375 100644 (file)
                A8CB413E0E8633FD0032C4F0 /* DashArray.h in Headers */ = {isa = PBXBuildFile; fileRef = A8CB41020E85B8A50032C4F0 /* DashArray.h */; settings = {ATTRIBUTES = (Private, ); }; };
                A8CCBB48151F831600AB7CE9 /* DOMWindowWebDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8CCBB46151F831600AB7CE9 /* DOMWindowWebDatabase.cpp */; };
                A8CCBB49151F831600AB7CE9 /* DOMWindowWebDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = A8CCBB47151F831600AB7CE9 /* DOMWindowWebDatabase.h */; };
-               A8CCBB4C151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8CCBB4A151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.cpp */; };
-               A8CCBB4D151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = A8CCBB4B151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.h */; };
                A8CFF04D0A154F09000A4234 /* FixedTableLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8CFF0480A154F09000A4234 /* FixedTableLayout.cpp */; };
                A8CFF04E0A154F09000A4234 /* AutoTableLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = A8CFF0490A154F09000A4234 /* AutoTableLayout.h */; };
                A8CFF04F0A154F09000A4234 /* FixedTableLayout.h in Headers */ = {isa = PBXBuildFile; fileRef = A8CFF04A0A154F09000A4234 /* FixedTableLayout.h */; };
                A8CB41020E85B8A50032C4F0 /* DashArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DashArray.h; sourceTree = "<group>"; };
                A8CCBB46151F831600AB7CE9 /* DOMWindowWebDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowWebDatabase.cpp; sourceTree = "<group>"; };
                A8CCBB47151F831600AB7CE9 /* DOMWindowWebDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMWindowWebDatabase.h; sourceTree = "<group>"; };
-               A8CCBB4A151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkerGlobalScopeWebDatabase.cpp; sourceTree = "<group>"; };
-               A8CCBB4B151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkerGlobalScopeWebDatabase.h; sourceTree = "<group>"; };
                A8CCBB4E151F835A00AB7CE9 /* DOMWindowWebDatabase.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DOMWindowWebDatabase.idl; sourceTree = "<group>"; };
-               A8CCBB4F151F837500AB7CE9 /* WorkerGlobalScopeWebDatabase.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WorkerGlobalScopeWebDatabase.idl; sourceTree = "<group>"; };
                A8CFF0480A154F09000A4234 /* FixedTableLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = FixedTableLayout.cpp; sourceTree = "<group>"; };
                A8CFF0490A154F09000A4234 /* AutoTableLayout.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = AutoTableLayout.h; sourceTree = "<group>"; };
                A8CFF04A0A154F09000A4234 /* FixedTableLayout.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FixedTableLayout.h; sourceTree = "<group>"; };
                                97BC6A1A1505F081001B74AC /* SQLTransactionSync.idl */,
                                97BC6A1B1505F081001B74AC /* SQLTransactionSyncCallback.h */,
                                97BC6A1C1505F081001B74AC /* SQLTransactionSyncCallback.idl */,
-                               A8CCBB4A151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.cpp */,
-                               A8CCBB4B151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.h */,
-                               A8CCBB4F151F837500AB7CE9 /* WorkerGlobalScopeWebDatabase.idl */,
                        );
                        path = webdatabase;
                        sourceTree = "<group>";
                                51D719FC181106E00016DC51 /* WorkerGlobalScopeIndexedDatabase.h in Headers */,
                                97F8E666151D4A4E00D2D181 /* WorkerGlobalScopeNotifications.h in Headers */,
                                2E43464B0F546A8200B0F1BA /* WorkerGlobalScopeProxy.h in Headers */,
-                               A8CCBB4D151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.h in Headers */,
                                F36E07A51358A8BE00AACBC9 /* WorkerInspectorController.h in Headers */,
                                18F831B80FD48C7800D8C56B /* WorkerLoaderProxy.h in Headers */,
                                2E43464D0F546A8200B0F1BA /* WorkerLocation.h in Headers */,
                                2E4346480F546A8200B0F1BA /* WorkerGlobalScope.cpp in Sources */,
                                51D719FB181106E00016DC51 /* WorkerGlobalScopeIndexedDatabase.cpp in Sources */,
                                97F8E665151D4A4B00D2D181 /* WorkerGlobalScopeNotifications.cpp in Sources */,
-                               A8CCBB4C151F833B00AB7CE9 /* WorkerGlobalScopeWebDatabase.cpp in Sources */,
                                F36E07A41358A8BE00AACBC9 /* WorkerInspectorController.cpp in Sources */,
                                2E43464C0F546A8200B0F1BA /* WorkerLocation.cpp in Sources */,
                                2E43464F0F546A8200B0F1BA /* WorkerMessagingProxy.cpp in Sources */,