[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
jorlow at chromium.org
jorlow at chromium.org
Wed Dec 22 12:20:04 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 12973292ddb25237fde4e3ecadec8236dc2ca686
Author: jorlow at chromium.org <jorlow at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Aug 19 15:19:53 2010 +0000
2010-08-19 Jeremy Orlow <jorlow at chromium.org>
Chromium build fix.
Use ASSERT_UNUSED on variables that aren't used besides by the ASSERT.
* storage/IDBDatabaseBackendImpl.cpp:
(WebCore::IDBDatabaseBackendImpl::createObjectStore):
(WebCore::IDBDatabaseBackendImpl::removeObjectStore):
(WebCore::IDBDatabaseBackendImpl::loadObjectStores):
* storage/IDBObjectStoreBackendImpl.cpp:
(WebCore::IDBObjectStoreBackendImpl::get):
(WebCore::IDBObjectStoreBackendImpl::put):
(WebCore::IDBObjectStoreBackendImpl::remove):
(WebCore::IDBObjectStoreBackendImpl::createIndex):
(WebCore::IDBObjectStoreBackendImpl::removeIndex):
(WebCore::IDBObjectStoreBackendImpl::openCursor):
(WebCore::IDBObjectStoreBackendImpl::loadIndexes):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65673 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c1bdad5..538d98f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-08-19 Jeremy Orlow <jorlow at chromium.org>
+
+ Chromium build fix.
+
+ Use ASSERT_UNUSED on variables that aren't used besides by the ASSERT.
+
+ * storage/IDBDatabaseBackendImpl.cpp:
+ (WebCore::IDBDatabaseBackendImpl::createObjectStore):
+ (WebCore::IDBDatabaseBackendImpl::removeObjectStore):
+ (WebCore::IDBDatabaseBackendImpl::loadObjectStores):
+ * storage/IDBObjectStoreBackendImpl.cpp:
+ (WebCore::IDBObjectStoreBackendImpl::get):
+ (WebCore::IDBObjectStoreBackendImpl::put):
+ (WebCore::IDBObjectStoreBackendImpl::remove):
+ (WebCore::IDBObjectStoreBackendImpl::createIndex):
+ (WebCore::IDBObjectStoreBackendImpl::removeIndex):
+ (WebCore::IDBObjectStoreBackendImpl::openCursor):
+ (WebCore::IDBObjectStoreBackendImpl::loadIndexes):
+
2010-08-19 Andrey Kosyakov <caseq at chromium.org>
Reviewed by Pavel Feldman.
diff --git a/WebCore/storage/IDBDatabaseBackendImpl.cpp b/WebCore/storage/IDBDatabaseBackendImpl.cpp
index d6b6310..9095039 100644
--- a/WebCore/storage/IDBDatabaseBackendImpl.cpp
+++ b/WebCore/storage/IDBDatabaseBackendImpl.cpp
@@ -133,12 +133,12 @@ void IDBDatabaseBackendImpl::createObjectStore(const String& name, const String&
SQLiteStatement insert(sqliteDatabase(), "INSERT INTO ObjectStores (name, keyPath, doAutoIncrement) VALUES (?, ?, ?)");
bool ok = insert.prepare() == SQLResultOk;
- ASSERT(ok); // FIXME: Better error handling.
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
insert.bindText(1, name);
insert.bindText(2, keyPath);
insert.bindInt(3, static_cast<int>(autoIncrement));
ok = insert.step() == SQLResultDone;
- ASSERT(ok); // FIXME: Better error handling.
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
int64_t id = sqliteDatabase().lastInsertRowID();
RefPtr<IDBObjectStoreBackendInterface> objectStore = IDBObjectStoreBackendImpl::create(this, id, name, keyPath, autoIncrement);
@@ -163,10 +163,10 @@ void IDBDatabaseBackendImpl::removeObjectStore(const String& name, PassRefPtr<ID
SQLiteStatement deleteQuery(sqliteDatabase(), "DELETE FROM ObjectStores WHERE name = ?");
bool ok = deleteQuery.prepare() == SQLResultOk;
- ASSERT(ok); // FIXME: Better error handling.
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
deleteQuery.bindText(1, name);
ok = deleteQuery.step() == SQLResultDone;
- ASSERT(ok); // FIXME: Better error handling.
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
m_objectStores.remove(name);
callbacks->onSuccess();
@@ -181,7 +181,7 @@ void IDBDatabaseBackendImpl::loadObjectStores()
{
SQLiteStatement objectStoresQuery(sqliteDatabase(), "SELECT id, name, keyPath, doAutoIncrement FROM ObjectStores");
bool ok = objectStoresQuery.prepare() == SQLResultOk;
- ASSERT(ok); // FIXME: Better error handling?
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling?
while (objectStoresQuery.step() == SQLResultRow) {
int64_t id = objectStoresQuery.getColumnInt64(0);
diff --git a/WebCore/storage/IDBObjectStoreBackendImpl.cpp b/WebCore/storage/IDBObjectStoreBackendImpl.cpp
index b305a3c..e5e0b0d 100755
--- a/WebCore/storage/IDBObjectStoreBackendImpl.cpp
+++ b/WebCore/storage/IDBObjectStoreBackendImpl.cpp
@@ -108,7 +108,7 @@ void IDBObjectStoreBackendImpl::get(PassRefPtr<IDBKey> key, PassRefPtr<IDBCallba
{
SQLiteStatement query(sqliteDatabase(), "SELECT keyString, keyDate, keyNumber, value FROM ObjectStoreData " + whereClause(key->type()));
bool ok = query.prepare() == SQLResultOk;
- ASSERT(ok); // FIXME: Better error handling?
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling?
bindWhereClause(query, m_id, key.get());
if (query.step() != SQLResultRow) {
@@ -145,7 +145,7 @@ void IDBObjectStoreBackendImpl::put(PassRefPtr<SerializedScriptValue> value, Pas
SQLiteStatement getQuery(sqliteDatabase(), "SELECT id FROM ObjectStoreData " + whereClause(key->type()));
bool ok = getQuery.prepare() == SQLResultOk;
- ASSERT(ok); // FIXME: Better error handling?
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling?
bindWhereClause(getQuery, m_id, key.get());
bool existingValue = getQuery.step() == SQLResultRow;
@@ -158,7 +158,7 @@ void IDBObjectStoreBackendImpl::put(PassRefPtr<SerializedScriptValue> value, Pas
: "INSERT INTO ObjectStoreData (keyString, keyDate, keyNumber, value, objectStoreId) VALUES (?, ?, ?, ?, ?)";
SQLiteStatement putQuery(sqliteDatabase(), sql);
ok = putQuery.prepare() == SQLResultOk;
- ASSERT(ok); // FIXME: Better error handling?
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling?
switch (key->type()) {
case IDBKey::StringType:
putQuery.bindText(1, key->string());
@@ -186,7 +186,7 @@ void IDBObjectStoreBackendImpl::put(PassRefPtr<SerializedScriptValue> value, Pas
putQuery.bindInt64(5, m_id);
ok = putQuery.step() == SQLResultDone;
- ASSERT(ok); // FIXME: Better error handling?
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling?
callbacks->onSuccess(key.get());
}
@@ -195,7 +195,7 @@ void IDBObjectStoreBackendImpl::remove(PassRefPtr<IDBKey> key, PassRefPtr<IDBCal
{
SQLiteStatement query(sqliteDatabase(), "DELETE FROM ObjectStoreData " + whereClause(key->type()));
bool ok = query.prepare() == SQLResultOk;
- ASSERT(ok); // FIXME: Better error handling?
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling?
bindWhereClause(query, m_id, key.get());
if (query.step() != SQLResultDone) {
@@ -215,13 +215,13 @@ void IDBObjectStoreBackendImpl::createIndex(const String& name, const String& ke
SQLiteStatement insert(sqliteDatabase(), "INSERT INTO Indexes (objectStoreId, name, keyPath, isUnique) VALUES (?, ?, ?, ?)");
bool ok = insert.prepare() == SQLResultOk;
- ASSERT(ok); // FIXME: Better error handling.
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
insert.bindInt64(1, m_id);
insert.bindText(2, name);
insert.bindText(3, keyPath);
insert.bindInt(4, static_cast<int>(unique));
ok = insert.step() == SQLResultDone;
- ASSERT(ok); // FIXME: Better error handling.
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
int64_t id = sqliteDatabase().lastInsertRowID();
RefPtr<IDBIndexBackendInterface> index = IDBIndexBackendImpl::create(this, id, name, keyPath, unique);
@@ -244,11 +244,11 @@ void IDBObjectStoreBackendImpl::removeIndex(const String& name, PassRefPtr<IDBCa
SQLiteStatement deleteQuery(sqliteDatabase(), "DELETE FROM Indexes WHERE name = ? AND objectStoreId = ?");
bool ok = deleteQuery.prepare() == SQLResultOk;
- ASSERT(ok); // FIXME: Better error handling.
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
deleteQuery.bindText(1, name);
deleteQuery.bindInt64(2, m_id);
ok = deleteQuery.step() == SQLResultDone;
- ASSERT(ok); // FIXME: Better error handling.
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling.
m_indexes.remove(name);
callbacks->onSuccess();
@@ -261,7 +261,7 @@ void IDBObjectStoreBackendImpl::openCursor(PassRefPtr<IDBKeyRange> range, unsign
RefPtr<IDBKey> key = range->left();
SQLiteStatement query(sqliteDatabase(), "SELECT id, value FROM ObjectStoreData " + whereClause(key->type()));
bool ok = query.prepare() == SQLResultOk;
- ASSERT(ok); // FIXME: Better error handling?
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling?
bindWhereClause(query, m_id, key.get());
if (query.step() != SQLResultRow) {
@@ -278,7 +278,7 @@ void IDBObjectStoreBackendImpl::loadIndexes()
{
SQLiteStatement indexQuery(sqliteDatabase(), "SELECT id, name, keyPath, isUnique FROM Indexes WHERE objectStoreId = ?");
bool ok = indexQuery.prepare() == SQLResultOk;
- ASSERT(ok); // FIXME: Better error handling?
+ ASSERT_UNUSED(ok, ok); // FIXME: Better error handling?
indexQuery.bindInt64(1, m_id);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list