[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
dimich at chromium.org
dimich at chromium.org
Thu Apr 8 02:13:06 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 1c3a82461bd1fdf87bf6873fe2f359c3203f70ff
Author: dimich at chromium.org <dimich at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sun Mar 7 16:59:34 2010 +0000
Not reviewed. Revert of r55593 which caused a regression of worker-cloneports.html.
REGRESSION(55593?): fast/workers/worker-cloneport.html is timing out on Leopard
https://bugs.webkit.org/show_bug.cgi?id=35819
WebCore:
* Android.jscbindings.mk:
* Android.v8bindings.mk:
* GNUmakefile.am:
* WebCore.gypi:
* WebCore.pro:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSDOMWindowCustom.cpp:
* bindings/js/JSDatabaseCallback.cpp: Removed.
* bindings/js/JSDatabaseCallback.h: Removed.
* bindings/v8/custom/V8DOMWindowCustom.cpp:
* bindings/v8/custom/V8DatabaseCallback.cpp: Removed.
* bindings/v8/custom/V8DatabaseCallback.h: Removed.
* dom/Document.cpp:
(WebCore::Document::postTask):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::openDatabase):
* page/DOMWindow.h:
* page/DOMWindow.idl:
* storage/Database.cpp:
(WebCore::Database::openDatabase):
(WebCore::Database::Database):
(WebCore::Database::performOpenAndVerify):
* storage/Database.h:
* storage/DatabaseCallback.h: Removed.
* workers/WorkerContext.cpp:
(WebCore::WorkerContext::openDatabase):
* workers/WorkerContext.h:
LayoutTests:
* fast/frames/resources/sandboxed-iframe-storage-allowed.html:
* fast/frames/resources/sandboxed-iframe-storage-disallowed.html:
* fast/frames/sandboxed-iframe-storage-expected.txt:
* storage/open-database-creation-callback-expected.txt: Removed.
* storage/open-database-creation-callback-isolated-world-expected.txt: Removed.
* storage/open-database-creation-callback-isolated-world.html: Removed.
* storage/open-database-creation-callback.html: Removed.
* platform/qt/Skipped:
* platform/mac-leopard/Skipped: Enable the temporarily disabled test back.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55635 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 661a07a..0314336 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-03-07 Dmitry Titov <dimich at chromium.org>
+
+ Not reviewed. Revert of r55593 which caused a regression of worker-cloneports.html.
+
+ REGRESSION(55593?): fast/workers/worker-cloneport.html is timing out on Leopard
+ https://bugs.webkit.org/show_bug.cgi?id=35819
+
+ * fast/frames/resources/sandboxed-iframe-storage-allowed.html:
+ * fast/frames/resources/sandboxed-iframe-storage-disallowed.html:
+ * fast/frames/sandboxed-iframe-storage-expected.txt:
+ * storage/open-database-creation-callback-expected.txt: Removed.
+ * storage/open-database-creation-callback-isolated-world-expected.txt: Removed.
+ * storage/open-database-creation-callback-isolated-world.html: Removed.
+ * storage/open-database-creation-callback.html: Removed.
+ * platform/qt/Skipped:
+ * platform/mac-leopard/Skipped: Enable the temporarily disabled test back.
+
2010-03-06 Joanmarie Diggs <joanmarie.diggs at gmail.com>
Reviewed by Eric Seidel.
diff --git a/LayoutTests/fast/frames/resources/sandboxed-iframe-storage-allowed.html b/LayoutTests/fast/frames/resources/sandboxed-iframe-storage-allowed.html
index de6cc7f..51705fa 100644
--- a/LayoutTests/fast/frames/resources/sandboxed-iframe-storage-allowed.html
+++ b/LayoutTests/fast/frames/resources/sandboxed-iframe-storage-allowed.html
@@ -6,7 +6,7 @@
<script>
window.onload = function() {
- shouldBeTrue("window.openDatabase('SandboxedIframeStorageAllowed', '1.0', '', 1) != null");
+ shouldBeTrue("window.openDatabase() != null");
shouldBeTrue("window.localStorage != null");
shouldBeTrue("window.sessionStorage != null");
}
diff --git a/LayoutTests/fast/frames/resources/sandboxed-iframe-storage-disallowed.html b/LayoutTests/fast/frames/resources/sandboxed-iframe-storage-disallowed.html
index 967b84c..ee46bab 100644
--- a/LayoutTests/fast/frames/resources/sandboxed-iframe-storage-disallowed.html
+++ b/LayoutTests/fast/frames/resources/sandboxed-iframe-storage-disallowed.html
@@ -6,7 +6,7 @@
<script>
window.onload = function() {
- shouldBeTrue("window.openDatabase('SandboxedIframeStorageDisallowed', '1.0', '', 1) == null");
+ shouldBeTrue("window.openDatabase() == null");
shouldBeTrue("window.localStorage == null");
shouldBeTrue("window.sessionStorage == null");
}
diff --git a/LayoutTests/fast/frames/sandboxed-iframe-storage-expected.txt b/LayoutTests/fast/frames/sandboxed-iframe-storage-expected.txt
index 8c92ea7..9262a4a 100644
--- a/LayoutTests/fast/frames/sandboxed-iframe-storage-expected.txt
+++ b/LayoutTests/fast/frames/sandboxed-iframe-storage-expected.txt
@@ -14,7 +14,7 @@ TEST COMPLETE
--------
Frame: '<!--framePath //<!--frame0-->-->'
--------
-PASS window.openDatabase('SandboxedIframeStorageDisallowed', '1.0', '', 1) == null is true
+PASS window.openDatabase() == null is true
PASS window.localStorage == null is true
PASS window.sessionStorage == null is true
@@ -22,7 +22,7 @@ PASS window.sessionStorage == null is true
--------
Frame: '<!--framePath //<!--frame1-->-->'
--------
-PASS window.openDatabase('SandboxedIframeStorageAllowed', '1.0', '', 1) != null is true
+PASS window.openDatabase() != null is true
PASS window.localStorage != null is true
PASS window.sessionStorage != null is true
diff --git a/LayoutTests/platform/mac-leopard/Skipped b/LayoutTests/platform/mac-leopard/Skipped
index 9dcd8eb..3719956 100644
--- a/LayoutTests/platform/mac-leopard/Skipped
+++ b/LayoutTests/platform/mac-leopard/Skipped
@@ -48,7 +48,3 @@ fast/canvas/webgl/texImage2DImageDataTest.html
# Fails on Mac
# https://bugs.webkit.org/show_bug.cgi?id=34331
http/tests/media/video-referer.html
-
-# Flakey, times out occasionally. Seems to be a regression:
-# https://bugs.webkit.org/show_bug.cgi?id=35819
-fast/workers/worker-cloneport.html
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 0348339..1a43a88 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -5095,6 +5095,3 @@ java
# see https://bugs.webkit.org/show_bug.cgi?id=33180.
# Core functionality is tested in plugins/private-browsing-mode-2.html
plugins/private-browsing-mode.html
-
-# Qt's DRT doesn't not seem to support the layoutTestController.evaluateScriptInIsolatedWorld() call.
-storage/open-database-creation-callback-isolated-world.html
diff --git a/LayoutTests/storage/open-database-creation-callback-expected.txt b/LayoutTests/storage/open-database-creation-callback-expected.txt
deleted file mode 100644
index d86ab72..0000000
--- a/LayoutTests/storage/open-database-creation-callback-expected.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This test tests openDatabase()'s creation callback.
-
diff --git a/LayoutTests/storage/open-database-creation-callback-isolated-world-expected.txt b/LayoutTests/storage/open-database-creation-callback-isolated-world-expected.txt
deleted file mode 100644
index 567af33..0000000
--- a/LayoutTests/storage/open-database-creation-callback-isolated-world-expected.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-ALERT: undefined
-This test tests that the openDatabase() creation callback is called in the right world.
-
diff --git a/LayoutTests/storage/open-database-creation-callback-isolated-world.html b/LayoutTests/storage/open-database-creation-callback-isolated-world.html
deleted file mode 100644
index 15bf45d..0000000
--- a/LayoutTests/storage/open-database-creation-callback-isolated-world.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html>
-<body>
-This test tests that the openDatabase() creation callback is called in the right world.
-<div id="console"></div>
-<script>
-function done()
-{
- if (window.layoutTestController)
- layoutTestController.notifyDone();
-}
-
-function creationCallback(db)
-{
- alert("FAIL: Visible in isolated world.");
- done();
-}
-
-document.body.foo = "FAIL: document.body.foo visible in isolated world.";
-
-if (window.layoutTestController) {
- layoutTestController.clearAllDatabases();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- layoutTestController.evaluateScriptInIsolatedWorld(
- 0,
- "function creationCallback(db)\n" +
- "{\n" +
- " alert(document.body.foo);\n" +
- " window.location='javascript:done()';\n" +
- "}\n" +
- "var db = openDatabase('OpenDatabaseCreationCallbackIsolatedWorld', '1.0', '', 1, creationCallback);");
-}
-</script>
-</body>
-</html>
diff --git a/LayoutTests/storage/open-database-creation-callback.html b/LayoutTests/storage/open-database-creation-callback.html
deleted file mode 100644
index ac24942..0000000
--- a/LayoutTests/storage/open-database-creation-callback.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<html>
-<head>
-<script>
-function log(message)
-{
- document.getElementById("console").innerHTML += message + "<br>";
-}
-
-function finishTest()
-{
- if (window.layoutTestController)
- layoutTestController.notifyDone();
-}
-
-function runTest()
-{
- if (window.layoutTestController) {
- layoutTestController.clearAllDatabases();
- layoutTestController.setDatabaseQuota(32768);
- layoutTestController.dumpDatabaseCallbacks();
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
- }
-
- var transactionsRun = 0;
-
- // Open a new database with a creation callback, and make sure the creation callback is queued
- var creationCallbackCalled1 = false;
- var db1 = openDatabase("OpenDatabaseCreationCallback1", "1.0", "", 1,
- function(db) {
- creationCallbackCalled1 = true;
- if (db.version != "") {
- log("Creation callback was called with a database with version " +
- db.version + "; empty string expected.");
- finishTest();
- }
- });
-
- // Putting this code inside a transaction on 'db1' makes sure that it is executed after
- // the creation callback is.
- db1.transaction(function(tx) {
- if (!creationCallbackCalled1) {
- log("Creation callback for db1 was not called.");
- finishTest();
- }
- if (++transactionsRun == 2)
- finishTest();
- });
-
- // Try to open another handle to the same database.
- // Since the version of this database is "" (empty string), openDatabase() should return
- // a null handle and throw a INVALID_STATE_ERR exception.
- var db1Fail = null;
- try {
- db1Fail = openDatabase("OpenDatabaseCreationCallback1", "1.0", "", 1);
- log("This statement should not have been executed; an INVALID_STATE_ERR exception should've been thrown.");
- finishTest();
- } catch(err) {
- if (db1Fail) {
- log("db1Fail should have been null.");
- finishTest();
- }
- }
-
- // Open a handle to another database, first without a creation callback, then with one.
- // Make sure the creation callback is not called.
- var creationCallbackCalled2 = false;
- var db2 = openDatabase("OpenDatabaseCreationCallback2", "1.0", "", 1);
- db2 = openDatabase("OpenDatabaseCreationCallback2", "1.0", "", 1,
- function(db) { creationCallbackCalled2 = true; });
- db2.transaction(function(tx) {
- if (creationCallbackCalled2) {
- log("Creation callback for db2 should not have been called.");
- finishTest();
- }
- if (++transactionsRun == 2)
- finishTest();
- });
-}
-
-</script>
-</head>
-
-<body onload="runTest()">
-This test tests openDatabase()'s creation callback.
-<pre id="console">
-</pre>
-</body>
-
-</html>
diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index f07ba68..b330b11 100644
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -80,7 +80,6 @@ LOCAL_SRC_FILES += \
bindings/js/JSCustomSQLTransactionCallback.cpp \
bindings/js/JSCustomSQLTransactionErrorCallback.cpp \
bindings/js/JSCustomVoidCallback.cpp \
- bindings/js/JSDatabaseCallback.cpp \
bindings/js/JSDesktopNotificationsCustom.cpp \
bindings/js/JSDOMApplicationCacheCustom.cpp \
bindings/js/JSDOMBinding.cpp \
diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index c829659..fecf531 100644
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -108,7 +108,6 @@ LOCAL_SRC_FILES += \
bindings/v8/custom/V8DOMSelectionCustom.cpp \
bindings/v8/custom/V8DOMWindowCustom.cpp \
bindings/v8/custom/V8DataGridColumnListCustom.cpp \
- bindings/v8/custom/V8DatabaseCallback.cpp \
bindings/v8/custom/V8DatabaseCustom.cpp \
bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp \
bindings/v8/custom/V8DocumentCustom.cpp \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 67311c4..a56f6b6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,39 @@
+2010-03-07 Dmitry Titov <dimich at chromium.org>
+
+ Not reviewed. Revert of r55593 which caused a regression of worker-cloneports.html.
+
+ REGRESSION(55593?): fast/workers/worker-cloneport.html is timing out on Leopard
+ https://bugs.webkit.org/show_bug.cgi?id=35819
+
+ * Android.jscbindings.mk:
+ * Android.v8bindings.mk:
+ * GNUmakefile.am:
+ * WebCore.gypi:
+ * WebCore.pro:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSDOMWindowCustom.cpp:
+ * bindings/js/JSDatabaseCallback.cpp: Removed.
+ * bindings/js/JSDatabaseCallback.h: Removed.
+ * bindings/v8/custom/V8DOMWindowCustom.cpp:
+ * bindings/v8/custom/V8DatabaseCallback.cpp: Removed.
+ * bindings/v8/custom/V8DatabaseCallback.h: Removed.
+ * dom/Document.cpp:
+ (WebCore::Document::postTask):
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::openDatabase):
+ * page/DOMWindow.h:
+ * page/DOMWindow.idl:
+ * storage/Database.cpp:
+ (WebCore::Database::openDatabase):
+ (WebCore::Database::Database):
+ (WebCore::Database::performOpenAndVerify):
+ * storage/Database.h:
+ * storage/DatabaseCallback.h: Removed.
+ * workers/WorkerContext.cpp:
+ (WebCore::WorkerContext::openDatabase):
+ * workers/WorkerContext.h:
+
2010-03-06 Mark Rowe <mrowe at apple.com>
Rubber-stamped by Sam Weinig.
diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
index f5ef0d1..1439b09 100644
--- a/WebCore/GNUmakefile.am
+++ b/WebCore/GNUmakefile.am
@@ -2238,8 +2238,6 @@ webcore_sources += \
WebCore/bindings/js/JSCustomSQLTransactionCallback.h \
WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.cpp \
WebCore/bindings/js/JSCustomSQLTransactionErrorCallback.h \
- WebCore/bindings/js/JSDatabaseCallback.cpp \
- WebCore/bindings/js/JSDatabaseCallback.h \
WebCore/bindings/js/JSDatabaseCustom.cpp \
WebCore/bindings/js/JSSQLResultSetRowListCustom.cpp \
WebCore/bindings/js/JSSQLTransactionCustom.cpp \
@@ -2260,7 +2258,6 @@ webcore_sources += \
WebCore/storage/Database.h \
WebCore/storage/DatabaseAuthorizer.cpp \
WebCore/storage/DatabaseAuthorizer.h \
- WebCore/storage/DatabaseCallback.h \
WebCore/storage/DatabaseDetails.h \
WebCore/storage/DatabaseTask.cpp \
WebCore/storage/DatabaseTask.h \
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index b2cf393..87a557c 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -711,8 +711,6 @@
'bindings/v8/custom/V8CustomVoidCallback.h',
'bindings/v8/custom/V8CustomXPathNSResolver.cpp',
'bindings/v8/custom/V8CustomXPathNSResolver.h',
- 'bindings/v8/custom/V8DatabaseCallback.cpp',
- 'bindings/v8/custom/V8DatabaseCallback.h',
'bindings/v8/custom/V8DatabaseCustom.cpp',
'bindings/v8/custom/V8DataGridColumnListCustom.cpp',
'bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp',
@@ -3231,7 +3229,6 @@
'storage/Database.h',
'storage/DatabaseAuthorizer.cpp',
'storage/DatabaseAuthorizer.h',
- 'storage/DatabaseCallback.h',
'storage/DatabaseDetails.h',
'storage/DatabaseTask.cpp',
'storage/DatabaseTask.h',
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index e47fec6..de0bf01 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -1018,7 +1018,6 @@ HEADERS += \
bindings/js/JSCustomSQLTransactionErrorCallback.h \
bindings/js/JSCustomVoidCallback.h \
bindings/js/JSCustomXPathNSResolver.h \
- bindings/js/JSDatabaseCallback.h \
bindings/js/JSDataGridDataSource.h \
bindings/js/JSDebugWrapperSet.h \
bindings/js/JSDOMBinding.h \
@@ -2230,7 +2229,6 @@ contains(DEFINES, ENABLE_DATABASE=1) {
bindings/js/JSCustomSQLStatementErrorCallback.cpp \
bindings/js/JSCustomSQLTransactionCallback.cpp \
bindings/js/JSCustomSQLTransactionErrorCallback.cpp \
- bindings/js/JSDatabaseCallback.cpp \
bindings/js/JSDatabaseCustom.cpp \
bindings/js/JSSQLResultSetRowListCustom.cpp \
bindings/js/JSSQLTransactionCustom.cpp
@@ -2241,7 +2239,6 @@ contains(DEFINES, ENABLE_DOM_STORAGE=1) {
storage/ChangeVersionWrapper.h \
storage/DatabaseAuthorizer.h \
storage/Database.h \
- storage/DatabaseCallback.h \
storage/DatabaseTask.h \
storage/DatabaseThread.h \
storage/DatabaseTracker.h \
diff --git a/WebCore/WebCore.vcproj/WebCore.vcproj b/WebCore/WebCore.vcproj/WebCore.vcproj
index c48945d..cff889e 100644
--- a/WebCore/WebCore.vcproj/WebCore.vcproj
+++ b/WebCore/WebCore.vcproj/WebCore.vcproj
@@ -35384,14 +35384,6 @@
>
</File>
<File
- RelativePath="..\bindings\js\JSDatabaseCallback.cpp"
- >
- </File>
- <File
- RelativePath="..\bindings\js\JSDatabaseCallback.h"
- >
- </File>
- <File
RelativePath="..\bindings\js\JSDatabaseCustom.cpp"
>
<FileConfiguration
@@ -42329,10 +42321,6 @@
>
</File>
<File
- RelativePath="..\storage\DatabaseCallback.h"
- >
- </File>
- <File
RelativePath="..\storage\DatabaseTask.cpp"
>
</File>
diff --git a/WebCore/WebCore.xcodeproj/project.pbxproj b/WebCore/WebCore.xcodeproj/project.pbxproj
index b66d3f7..222421a 100644
--- a/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -4119,9 +4119,6 @@
B5A684240FFABEAA00D24689 /* SQLiteFileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5A684230FFABEAA00D24689 /* SQLiteFileSystem.cpp */; };
B5C1123B102B6C4600096578 /* SQLTransactionCoordinator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5C11239102B6C4600096578 /* SQLTransactionCoordinator.cpp */; };
B5C1123C102B6C4600096578 /* SQLTransactionCoordinator.h in Headers */ = {isa = PBXBuildFile; fileRef = B5C1123A102B6C4600096578 /* SQLTransactionCoordinator.h */; };
- B5D3601A112F8B560048DEA8 /* DatabaseCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = B5D36019112F8B560048DEA8 /* DatabaseCallback.h */; };
- B5D3601D112F8BA00048DEA8 /* JSDatabaseCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = B5D3601C112F8BA00048DEA8 /* JSDatabaseCallback.h */; };
- B5D3601F112F8BA80048DEA8 /* JSDatabaseCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B5D3601E112F8BA80048DEA8 /* JSDatabaseCallback.cpp */; };
B71FE6DF11091CB300DAEF77 /* PrintContext.h in Headers */ = {isa = PBXBuildFile; fileRef = B776D43A1104525D00BEB0EC /* PrintContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
B776D43D1104527500BEB0EC /* PrintContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B776D43C1104527500BEB0EC /* PrintContext.cpp */; };
BC00F0040E0A185500FD04E3 /* DOMFile.h in Headers */ = {isa = PBXBuildFile; fileRef = BC00EFFE0E0A185500FD04E3 /* DOMFile.h */; };
@@ -9400,9 +9397,6 @@
B5A684230FFABEAA00D24689 /* SQLiteFileSystem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SQLiteFileSystem.cpp; path = sql/SQLiteFileSystem.cpp; sourceTree = "<group>"; };
B5C11239102B6C4600096578 /* SQLTransactionCoordinator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SQLTransactionCoordinator.cpp; sourceTree = "<group>"; };
B5C1123A102B6C4600096578 /* SQLTransactionCoordinator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SQLTransactionCoordinator.h; sourceTree = "<group>"; };
- B5D36019112F8B560048DEA8 /* DatabaseCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DatabaseCallback.h; sourceTree = "<group>"; };
- B5D3601C112F8BA00048DEA8 /* JSDatabaseCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDatabaseCallback.h; sourceTree = "<group>"; };
- B5D3601E112F8BA80048DEA8 /* JSDatabaseCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDatabaseCallback.cpp; sourceTree = "<group>"; };
B776D43A1104525D00BEB0EC /* PrintContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrintContext.h; sourceTree = "<group>"; };
B776D43C1104527500BEB0EC /* PrintContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PrintContext.cpp; sourceTree = "<group>"; };
BC00EFFE0E0A185500FD04E3 /* DOMFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMFile.h; sourceTree = "<group>"; };
@@ -10610,7 +10604,6 @@
519611600CAC56570010A80C /* Database.idl */,
51A45B550CAD7FD7000D2BE9 /* DatabaseAuthorizer.cpp */,
51A45B540CAD7FD7000D2BE9 /* DatabaseAuthorizer.h */,
- B5D36019112F8B560048DEA8 /* DatabaseCallback.h */,
5116D9750CF177BD00C2B84D /* DatabaseDetails.h */,
519611E90CAC749C0010A80C /* DatabaseTask.cpp */,
519611E80CAC749C0010A80C /* DatabaseTask.h */,
@@ -18666,8 +18659,6 @@
CE172E011136E8CE0062A533 /* ZoomMode.h in Headers */,
7637C543112E7B7E003D6CDC /* WebSocketHandshakeRequest.h in Headers */,
626CDE0F1140424C001E5A68 /* SpatialNavigation.h in Headers */,
- B5D3601A112F8B560048DEA8 /* DatabaseCallback.h in Headers */,
- B5D3601D112F8BA00048DEA8 /* JSDatabaseCallback.h in Headers */,
BC53D911114310CC000D817E /* WebCoreJSClientData.h in Headers */,
BC53DA2E1143121E000D817E /* DOMWrapperWorld.h in Headers */,
BC53DA601143141A000D817E /* DOMObjectHashTableMap.h in Headers */,
@@ -20866,7 +20857,6 @@
0BC2C7771134A8FC000B2F61 /* CanvasSurface.cpp in Sources */,
7637C541112E7B74003D6CDC /* WebSocketHandshakeRequest.cpp in Sources */,
626CDE0E1140424C001E5A68 /* SpatialNavigation.cpp in Sources */,
- B5D3601F112F8BA80048DEA8 /* JSDatabaseCallback.cpp in Sources */,
BC53DA481143134D000D817E /* DOMWrapperWorld.cpp in Sources */,
BC53DA62114314BD000D817E /* DOMObjectHashTableMap.cpp in Sources */,
BC53DAC511432FD9000D817E /* JSDebugWrapperSet.cpp in Sources */,
diff --git a/WebCore/bindings/js/JSDOMWindowCustom.cpp b/WebCore/bindings/js/JSDOMWindowCustom.cpp
index e95a5f2..122b92e 100644
--- a/WebCore/bindings/js/JSDOMWindowCustom.cpp
+++ b/WebCore/bindings/js/JSDOMWindowCustom.cpp
@@ -22,7 +22,6 @@
#include "AtomicString.h"
#include "Chrome.h"
-#include "Database.h"
#include "DOMWindow.h"
#include "Document.h"
#include "ExceptionCode.h"
@@ -36,8 +35,6 @@
#include "HTMLDocument.h"
#include "History.h"
#include "JSAudioConstructor.h"
-#include "JSDatabase.h"
-#include "JSDatabaseCallback.h"
#include "JSDOMWindowShell.h"
#include "JSEvent.h"
#include "JSEventListener.h"
@@ -996,26 +993,6 @@ JSValue JSDOMWindow::removeEventListener(ExecState* exec, const ArgList& args)
return jsUndefined();
}
-#if ENABLE(DATABASE)
-JSValue JSDOMWindow::openDatabase(ExecState* exec, const ArgList& args)
-{
- if (!allowsAccessFrom(exec) || (args.size() < 4))
- return jsUndefined();
- ExceptionCode ec = 0;
- const UString& name = args.at(0).toString(exec);
- const UString& version = args.at(1).toString(exec);
- const UString& displayName = args.at(2).toString(exec);
- unsigned long estimatedSize = args.at(3).toInt32(exec);
- RefPtr<DatabaseCallback> creationCallback;
- if ((args.size() >= 5) && args.at(4).isObject())
- creationCallback = JSDatabaseCallback::create(asObject(args.at(4)), globalObject());
-
- JSValue result = toJS(exec, globalObject(), WTF::getPtr(impl()->openDatabase(name, version, displayName, estimatedSize, creationCallback.release(), ec)));
- setDOMException(exec, ec);
- return result;
-}
-#endif
-
DOMWindow* toDOMWindow(JSValue value)
{
if (!value.isObject())
diff --git a/WebCore/bindings/js/JSDatabaseCallback.cpp b/WebCore/bindings/js/JSDatabaseCallback.cpp
deleted file mode 100644
index c75a6e5..0000000
--- a/WebCore/bindings/js/JSDatabaseCallback.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2010 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 THE COPYRIGHT
- * OWNER 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"
-#include "JSDatabaseCallback.h"
-
-#if ENABLE(DATABASE)
-
-#include "Frame.h"
-#include "JSDatabase.h"
-#include "ScriptController.h"
-#include "ScriptExecutionContext.h"
-#include <runtime/JSLock.h>
-#include <wtf/MainThread.h>
-
-namespace WebCore {
-
-using namespace JSC;
-
-JSDatabaseCallback::JSDatabaseCallback(JSObject* callback, JSDOMGlobalObject* globalObject)
- : m_data(new JSCallbackData(callback, globalObject))
- , m_isolatedWorld(DOMWrapperWorld::create(globalObject->globalData(), true))
-{
-}
-
-JSDatabaseCallback::~JSDatabaseCallback()
-{
- callOnMainThread(JSCallbackData::deleteData, m_data);
-#ifndef NDEBUG
- m_data = 0;
-#endif
-}
-
-void JSDatabaseCallback::handleEvent(ScriptExecutionContext* context, Database* database)
-{
- ASSERT(m_data);
- ASSERT(context);
-
- RefPtr<JSDatabaseCallback> protect(this);
-
- JSC::JSLock lock(SilenceAssertionsOnly);
-
- JSDOMGlobalObject* globalObject = toJSDOMGlobalObject(context, m_isolatedWorld.get());
- if (!globalObject)
- return;
-
- ExecState* exec = globalObject->globalExec();
- MarkedArgumentBuffer args;
- args.append(toJS(exec, database));
-
- bool ignored;
- m_data->invokeCallback(args, &ignored);
-}
-
-}
-
-#endif // ENABLE(DATABASE)
diff --git a/WebCore/bindings/js/JSDatabaseCallback.h b/WebCore/bindings/js/JSDatabaseCallback.h
deleted file mode 100644
index 2f9234e..0000000
--- a/WebCore/bindings/js/JSDatabaseCallback.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2010 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 THE COPYRIGHT
- * OWNER 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 JSDatabaseCallback_h
-#define JSDatabaseCallback_h
-
-#if ENABLE(DATABASE)
-
-#include "DatabaseCallback.h"
-#include "JSCallbackData.h"
-
-namespace WebCore {
-
-class ScriptExecutionContext;
-
-class JSDatabaseCallback : public DatabaseCallback {
-public:
- static PassRefPtr<JSDatabaseCallback> create(JSC::JSObject* callback, JSDOMGlobalObject* globalObject)
- {
- return adoptRef(new JSDatabaseCallback(callback, globalObject));
- }
-
- virtual ~JSDatabaseCallback();
-
- virtual void handleEvent(ScriptExecutionContext*, Database*);
-
-private:
- JSDatabaseCallback(JSC::JSObject* callback, JSDOMGlobalObject*);
-
- JSCallbackData* m_data;
- RefPtr<DOMWrapperWorld> m_isolatedWorld;
-};
-
-}
-
-#endif // ENABLE(DATABASE)
-
-#endif // JSDatabaseCallback_h
diff --git a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
index c55738f..97cdb94 100644
--- a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp
@@ -54,8 +54,6 @@
#include "V8BindingDOMWindow.h"
#include "V8BindingState.h"
#include "V8CustomEventListener.h"
-#include "V8Database.h"
-#include "V8DatabaseCallback.h"
#include "V8GCForContextDispose.h"
#include "V8HTMLCollection.h"
#include "V8MessagePortCustom.h"
@@ -772,30 +770,6 @@ v8::Handle<v8::Value> V8DOMWindow::clearIntervalCallback(const v8::Arguments& ar
return v8::Undefined();
}
-v8::Handle<v8::Value> V8DOMWindow::openDatabaseCallback(const v8::Arguments& args)
-{
- INC_STATS("DOM.DOMWindow.openDatabase");
- if (args.Length() < 4)
- return v8::Undefined();
-
- DOMWindow* imp = V8DOMWindow::toNative(args.Holder());
- if (!V8BindingSecurity::canAccessFrame(V8BindingState::Only(), imp->frame(), true))
- return v8::Undefined();
-
- ExceptionCode ec = 0;
- String name = toWebCoreString(args[0]);
- String version = toWebCoreString(args[1]);
- String displayName = toWebCoreString(args[2]);
- unsigned long estimatedSize = args[3]->IntegerValue();
- RefPtr<DatabaseCallback> creationCallback;
- if ((args.Length() >= 5) && args[4]->IsObject())
- creationCallback = V8DatabaseCallback::create(args[4], imp->frame());
-
- v8::Handle<v8::Value> result = toV8(imp->openDatabase(name, version, displayName, estimatedSize, creationCallback.release(), ec));
- V8Proxy::setDOMException(ec);
- return result;
-}
-
bool V8DOMWindow::namedSecurityCheck(v8::Local<v8::Object> host, v8::Local<v8::Value> key, v8::AccessType type, v8::Local<v8::Value> data)
{
ASSERT(V8ClassIndex::FromInt(data->Int32Value()) == V8ClassIndex::DOMWINDOW);
diff --git a/WebCore/bindings/v8/custom/V8DatabaseCallback.cpp b/WebCore/bindings/v8/custom/V8DatabaseCallback.cpp
deleted file mode 100644
index 088d89f..0000000
--- a/WebCore/bindings/v8/custom/V8DatabaseCallback.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2010, 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 THE COPYRIGHT
- * OWNER 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(DATABASE)
-
-#include "V8DatabaseCallback.h"
-
-#include "Frame.h"
-#include "ScriptExecutionContext.h"
-#include "V8CustomVoidCallback.h"
-#include "V8Database.h"
-
-namespace WebCore {
-
-V8DatabaseCallback::V8DatabaseCallback(v8::Local<v8::Object> callback, Frame* frame)
- : m_callback(v8::Persistent<v8::Object>::New(callback))
- , m_frame(frame)
- , m_worldContext(UseCurrentWorld)
-{
-}
-
-V8DatabaseCallback::~V8DatabaseCallback()
-{
- m_callback.Dispose();
-}
-
-void V8DatabaseCallback::handleEvent(ScriptExecutionContext* context, Database* database)
-{
- v8::HandleScope handleScope;
-
- v8::Handle<v8::Context> v8Context = toV8Context(context, m_worldContext);
- if (v8Context.IsEmpty())
- return;
-
- v8::Context::Scope scope(v8Context);
-
- v8::Handle<v8::Value> argv[] = {
- toV8(database)
- };
-
- // Protect the frame until the callback returns.
- RefPtr<Frame> protector(m_frame);
-
- bool callbackReturnValue = false;
- invokeCallback(m_callback, 1, argv, callbackReturnValue);
-}
-
-} // namespace WebCore
-
-#endif
diff --git a/WebCore/bindings/v8/custom/V8DatabaseCallback.h b/WebCore/bindings/v8/custom/V8DatabaseCallback.h
deleted file mode 100644
index fd411b4..0000000
--- a/WebCore/bindings/v8/custom/V8DatabaseCallback.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2010 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 THE COPYRIGHT
- * OWNER 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 V8DatabaseCallback_h
-#define V8DatabaseCallback_h
-
-#if ENABLE(DATABASE)
-
-#include "DatabaseCallback.h"
-#include "WorldContextHandle.h"
-#include <v8.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefPtr.h>
-
-namespace WebCore {
-
-class Frame;
-
-class V8DatabaseCallback : public DatabaseCallback {
-public:
- static PassRefPtr<V8DatabaseCallback> create(v8::Local<v8::Value> value, Frame* frame)
- {
- ASSERT(value->IsObject());
- return adoptRef(new V8DatabaseCallback(value->ToObject(), frame));
- }
- virtual ~V8DatabaseCallback();
-
- virtual void handleEvent(ScriptExecutionContext*, Database*);
-
-private:
- V8DatabaseCallback(v8::Local<v8::Object>, Frame*);
-
- v8::Persistent<v8::Object> m_callback;
- RefPtr<Frame> m_frame;
- WorldContextHandle m_worldContext;
-};
-
-} // namespace WebCore
-
-#endif
-
-#endif // V8DatabaseCallback_h
diff --git a/WebCore/dom/Document.cpp b/WebCore/dom/Document.cpp
index 5925fad..d0fe75f 100644
--- a/WebCore/dom/Document.cpp
+++ b/WebCore/dom/Document.cpp
@@ -4730,7 +4730,12 @@ static void performTask(void* ctx)
void Document::postTask(PassOwnPtr<Task> task)
{
- callOnMainThread(performTask, new PerformTaskContext(m_weakReference, task));
+ if (isMainThread()) {
+ ScriptExecutionContextTaskTimer* timer = new ScriptExecutionContextTaskTimer(static_cast<Document*>(this), task);
+ timer->startOneShot(0);
+ } else {
+ callOnMainThread(performTask, new PerformTaskContext(m_weakReference, task));
+ }
}
Element* Document::findAnchor(const String& name)
diff --git a/WebCore/page/DOMWindow.cpp b/WebCore/page/DOMWindow.cpp
index ff4d8f3..83eb8d8 100644
--- a/WebCore/page/DOMWindow.cpp
+++ b/WebCore/page/DOMWindow.cpp
@@ -36,7 +36,6 @@
#include "Chrome.h"
#include "Console.h"
#include "Database.h"
-#include "DatabaseCallback.h"
#include "DOMApplicationCache.h"
#include "DOMSelection.h"
#include "DOMTimer.h"
@@ -1172,7 +1171,7 @@ double DOMWindow::devicePixelRatio() const
}
#if ENABLE(DATABASE)
-PassRefPtr<Database> DOMWindow::openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
+PassRefPtr<Database> DOMWindow::openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, ExceptionCode& ec)
{
if (!m_frame)
return 0;
@@ -1184,7 +1183,7 @@ PassRefPtr<Database> DOMWindow::openDatabase(const String& name, const String& v
if (!document->securityOrigin()->canAccessDatabase())
return 0;
- return Database::openDatabase(document, name, version, displayName, estimatedSize, creationCallback, ec);
+ return Database::openDatabase(document, name, version, displayName, estimatedSize, ec);
}
#endif
diff --git a/WebCore/page/DOMWindow.h b/WebCore/page/DOMWindow.h
index 5204bf2..5dee548 100644
--- a/WebCore/page/DOMWindow.h
+++ b/WebCore/page/DOMWindow.h
@@ -45,7 +45,6 @@ namespace WebCore {
class Console;
class DOMSelection;
class Database;
- class DatabaseCallback;
class Document;
class Element;
class Event;
@@ -201,7 +200,7 @@ namespace WebCore {
#if ENABLE(DATABASE)
// HTML 5 client-side database
- PassRefPtr<Database> openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
+ PassRefPtr<Database> openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, ExceptionCode&);
#endif
#if ENABLE(DOM_STORAGE)
diff --git a/WebCore/page/DOMWindow.idl b/WebCore/page/DOMWindow.idl
index 124888e..c757146 100644
--- a/WebCore/page/DOMWindow.idl
+++ b/WebCore/page/DOMWindow.idl
@@ -160,7 +160,7 @@ module window {
readonly attribute [EnabledAtRuntime] DOMApplicationCache applicationCache;
#endif
#if defined(ENABLE_DATABASE) && ENABLE_DATABASE
- [EnabledAtRuntime, Custom] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize, in DatabaseCallback creationCallback)
+ [EnabledAtRuntime] Database openDatabase(in DOMString name, in DOMString version, in DOMString displayName, in unsigned long estimatedSize)
raises(DOMException);
#endif
#if defined(ENABLE_DOM_STORAGE) && ENABLE_DOM_STORAGE
diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp
index a0bcb83..2130631 100644
--- a/WebCore/storage/Database.cpp
+++ b/WebCore/storage/Database.cpp
@@ -35,7 +35,6 @@
#include "ChangeVersionWrapper.h"
#include "CString.h"
#include "DatabaseAuthorizer.h"
-#include "DatabaseCallback.h"
#include "DatabaseTask.h"
#include "DatabaseThread.h"
#include "DatabaseTracker.h"
@@ -133,31 +132,7 @@ static const String& databaseVersionKey()
static int guidForOriginAndName(const String& origin, const String& name);
-class DatabaseCreationCallbackTask : public ScriptExecutionContext::Task {
-public:
- static PassOwnPtr<DatabaseCreationCallbackTask> create(PassRefPtr<Database> database)
- {
- return new DatabaseCreationCallbackTask(database);
- }
-
- virtual void performTask(ScriptExecutionContext*)
- {
- m_database->performCreationCallback();
- }
-
-private:
- DatabaseCreationCallbackTask(PassRefPtr<Database> database)
- : m_database(database)
- {
- }
-
- RefPtr<Database> m_database;
-};
-
-PassRefPtr<Database> Database::openDatabase(ScriptExecutionContext* context, const String& name,
- const String& expectedVersion, const String& displayName,
- unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback,
- ExceptionCode& e)
+PassRefPtr<Database> Database::openDatabase(ScriptExecutionContext* context, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize, ExceptionCode& e)
{
if (!DatabaseTracker::tracker().canEstablishDatabase(context, name, displayName, estimatedSize)) {
// FIXME: There should be an exception raised here in addition to returning a null Database object. The question has been raised with the WHATWG.
@@ -165,7 +140,7 @@ PassRefPtr<Database> Database::openDatabase(ScriptExecutionContext* context, con
return 0;
}
- RefPtr<Database> database = adoptRef(new Database(context, name, expectedVersion, displayName, estimatedSize, creationCallback));
+ RefPtr<Database> database = adoptRef(new Database(context, name, expectedVersion, displayName, estimatedSize));
if (!database->openAndVerifyVersion(e)) {
LOG(StorageAPI, "Failed to open and verify version (expected %s) of database %s", expectedVersion.ascii().data(), database->databaseDebugName().ascii().data());
@@ -185,20 +160,10 @@ PassRefPtr<Database> Database::openDatabase(ScriptExecutionContext* context, con
}
#endif
- // If it's a new database and a creation callback was provided, reset the expected
- // version to "" and schedule the creation callback. Because of some subtle String
- // implementation issues, we have to reset m_expectedVersion here instead of doing
- // it inside performOpenAndVerify() which is run on the DB thread.
- if (database->isNew() && database->m_creationCallback.get()) {
- database->m_expectedVersion = "";
- LOG(StorageAPI, "Scheduling DatabaseCreationCallbackTask for database %p\n", database.get());
- database->m_scriptExecutionContext->postTask(DatabaseCreationCallbackTask::create(database));
- }
-
return database;
}
-Database::Database(ScriptExecutionContext* context, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback)
+Database::Database(ScriptExecutionContext* context, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
: m_transactionInProgress(false)
, m_isTransactionQueueEnabled(true)
, m_scriptExecutionContext(context)
@@ -210,8 +175,6 @@ Database::Database(ScriptExecutionContext* context, const String& name, const St
, m_deleted(false)
, m_stopped(false)
, m_opened(false)
- , m_new(false)
- , m_creationCallback(creationCallback)
{
ASSERT(m_scriptExecutionContext.get());
m_mainThreadSecurityOrigin = m_scriptExecutionContext->securityOrigin();
@@ -557,8 +520,6 @@ bool Database::performOpenAndVerify(ExceptionCode& e)
LOG(StorageAPI, "No cached version for guid %i", m_guid);
if (!m_sqliteDatabase.tableExists(databaseInfoTableName())) {
- m_new = true;
-
if (!m_sqliteDatabase.executeCommand("CREATE TABLE " + databaseInfoTableName() + " (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE,value TEXT NOT NULL ON CONFLICT FAIL);")) {
LOG_ERROR("Unable to create table %s in database %s", databaseInfoTableName().ascii().data(), databaseDebugName().ascii().data());
e = INVALID_STATE_ERR;
@@ -577,7 +538,7 @@ bool Database::performOpenAndVerify(ExceptionCode& e)
}
if (currentVersion.length()) {
LOG(StorageAPI, "Retrieved current version %s from database %s", currentVersion.ascii().data(), databaseDebugName().ascii().data());
- } else if (!m_new || !m_creationCallback) {
+ } else {
LOG(StorageAPI, "Setting version %s in database %s that was just created", m_expectedVersion.ascii().data(), databaseDebugName().ascii().data());
if (!setVersionInDatabase(m_expectedVersion)) {
LOG_ERROR("Failed to set version %s in database %s", m_expectedVersion.ascii().data(), databaseDebugName().ascii().data());
@@ -600,7 +561,7 @@ bool Database::performOpenAndVerify(ExceptionCode& e)
// If the expected version isn't the empty string, ensure that the current database version we have matches that version. Otherwise, set an exception.
// If the expected version is the empty string, then we always return with whatever version of the database we have.
- if ((!m_new || !m_creationCallback) && m_expectedVersion.length() && m_expectedVersion != currentVersion) {
+ if (m_expectedVersion.length() && m_expectedVersion != currentVersion) {
LOG(StorageAPI, "page expects version %s from database %s, which actually has version name %s - openDatabase() call will fail", m_expectedVersion.ascii().data(),
databaseDebugName().ascii().data(), currentVersion.ascii().data());
e = INVALID_STATE_ERR;
@@ -724,11 +685,6 @@ Vector<String> Database::performGetTableNames()
return tableNames;
}
-void Database::performCreationCallback()
-{
- m_creationCallback->handleEvent(m_scriptExecutionContext.get(), this);
-}
-
SQLTransactionClient* Database::transactionClient() const
{
return m_scriptExecutionContext->databaseThread()->transactionClient();
diff --git a/WebCore/storage/Database.h b/WebCore/storage/Database.h
index 85abfa6..0d7f33c 100644
--- a/WebCore/storage/Database.h
+++ b/WebCore/storage/Database.h
@@ -51,7 +51,6 @@
namespace WebCore {
class DatabaseAuthorizer;
-class DatabaseCallback;
class DatabaseThread;
class ScriptExecutionContext;
class SQLResultSet;
@@ -74,10 +73,7 @@ public:
~Database();
// Direct support for the DOM API
- static PassRefPtr<Database> openDatabase(ScriptExecutionContext* context, const String& name,
- const String& expectedVersion, const String& displayName,
- unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback,
- ExceptionCode&);
+ static PassRefPtr<Database> openDatabase(ScriptExecutionContext* context, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize, ExceptionCode&);
String version() const;
void changeVersion(const String& oldVersion, const String& newVersion,
PassRefPtr<SQLTransactionCallback> callback, PassRefPtr<SQLTransactionErrorCallback> errorCallback,
@@ -115,8 +111,6 @@ public:
void stop();
bool stopped() const { return m_stopped; }
- bool isNew() const { return m_new; }
-
unsigned long long databaseSize() const;
unsigned long long maximumSize() const;
@@ -127,7 +121,6 @@ public:
bool performOpenAndVerify(ExceptionCode&);
Vector<String> performGetTableNames();
- void performCreationCallback();
SQLTransactionClient* transactionClient() const;
SQLTransactionCoordinator* transactionCoordinator() const;
@@ -135,7 +128,7 @@ public:
private:
Database(ScriptExecutionContext* context, const String& name,
const String& expectedVersion, const String& displayName,
- unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback);
+ unsigned long estimatedSize);
bool openAndVerifyVersion(ExceptionCode&);
@@ -166,13 +159,9 @@ private:
bool m_opened;
- bool m_new;
-
SQLiteDatabase m_sqliteDatabase;
RefPtr<DatabaseAuthorizer> m_databaseAuthorizer;
- RefPtr<DatabaseCallback> m_creationCallback;
-
#ifndef NDEBUG
String databaseDebugName() const { return m_mainThreadSecurityOrigin->toString() + "::" + m_name; }
#endif
diff --git a/WebCore/storage/DatabaseCallback.h b/WebCore/storage/DatabaseCallback.h
deleted file mode 100644
index 2115a21..0000000
--- a/WebCore/storage/DatabaseCallback.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2010 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:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * 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.
- * * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "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 THE COPYRIGHT
- * OWNER 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 DatabaseCallback_h
-#define DatabaseCallback_h
-
-#if ENABLE(DATABASE)
-
-#include <wtf/Threading.h>
-
-namespace WebCore {
-
-class Database;
-class ScriptExecutionContext;
-
-class DatabaseCallback : public ThreadSafeShared<DatabaseCallback> {
-public:
- virtual ~DatabaseCallback() { }
- virtual void handleEvent(ScriptExecutionContext*, Database*) = 0;
-};
-
-}
-
-#endif
-
-#endif // DatabaseCallback_h
diff --git a/WebCore/workers/WorkerContext.cpp b/WebCore/workers/WorkerContext.cpp
index 7b4f293..0ec24e6 100644
--- a/WebCore/workers/WorkerContext.cpp
+++ b/WebCore/workers/WorkerContext.cpp
@@ -256,7 +256,7 @@ NotificationCenter* WorkerContext::webkitNotifications() const
#endif
#if ENABLE(DATABASE)
-PassRefPtr<Database> WorkerContext::openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode& ec)
+PassRefPtr<Database> WorkerContext::openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, ExceptionCode& ec)
{
if (!securityOrigin()->canAccessDatabase()) {
ec = SECURITY_ERR;
@@ -267,7 +267,7 @@ PassRefPtr<Database> WorkerContext::openDatabase(const String& name, const Strin
if (!Database::isAvailable())
return 0;
- return Database::openDatabase(this, name, version, displayName, estimatedSize, creationCallback, ec);
+ return Database::openDatabase(this, name, version, displayName, estimatedSize, ec);
}
#endif
diff --git a/WebCore/workers/WorkerContext.h b/WebCore/workers/WorkerContext.h
index fb4a26d..a795947 100644
--- a/WebCore/workers/WorkerContext.h
+++ b/WebCore/workers/WorkerContext.h
@@ -31,7 +31,6 @@
#include "AtomicStringHash.h"
#include "Database.h"
-#include "DatabaseCallback.h"
#include "EventListener.h"
#include "EventNames.h"
#include "EventTarget.h"
@@ -107,7 +106,7 @@ namespace WebCore {
#if ENABLE(DATABASE)
// HTML 5 client-side database
- PassRefPtr<Database> openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, ExceptionCode&);
+ PassRefPtr<Database> openDatabase(const String& name, const String& version, const String& displayName, unsigned long estimatedSize, ExceptionCode&);
// Not implemented yet.
virtual bool isDatabaseReadOnly() const { return false; }
// Not implemented yet.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list