[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dumi at chromium.org
dumi at chromium.org
Wed Dec 22 11:14:50 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 9904cedfff03c2f4a19f1ddb3651d865a2996bc1
Author: dumi at chromium.org <dumi at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 15 22:51:42 2010 +0000
Unreviewed, Chromium-specific changes that I forgot to make in r63278.
WebCore:
1. DatabaseTrackerChromium::getMaxSizeForDatabase() is called on
the context thread by sync DBs.
2. Forgot to change V8SQLTransactionSyncCustom to return the
result set when executeSql() is called.
* bindings/v8/custom/V8SQLTransactionSyncCustom.cpp:
(WebCore::V8SQLTransactionSync::executeSqlCallback):
* storage/chromium/DatabaseTrackerChromium.cpp:
(WebCore::DatabaseTracker::getMaxSizeForDatabase):
LayoutTests:
Make the output of test-authorizer-sync.html shorter, so it can
all fit into a cookie (needed in order to be able to run it as a
Chromium UI test).
* fast/workers/storage/resources/test-authorizer-sync.js:
(executeStatement):
* fast/workers/storage/test-authorizer-sync-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63479 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ae42ce8..a2300ab 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-15 Dumitru Daniliuc <dumi at chromium.org>
+
+ Unreviewed, Chromium-specific changes that I forgot to make in r63278.
+
+ Make the output of test-authorizer-sync.html shorter, so it can
+ all fit into a cookie (needed in order to be able to run it as a
+ Chromium UI test).
+
+ * fast/workers/storage/resources/test-authorizer-sync.js:
+ (executeStatement):
+ * fast/workers/storage/test-authorizer-sync-expected.txt:
+
2010-07-15 Adam Barth <abarth at webkit.org>
Update Qt expectionat to account for implicit <colgroup>.
diff --git a/LayoutTests/fast/workers/storage/resources/test-authorizer-sync.js b/LayoutTests/fast/workers/storage/resources/test-authorizer-sync.js
index 73584c0..de7b2b0 100644
--- a/LayoutTests/fast/workers/storage/resources/test-authorizer-sync.js
+++ b/LayoutTests/fast/workers/storage/resources/test-authorizer-sync.js
@@ -12,9 +12,9 @@ function executeStatement(tx, statement, operation)
{
try {
tx.executeSql(statement);
- postMessage(operation + " statement succeeded.");
+ postMessage(operation + " allowed.");
} catch (err) {
- postMessage(operation + " statement failed: " + err + " (" + err.code + ")");
+ postMessage(operation + " not allowed: " + err + " (" + err.code + ")");
}
}
diff --git a/LayoutTests/fast/workers/storage/test-authorizer-sync-expected.txt b/LayoutTests/fast/workers/storage/test-authorizer-sync-expected.txt
index a06c780..7ad9bab 100644
--- a/LayoutTests/fast/workers/storage/test-authorizer-sync-expected.txt
+++ b/LayoutTests/fast/workers/storage/test-authorizer-sync-expected.txt
@@ -1,71 +1,71 @@
Test the database authorizer.
Beginning write transaction:
-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: [object SQLException] (5)
-SQLITE_READ statement succeeded.
-SQLITE_SELECT statement succeeded.
-SQLITE_DELETE statement succeeded.
-SQLITE_INSERT statement succeeded.
-SQLITE_UPDATE statement succeeded.
-SQLITE_PRAGMA statement failed: [object SQLException] (5)
-SQLITE_ALTER_TABLE statement succeeded.
-SQLITE_ALTER_TABLE statement succeeded.
-SQLITE_TRANSACTION statement failed: [object SQLException] (5)
-SQLITE_ATTACH statement failed: [object SQLException] (5)
-SQLITE_DETACH statement failed: [object SQLException] (5)
-SQLITE_REINDEX statement succeeded.
-SQLITE_ANALYZE statement failed: [object SQLException] (5)
-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.
+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: [object SQLException] (5)
+SQLITE_READ allowed.
+SQLITE_SELECT allowed.
+SQLITE_DELETE allowed.
+SQLITE_INSERT allowed.
+SQLITE_UPDATE allowed.
+SQLITE_PRAGMA not allowed: [object SQLException] (5)
+SQLITE_ALTER_TABLE allowed.
+SQLITE_ALTER_TABLE allowed.
+SQLITE_TRANSACTION not allowed: [object SQLException] (5)
+SQLITE_ATTACH not allowed: [object SQLException] (5)
+SQLITE_DETACH not allowed: [object SQLException] (5)
+SQLITE_REINDEX allowed.
+SQLITE_ANALYZE not allowed: [object SQLException] (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 statement failed: [object SQLException] (5)
-SQLITE_CREATE_TABLE statement succeeded.
-SQLITE_CREATE_INDEX statement failed: [object SQLException] (5)
-SQLITE_CREATE_TEMP_TABLE statement failed: [object SQLException] (5)
-SQLITE_CREATE_TEMP_TRIGGER statement failed: [object SQLException] (5)
-SQLITE_CREATE_TEMP_VIEW statement failed: [object SQLException] (5)
-SQLITE_CREATE_TRIGGER statement failed: [object SQLException] (5)
-SQLITE_CREATE_VIEW statement failed: [object SQLException] (5)
-SQLITE_CREATE_VTABLE statement failed: [object SQLException] (5)
-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: [object SQLException] (5)
-SQLITE_READ statement succeeded.
-SQLITE_SELECT statement succeeded.
-SQLITE_DELETE statement failed: [object SQLException] (5)
-SQLITE_INSERT statement failed: [object SQLException] (5)
-SQLITE_UPDATE statement failed: [object SQLException] (5)
-SQLITE_PRAGMA statement failed: [object SQLException] (5)
-SQLITE_ALTER_TABLE statement failed: [object SQLException] (5)
-SQLITE_ALTER_TABLE statement failed: [object SQLException] (5)
-SQLITE_TRANSACTION statement failed: [object SQLException] (5)
-SQLITE_ATTACH statement failed: [object SQLException] (5)
-SQLITE_DETACH statement failed: [object SQLException] (5)
-SQLITE_REINDEX statement failed: [object SQLException] (5)
-SQLITE_ANALYZE statement failed: [object SQLException] (5)
-SQLITE_DROP_INDEX statement failed: [object SQLException] (5)
-SQLITE_DROP_TEMP_TABLE statement failed: [object SQLException] (5)
-SQLITE_DROP_TEMP_TRIGGER statement failed: [object SQLException] (5)
-SQLITE_DROP_TEMP_VIEW statement failed: [object SQLException] (5)
-SQLITE_DROP_TRIGGER statement failed: [object SQLException] (5)
-SQLITE_DROP_VIEW statement failed: [object SQLException] (5)
-SQLITE_DROP_TABLE statement failed: [object SQLException] (5)
+SQLITE_CREATE_TABLE not allowed: [object SQLException] (5)
+SQLITE_CREATE_TABLE allowed.
+SQLITE_CREATE_INDEX not allowed: [object SQLException] (5)
+SQLITE_CREATE_TEMP_TABLE not allowed: [object SQLException] (5)
+SQLITE_CREATE_TEMP_TRIGGER not allowed: [object SQLException] (5)
+SQLITE_CREATE_TEMP_VIEW not allowed: [object SQLException] (5)
+SQLITE_CREATE_TRIGGER not allowed: [object SQLException] (5)
+SQLITE_CREATE_VIEW not allowed: [object SQLException] (5)
+SQLITE_CREATE_VTABLE not allowed: [object SQLException] (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: [object SQLException] (5)
+SQLITE_READ allowed.
+SQLITE_SELECT allowed.
+SQLITE_DELETE not allowed: [object SQLException] (5)
+SQLITE_INSERT not allowed: [object SQLException] (5)
+SQLITE_UPDATE not allowed: [object SQLException] (5)
+SQLITE_PRAGMA not allowed: [object SQLException] (5)
+SQLITE_ALTER_TABLE not allowed: [object SQLException] (5)
+SQLITE_ALTER_TABLE not allowed: [object SQLException] (5)
+SQLITE_TRANSACTION not allowed: [object SQLException] (5)
+SQLITE_ATTACH not allowed: [object SQLException] (5)
+SQLITE_DETACH not allowed: [object SQLException] (5)
+SQLITE_REINDEX not allowed: [object SQLException] (5)
+SQLITE_ANALYZE not allowed: [object SQLException] (5)
+SQLITE_DROP_INDEX not allowed: [object SQLException] (5)
+SQLITE_DROP_TEMP_TABLE not allowed: [object SQLException] (5)
+SQLITE_DROP_TEMP_TRIGGER not allowed: [object SQLException] (5)
+SQLITE_DROP_TEMP_VIEW not allowed: [object SQLException] (5)
+SQLITE_DROP_TRIGGER not allowed: [object SQLException] (5)
+SQLITE_DROP_VIEW not allowed: [object SQLException] (5)
+SQLITE_DROP_TABLE not allowed: [object SQLException] (5)
Read transactions succeeded.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0d9d3ea..ccee0d9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-07-15 Dumitru Daniliuc <dumi at chromium.org>
+
+ Unreviewed, Chromium-specific changes that I forgot to make in r63278.
+
+ 1. DatabaseTrackerChromium::getMaxSizeForDatabase() is called on
+ the context thread by sync DBs.
+ 2. Forgot to change V8SQLTransactionSyncCustom to return the
+ result set when executeSql() is called.
+
+ * bindings/v8/custom/V8SQLTransactionSyncCustom.cpp:
+ (WebCore::V8SQLTransactionSync::executeSqlCallback):
+ * storage/chromium/DatabaseTrackerChromium.cpp:
+ (WebCore::DatabaseTracker::getMaxSizeForDatabase):
+
2010-07-15 Martin Robinson <mrobinson at igalia.com>
Reviewed by Oliver Hunt.
diff --git a/WebCore/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp b/WebCore/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp
index 8ef11ce..495a8e4 100644
--- a/WebCore/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8SQLTransactionSyncCustom.cpp
@@ -41,6 +41,7 @@
#include "V8Binding.h"
#include "V8BindingMacros.h"
#include "V8Proxy.h"
+#include "V8SQLResultSet.h"
#include <wtf/Vector.h>
using namespace WTF;
@@ -90,10 +91,10 @@ v8::Handle<v8::Value> V8SQLTransactionSync::executeSqlCallback(const v8::Argumen
SQLTransactionSync* transaction = V8SQLTransactionSync::toNative(args.Holder());
ExceptionCode ec = 0;
- transaction->executeSQL(statement, sqlValues, ec);
+ v8::Handle<v8::Value> result = toV8(transaction->executeSQL(statement, sqlValues, ec));
V8Proxy::setDOMException(ec);
- return v8::Undefined();
+ return result;
}
} // namespace WebCore
diff --git a/WebCore/storage/chromium/DatabaseTrackerChromium.cpp b/WebCore/storage/chromium/DatabaseTrackerChromium.cpp
index 13c65cc..7d9c4de 100644
--- a/WebCore/storage/chromium/DatabaseTrackerChromium.cpp
+++ b/WebCore/storage/chromium/DatabaseTrackerChromium.cpp
@@ -33,16 +33,13 @@
#include "AbstractDatabase.h"
#include "DatabaseObserver.h"
-#include "DatabaseThread.h"
#include "QuotaTracker.h"
+#include "PlatformString.h"
#include "ScriptExecutionContext.h"
#include "SecurityOrigin.h"
#include "SecurityOriginHash.h"
#include "SQLiteFileSystem.h"
-#include <wtf/HashSet.h>
-#include <wtf/MainThread.h>
#include <wtf/StdLibExtras.h>
-#include <wtf/text/CString.h>
namespace WebCore {
@@ -167,7 +164,6 @@ void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& nam
unsigned long long DatabaseTracker::getMaxSizeForDatabase(const AbstractDatabase* database)
{
- ASSERT(currentThread() == database->scriptExecutionContext()->databaseThread()->getThreadID());
unsigned long long spaceAvailable = 0;
unsigned long long databaseSize = 0;
QuotaTracker::instance().getDatabaseSizeAndSpaceAvailableToOrigin(
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list