[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
hans at chromium.org
hans at chromium.org
Wed Dec 22 16:34:36 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit dccbdc6422408c86afff1469101b90c596359d42
Author: hans at chromium.org <hans at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 26 11:03:59 2010 +0000
2010-11-26 Hans Wennborg <hans at chromium.org>
Reviewed by Jeremy Orlow.
IndexedDB: Rename IDBDatabase.objectStores to objectStoreNames
https://bugs.webkit.org/show_bug.cgi?id=50102
Update layout tests to use the new name.
* storage/indexeddb/database-basics-expected.txt:
* storage/indexeddb/database-basics.html:
* storage/indexeddb/database-quota-expected.txt:
* storage/indexeddb/database-quota.html:
* storage/indexeddb/objectstore-basics-expected.txt:
* storage/indexeddb/objectstore-basics.html:
* storage/indexeddb/resources/shared.js:
(deleteAllObjectStores):
* storage/indexeddb/transaction-basics-expected.txt:
* storage/indexeddb/transaction-basics.html:
* storage/indexeddb/tutorial.html:
2010-11-26 Hans Wennborg <hans at chromium.org>
Reviewed by Jeremy Orlow.
IndexedDB: Rename IDBDatabase.objectStores to objectStoreNames
https://bugs.webkit.org/show_bug.cgi?id=50102
Rename as per the spec: http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#database-interface
* manual-tests/indexeddb-persists.html:
* storage/IDBDatabase.h:
(WebCore::IDBDatabase::objectStoreNames):
* storage/IDBDatabase.idl:
* storage/IDBDatabaseBackendImpl.cpp:
(WebCore::IDBDatabaseBackendImpl::objectStoreNames):
(WebCore::IDBDatabaseBackendImpl::setVersion):
(WebCore::IDBDatabaseBackendImpl::transaction):
* storage/IDBDatabaseBackendImpl.h:
* storage/IDBDatabaseBackendInterface.h:
2010-11-26 Hans Wennborg <hans at chromium.org>
Reviewed by Jeremy Orlow.
IndexedDB: Rename IDBDatabase.objectStores to objectStoreNames
https://bugs.webkit.org/show_bug.cgi?id=50102
Rename as per the spec: http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#database-interface
* public/WebIDBDatabase.h:
(WebKit::WebIDBDatabase::objectStores):
(WebKit::WebIDBDatabase::objectStoreNames):
* src/IDBDatabaseProxy.cpp:
(WebCore::IDBDatabaseProxy::objectStoreNames):
* src/IDBDatabaseProxy.h:
* src/WebIDBDatabaseImpl.cpp:
(WebKit::WebIDBDatabaseImpl::objectStoreNames):
* src/WebIDBDatabaseImpl.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72754 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index c03442d..a743179 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,24 @@
+2010-11-26 Hans Wennborg <hans at chromium.org>
+
+ Reviewed by Jeremy Orlow.
+
+ IndexedDB: Rename IDBDatabase.objectStores to objectStoreNames
+ https://bugs.webkit.org/show_bug.cgi?id=50102
+
+ Update layout tests to use the new name.
+
+ * storage/indexeddb/database-basics-expected.txt:
+ * storage/indexeddb/database-basics.html:
+ * storage/indexeddb/database-quota-expected.txt:
+ * storage/indexeddb/database-quota.html:
+ * storage/indexeddb/objectstore-basics-expected.txt:
+ * storage/indexeddb/objectstore-basics.html:
+ * storage/indexeddb/resources/shared.js:
+ (deleteAllObjectStores):
+ * storage/indexeddb/transaction-basics-expected.txt:
+ * storage/indexeddb/transaction-basics.html:
+ * storage/indexeddb/tutorial.html:
+
2010-11-26 Andrei Popescu <andreip at google.com>
Reviewed by Jeremy Orlow.
diff --git a/LayoutTests/storage/indexeddb/database-basics-expected.txt b/LayoutTests/storage/indexeddb/database-basics-expected.txt
index d0bbfe6..f1fa5ad 100644
--- a/LayoutTests/storage/indexeddb/database-basics-expected.txt
+++ b/LayoutTests/storage/indexeddb/database-basics-expected.txt
@@ -79,17 +79,17 @@ PASS event.target.readyState is event.target.DONE
PASS db.version is "version b"
PASS db.name is "name"
-PASS db.objectStores is []
-PASS db.objectStores.length is 0
-PASS db.objectStores.contains('') is false
-PASS db.objectStores[0] is null
-PASS db.objectStores.item(0) is null
+PASS db.objectStoreNames is []
+PASS db.objectStoreNames.length is 0
+PASS db.objectStoreNames.contains('') is false
+PASS db.objectStoreNames[0] is null
+PASS db.objectStoreNames.item(0) is null
db.createObjectStore("test123")
-PASS db.objectStores is ['test123']
-PASS db.objectStores.length is 1
-PASS db.objectStores.contains('') is false
-PASS db.objectStores.contains('test456') is false
-PASS db.objectStores.contains('test123') is true
+PASS db.objectStoreNames is ['test123']
+PASS db.objectStoreNames.length is 1
+PASS db.objectStoreNames.contains('') is false
+PASS db.objectStoreNames.contains('test456') is false
+PASS db.objectStoreNames.contains('test123') is true
db.setVersion("version c")
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
@@ -109,20 +109,20 @@ PASS event.target.readyState is event.target.DONE
PASS db.version is "version c"
PASS db.name is "name"
-PASS db.objectStores is ['test123']
-PASS db.objectStores.length is 1
-PASS db.objectStores.contains('') is false
-PASS db.objectStores.contains('test456') is false
-PASS db.objectStores.contains('test123') is true
+PASS db.objectStoreNames is ['test123']
+PASS db.objectStoreNames.length is 1
+PASS db.objectStoreNames.contains('') is false
+PASS db.objectStoreNames.contains('test456') is false
+PASS db.objectStoreNames.contains('test123') is true
db.createObjectStore("test456")
setVersionTrans = event.result
PASS setVersionTrans !== null is true
PASS db.version is "version b"
-PASS db.objectStores is ['test123']
-PASS db.objectStores.length is 1
-PASS db.objectStores.contains('') is false
-PASS db.objectStores.contains('test456') is false
-PASS db.objectStores.contains('test123') is true
+PASS db.objectStoreNames is ['test123']
+PASS db.objectStoreNames.length is 1
+PASS db.objectStoreNames.contains('') is false
+PASS db.objectStoreNames.contains('test456') is false
+PASS db.objectStoreNames.contains('test123') is true
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/storage/indexeddb/database-basics.html b/LayoutTests/storage/indexeddb/database-basics.html
index bb3256c..b070de0 100644
--- a/LayoutTests/storage/indexeddb/database-basics.html
+++ b/LayoutTests/storage/indexeddb/database-basics.html
@@ -68,11 +68,11 @@ function createObjectStore()
verifySuccessEvent(event);
shouldBeEqualToString("db.version", "version b");
shouldBeEqualToString("db.name", "name");
- shouldBe("db.objectStores", "[]");
- shouldBe("db.objectStores.length", "0");
- shouldBe("db.objectStores.contains('')", "false");
- shouldBeNull("db.objectStores[0]");
- shouldBeNull("db.objectStores.item(0)");
+ shouldBe("db.objectStoreNames", "[]");
+ shouldBe("db.objectStoreNames.length", "0");
+ shouldBe("db.objectStoreNames.contains('')", "false");
+ shouldBeNull("db.objectStoreNames[0]");
+ shouldBeNull("db.objectStoreNames.item(0)");
objectStore = evalAndLog('db.createObjectStore("test123")');
checkObjectStore();
@@ -81,11 +81,11 @@ function createObjectStore()
function checkObjectStore()
{
- shouldBe("db.objectStores", "['test123']");
- shouldBe("db.objectStores.length", "1");
- shouldBe("db.objectStores.contains('')", "false");
- shouldBe("db.objectStores.contains('test456')", "false");
- shouldBe("db.objectStores.contains('test123')", "true");
+ shouldBe("db.objectStoreNames", "['test123']");
+ shouldBe("db.objectStoreNames.length", "1");
+ shouldBe("db.objectStoreNames.contains('')", "false");
+ shouldBe("db.objectStoreNames.contains('test456')", "false");
+ shouldBe("db.objectStoreNames.contains('test123')", "true");
}
function commitAndContinue()
diff --git a/LayoutTests/storage/indexeddb/database-quota-expected.txt b/LayoutTests/storage/indexeddb/database-quota-expected.txt
index ee0c6be..3ea24d9 100644
--- a/LayoutTests/storage/indexeddb/database-quota-expected.txt
+++ b/LayoutTests/storage/indexeddb/database-quota-expected.txt
@@ -55,15 +55,15 @@ PASS event.target.readyState is event.target.DONE
PASS db.version is "new version"
PASS db.name is "name"
-PASS db.objectStores is []
-PASS db.objectStores.length is 0
-PASS db.objectStores.contains('') is false
+PASS db.objectStoreNames is []
+PASS db.objectStoreNames.length is 0
+PASS db.objectStoreNames.contains('') is false
db.createObjectStore("test123")
-PASS db.objectStores is ['test123']
-PASS db.objectStores.length is 1
-PASS db.objectStores.contains('') is false
-PASS db.objectStores.contains('test456') is false
-PASS db.objectStores.contains('test123') is true
+PASS db.objectStoreNames is ['test123']
+PASS db.objectStoreNames.length is 1
+PASS db.objectStoreNames.contains('') is false
+PASS db.objectStoreNames.contains('test456') is false
+PASS db.objectStoreNames.contains('test123') is true
trans = db.transaction()
Creating 'data' which contains 64K of data
PASS data.length is 65536
diff --git a/LayoutTests/storage/indexeddb/database-quota.html b/LayoutTests/storage/indexeddb/database-quota.html
index eb9c32e..b4207d4 100644
--- a/LayoutTests/storage/indexeddb/database-quota.html
+++ b/LayoutTests/storage/indexeddb/database-quota.html
@@ -49,9 +49,9 @@ function createNewObjectStore()
verifySuccessEvent(event);
shouldBeEqualToString("db.version", "new version");
shouldBeEqualToString("db.name", "name");
- shouldBe("db.objectStores", "[]");
- shouldBe("db.objectStores.length", "0");
- shouldBe("db.objectStores.contains('')", "false");
+ shouldBe("db.objectStoreNames", "[]");
+ shouldBe("db.objectStoreNames.length", "0");
+ shouldBe("db.objectStoreNames.contains('')", "false");
objectStore = evalAndLog('db.createObjectStore("test123")');
checkObjectStore();
@@ -60,11 +60,11 @@ function createNewObjectStore()
function checkObjectStore()
{
- shouldBe("db.objectStores", "['test123']");
- shouldBe("db.objectStores.length", "1");
- shouldBe("db.objectStores.contains('')", "false");
- shouldBe("db.objectStores.contains('test456')", "false");
- shouldBe("db.objectStores.contains('test123')", "true");
+ shouldBe("db.objectStoreNames", "['test123']");
+ shouldBe("db.objectStoreNames.length", "1");
+ shouldBe("db.objectStoreNames.contains('')", "false");
+ shouldBe("db.objectStoreNames.contains('test456')", "false");
+ shouldBe("db.objectStoreNames.contains('test123')", "true");
}
function commitAndContinue()
diff --git a/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt b/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt
index a16991a..02ca924 100644
--- a/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt
+++ b/LayoutTests/storage/indexeddb/objectstore-basics-expected.txt
@@ -45,7 +45,7 @@ PASS trans !== null is true
Deleted all object stores.
createObjectStore():
store = db.createObjectStore('storeName', null)
-storeNames = db.objectStores
+storeNames = db.objectStoreNames
PASS store.name is "storeName"
PASS store.keyPath is null
PASS storeNames.contains('storeName') is true
diff --git a/LayoutTests/storage/indexeddb/objectstore-basics.html b/LayoutTests/storage/indexeddb/objectstore-basics.html
index d53b1fc..f3e1ea9 100644
--- a/LayoutTests/storage/indexeddb/objectstore-basics.html
+++ b/LayoutTests/storage/indexeddb/objectstore-basics.html
@@ -49,7 +49,7 @@ function createObjectStore()
{
debug("createObjectStore():");
window.store = evalAndLog("store = db.createObjectStore('storeName', null)");
- var storeNames = evalAndLog("storeNames = db.objectStores");
+ var storeNames = evalAndLog("storeNames = db.objectStoreNames");
shouldBeEqualToString("store.name", "storeName");
shouldBeNull("store.keyPath");
diff --git a/LayoutTests/storage/indexeddb/resources/shared.js b/LayoutTests/storage/indexeddb/resources/shared.js
index 01ec606..71abf44 100644
--- a/LayoutTests/storage/indexeddb/resources/shared.js
+++ b/LayoutTests/storage/indexeddb/resources/shared.js
@@ -90,8 +90,8 @@ function unexpectedCompleteCallback()
// FIXME: remove the onfinished parameter.
function deleteAllObjectStores(db, onfinished)
{
- while (db.objectStores.length)
- db.removeObjectStore(db.objectStores.item(0));
+ while (db.objectStoreNames.length)
+ db.removeObjectStore(db.objectStoreNames.item(0));
debug("Deleted all object stores.");
onfinished();
diff --git a/LayoutTests/storage/indexeddb/transaction-basics-expected.txt b/LayoutTests/storage/indexeddb/transaction-basics-expected.txt
index 4a7df35..9855e60 100644
--- a/LayoutTests/storage/indexeddb/transaction-basics-expected.txt
+++ b/LayoutTests/storage/indexeddb/transaction-basics-expected.txt
@@ -37,12 +37,12 @@ PASS 'readyState' in event.target is true
PASS event.target.readyState is event.target.DONE
Deleted all object stores.
-PASS window.db.objectStores is []
-PASS window.db.objectStores.length is 0
-PASS window.db.objectStores.contains('storeFail') is false
-PASS window.db.objectStores is []
-PASS window.db.objectStores.length is 0
-PASS window.db.objectStores.contains('storeFail') is false
+PASS window.db.objectStoreNames is []
+PASS window.db.objectStoreNames.length is 0
+PASS window.db.objectStoreNames.contains('storeFail') is false
+PASS window.db.objectStoreNames is []
+PASS window.db.objectStoreNames.length is 0
+PASS window.db.objectStoreNames.contains('storeFail') is false
result = startSetVersion('version fail')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
@@ -67,9 +67,9 @@ store = db.createObjectStore('storeFail', null)
index = store.createIndex('indexFail', 'x', false)
db.removeObjectStore('storeFail')
store.removeIndex('indexFail')
-PASS window.db.objectStores is []
-PASS window.db.objectStores.length is 0
-PASS window.db.objectStores.contains('storeFail') is false
+PASS window.db.objectStoreNames is []
+PASS window.db.objectStoreNames.length is 0
+PASS window.db.objectStoreNames.contains('storeFail') is false
result = startSetVersion('version fail')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
@@ -96,9 +96,9 @@ db.removeObjectStore('storeFail')
store.removeIndex('indexFail')
store = db.createObjectStore('storeFail', null)
index = store.createIndex('indexFail', 'x', false)
-PASS window.db.objectStores is []
-PASS window.db.objectStores.length is 0
-PASS window.db.objectStores.contains('storeFail') is false
+PASS window.db.objectStoreNames is []
+PASS window.db.objectStoreNames.length is 0
+PASS window.db.objectStoreNames.contains('storeFail') is false
result = startSetVersion('version fail')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
@@ -121,9 +121,9 @@ trans = event.result
PASS trans !== null is true
store = db.createObjectStore('storeFail', null)
index = store.createIndex('indexFail', 'x', false)
-PASS db.objectStores is ['storeFail']
-PASS db.objectStores.length is 1
-PASS db.objectStores.contains('storeFail') is true
+PASS db.objectStoreNames is ['storeFail']
+PASS db.objectStoreNames.length is 1
+PASS db.objectStoreNames.contains('storeFail') is true
result = startSetVersion('version fail')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
@@ -147,9 +147,9 @@ PASS trans !== null is true
store = trans.objectStore('storeFail')
store.removeIndex('indexFail')
db.removeObjectStore('storeFail')
-PASS db.objectStores is ['storeFail']
-PASS db.objectStores.length is 1
-PASS db.objectStores.contains('storeFail') is true
+PASS db.objectStoreNames is ['storeFail']
+PASS db.objectStoreNames.length is 1
+PASS db.objectStoreNames.contains('storeFail') is true
db.setVersion('new version')
PASS 'onsuccess' in result is true
PASS 'onerror' in result is true
diff --git a/LayoutTests/storage/indexeddb/transaction-basics.html b/LayoutTests/storage/indexeddb/transaction-basics.html
index 62754d0..c68630f 100644
--- a/LayoutTests/storage/indexeddb/transaction-basics.html
+++ b/LayoutTests/storage/indexeddb/transaction-basics.html
@@ -182,16 +182,16 @@ function startSetVersion(versionName)
function checkMetadataEmpty()
{
- shouldBe("window.db.objectStores", "[]");
- shouldBe("window.db.objectStores.length", "0");
- shouldBe("window.db.objectStores.contains('storeFail')", "false");
+ shouldBe("window.db.objectStoreNames", "[]");
+ shouldBe("window.db.objectStoreNames.length", "0");
+ shouldBe("window.db.objectStoreNames.contains('storeFail')", "false");
}
function checkMetadataExistingObjectStore()
{
- shouldBe("db.objectStores", "['storeFail']");
- shouldBe("db.objectStores.length", "1");
- shouldBe("db.objectStores.contains('storeFail')", "true");
+ shouldBe("db.objectStoreNames", "['storeFail']");
+ shouldBe("db.objectStoreNames.length", "1");
+ shouldBe("db.objectStoreNames.contains('storeFail')", "true");
}
function setNewVersion()
diff --git a/LayoutTests/storage/indexeddb/tutorial.html b/LayoutTests/storage/indexeddb/tutorial.html
index 36a0856..24fe47a 100644
--- a/LayoutTests/storage/indexeddb/tutorial.html
+++ b/LayoutTests/storage/indexeddb/tutorial.html
@@ -121,8 +121,8 @@ function onSetVersion()
currentTransaction.onabort = unexpectedAbort;
// Delete existing object stores.
- while (db.objectStores.length)
- db.removeObjectStore(db.objectStores[0]);
+ while (db.objectStoreNames.length)
+ db.removeObjectStore(db.objectStoreNames[0]);
// Now that we have a blank slate, let's create an objectStore. An objectStore is simply an
// ordered mapping of keys to values. We can iterate through ranges of keys or do individual
@@ -227,9 +227,9 @@ function onSetVersionComplete()
currentTransaction.oncomplete = unexpectedComplete;
currentTransaction.onabort = onTransactionAborted;
- // Verify that "people" is the only object store in existance. The objectStores attribute is
+ // Verify that "people" is the only object store in existance. The objectStoreNames attribute is
// a DOMStringList which is somewhat like an array.
- var objectStoreList = db.objectStores;
+ var objectStoreList = db.objectStoreNames;
if (objectStoreList.length != 1
|| !objectStoreList.contains("people")
|| objectStoreList.item(0) != "people"
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5f466e9..ce915d6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2010-11-26 Hans Wennborg <hans at chromium.org>
+
+ Reviewed by Jeremy Orlow.
+
+ IndexedDB: Rename IDBDatabase.objectStores to objectStoreNames
+ https://bugs.webkit.org/show_bug.cgi?id=50102
+
+ Rename as per the spec: http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#database-interface
+
+ * manual-tests/indexeddb-persists.html:
+ * storage/IDBDatabase.h:
+ (WebCore::IDBDatabase::objectStoreNames):
+ * storage/IDBDatabase.idl:
+ * storage/IDBDatabaseBackendImpl.cpp:
+ (WebCore::IDBDatabaseBackendImpl::objectStoreNames):
+ (WebCore::IDBDatabaseBackendImpl::setVersion):
+ (WebCore::IDBDatabaseBackendImpl::transaction):
+ * storage/IDBDatabaseBackendImpl.h:
+ * storage/IDBDatabaseBackendInterface.h:
+
2010-11-26 Andrei Popescu <andreip at google.com>
Reviewed by Jeremy Orlow.
diff --git a/WebCore/manual-tests/indexeddb-persists.html b/WebCore/manual-tests/indexeddb-persists.html
index 6f5e036..d8061e1 100644
--- a/WebCore/manual-tests/indexeddb-persists.html
+++ b/WebCore/manual-tests/indexeddb-persists.html
@@ -33,8 +33,8 @@ function setData()
webkitIndexedDB.open("someDB", "some description").onsuccess = function() {
event.result.setVersion("some version").onsuccess = function() {
var db = event.source;
- while (db.objectStores.length)
- db.removeObjectStore(db.objectStores[0]);
+ while (db.objectStoreNames.length)
+ db.removeObjectStore(db.objectStoreNames[0]);
db.createObjectStore("test").put("value", "key").onsuccess = function() {
status("Value set", "green");
}
diff --git a/WebCore/storage/IDBDatabase.h b/WebCore/storage/IDBDatabase.h
index 3e33472..77fa5d0 100644
--- a/WebCore/storage/IDBDatabase.h
+++ b/WebCore/storage/IDBDatabase.h
@@ -57,7 +57,7 @@ public:
// Implement the IDL
String name() const { return m_backend->name(); }
String version() const { return m_backend->version(); }
- PassRefPtr<DOMStringList> objectStores() const { return m_backend->objectStores(); }
+ PassRefPtr<DOMStringList> objectStoreNames() const { return m_backend->objectStoreNames(); }
// FIXME: Try to modify the code generator so this is unneeded.
PassRefPtr<IDBObjectStore> createObjectStore(const String& name, ExceptionCode& ec) { return createObjectStore(name, OptionsObject(), ec); }
diff --git a/WebCore/storage/IDBDatabase.idl b/WebCore/storage/IDBDatabase.idl
index b08d459..70d00a0 100644
--- a/WebCore/storage/IDBDatabase.idl
+++ b/WebCore/storage/IDBDatabase.idl
@@ -30,7 +30,7 @@ module storage {
] IDBDatabase {
readonly attribute DOMString name;
readonly attribute DOMString version;
- readonly attribute DOMStringList objectStores;
+ readonly attribute DOMStringList objectStoreNames;
IDBObjectStore createObjectStore(in DOMString name, in [Optional] OptionsObject options)
raises (IDBDatabaseException);
diff --git a/WebCore/storage/IDBDatabaseBackendImpl.cpp b/WebCore/storage/IDBDatabaseBackendImpl.cpp
index 6f5b890..52b5b30 100644
--- a/WebCore/storage/IDBDatabaseBackendImpl.cpp
+++ b/WebCore/storage/IDBDatabaseBackendImpl.cpp
@@ -115,7 +115,7 @@ SQLiteDatabase& IDBDatabaseBackendImpl::sqliteDatabase() const
return m_sqliteDatabase->db();
}
-PassRefPtr<DOMStringList> IDBDatabaseBackendImpl::objectStores() const
+PassRefPtr<DOMStringList> IDBDatabaseBackendImpl::objectStoreNames() const
{
RefPtr<DOMStringList> objectStoreNames = DOMStringList::create();
for (ObjectStoreMap::const_iterator it = m_objectStores.begin(); it != m_objectStores.end(); ++it)
@@ -213,8 +213,8 @@ void IDBDatabaseBackendImpl::setVersion(const String& version, PassRefPtr<IDBCal
{
RefPtr<IDBDatabaseBackendImpl> database = this;
RefPtr<IDBCallbacks> callbacks = prpCallbacks;
- RefPtr<DOMStringList> objectStores = DOMStringList::create();
- RefPtr<IDBTransactionBackendInterface> transaction = IDBTransactionBackendImpl::create(objectStores.get(), IDBTransaction::VERSION_CHANGE, 0, this);
+ RefPtr<DOMStringList> objectStoreNames = DOMStringList::create();
+ RefPtr<IDBTransactionBackendInterface> transaction = IDBTransactionBackendImpl::create(objectStoreNames.get(), IDBTransaction::VERSION_CHANGE, 0, this);
if (!transaction->scheduleTask(createCallbackTask(&IDBDatabaseBackendImpl::setVersionInternal, database, version, callbacks, transaction),
createCallbackTask(&IDBDatabaseBackendImpl::resetVersion, database, m_version))) {
ec = IDBDatabaseException::NOT_ALLOWED_ERR;
@@ -234,10 +234,10 @@ void IDBDatabaseBackendImpl::setVersionInternal(ScriptExecutionContext*, PassRef
callbacks->onSuccess(transaction);
}
-PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendImpl::transaction(DOMStringList* objectStores, unsigned short mode, unsigned long timeout, ExceptionCode&)
+PassRefPtr<IDBTransactionBackendInterface> IDBDatabaseBackendImpl::transaction(DOMStringList* objectStoreNames, unsigned short mode, unsigned long timeout, ExceptionCode&)
{
// FIXME: Return not allowed err if close has been called.
- return IDBTransactionBackendImpl::create(objectStores, mode, timeout, this);
+ return IDBTransactionBackendImpl::create(objectStoreNames, mode, timeout, this);
}
void IDBDatabaseBackendImpl::close()
diff --git a/WebCore/storage/IDBDatabaseBackendImpl.h b/WebCore/storage/IDBDatabaseBackendImpl.h
index afdcd62..8b9a27b 100644
--- a/WebCore/storage/IDBDatabaseBackendImpl.h
+++ b/WebCore/storage/IDBDatabaseBackendImpl.h
@@ -56,12 +56,12 @@ public:
virtual String name() const { return m_name; }
virtual String version() const { return m_version; }
- virtual PassRefPtr<DOMStringList> objectStores() const;
+ virtual PassRefPtr<DOMStringList> objectStoreNames() const;
virtual PassRefPtr<IDBObjectStoreBackendInterface> createObjectStore(const String& name, const String& keyPath, bool autoIncrement, IDBTransactionBackendInterface*, ExceptionCode&);
virtual void removeObjectStore(const String& name, IDBTransactionBackendInterface*, ExceptionCode&);
virtual void setVersion(const String& version, PassRefPtr<IDBCallbacks>, ExceptionCode&);
- virtual PassRefPtr<IDBTransactionBackendInterface> transaction(DOMStringList* storeNames, unsigned short mode, unsigned long timeout, ExceptionCode&);
+ virtual PassRefPtr<IDBTransactionBackendInterface> transaction(DOMStringList* objectStoreNames, unsigned short mode, unsigned long timeout, ExceptionCode&);
virtual void close();
PassRefPtr<IDBObjectStoreBackendInterface> objectStore(const String& name);
diff --git a/WebCore/storage/IDBDatabaseBackendInterface.h b/WebCore/storage/IDBDatabaseBackendInterface.h
index e672a50..fa86220 100644
--- a/WebCore/storage/IDBDatabaseBackendInterface.h
+++ b/WebCore/storage/IDBDatabaseBackendInterface.h
@@ -52,7 +52,7 @@ public:
virtual String name() const = 0;
virtual String version() const = 0;
- virtual PassRefPtr<DOMStringList> objectStores() const = 0;
+ virtual PassRefPtr<DOMStringList> objectStoreNames() const = 0;
virtual PassRefPtr<IDBObjectStoreBackendInterface> createObjectStore(const String& name, const String& keyPath, bool autoIncrement, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
virtual void removeObjectStore(const String& name, IDBTransactionBackendInterface*, ExceptionCode&) = 0;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 41004e5..97c5a1b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,22 @@
+2010-11-26 Hans Wennborg <hans at chromium.org>
+
+ Reviewed by Jeremy Orlow.
+
+ IndexedDB: Rename IDBDatabase.objectStores to objectStoreNames
+ https://bugs.webkit.org/show_bug.cgi?id=50102
+
+ Rename as per the spec: http://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#database-interface
+
+ * public/WebIDBDatabase.h:
+ (WebKit::WebIDBDatabase::objectStores):
+ (WebKit::WebIDBDatabase::objectStoreNames):
+ * src/IDBDatabaseProxy.cpp:
+ (WebCore::IDBDatabaseProxy::objectStoreNames):
+ * src/IDBDatabaseProxy.h:
+ * src/WebIDBDatabaseImpl.cpp:
+ (WebKit::WebIDBDatabaseImpl::objectStoreNames):
+ * src/WebIDBDatabaseImpl.h:
+
2010-11-26 Andrei Popescu <andreip at google.com>
Reviewed by Jeremy Orlow.
diff --git a/WebKit/chromium/public/WebIDBDatabase.h b/WebKit/chromium/public/WebIDBDatabase.h
index 82472e1..8579a2e 100644
--- a/WebKit/chromium/public/WebIDBDatabase.h
+++ b/WebKit/chromium/public/WebIDBDatabase.h
@@ -57,12 +57,8 @@ public:
WEBKIT_ASSERT_NOT_REACHED();
return WebString();
}
- virtual WebDOMStringList objectStores() const
- {
- WEBKIT_ASSERT_NOT_REACHED();
- return WebDOMStringList();
- }
-
+ virtual WebDOMStringList objectStores() const { return objectStoreNames(); } // FIXME: Remove after roll.
+ virtual WebDOMStringList objectStoreNames() const { return objectStores(); } // FIXME: Assert not reached after roll.
virtual WebIDBObjectStore* createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction&, WebExceptionCode&)
{
WEBKIT_ASSERT_NOT_REACHED();
diff --git a/WebKit/chromium/src/IDBDatabaseProxy.cpp b/WebKit/chromium/src/IDBDatabaseProxy.cpp
index 4fecf1b..f8fe1fa 100644
--- a/WebKit/chromium/src/IDBDatabaseProxy.cpp
+++ b/WebKit/chromium/src/IDBDatabaseProxy.cpp
@@ -71,9 +71,9 @@ String IDBDatabaseProxy::version() const
return m_webIDBDatabase->version();
}
-PassRefPtr<DOMStringList> IDBDatabaseProxy::objectStores() const
+PassRefPtr<DOMStringList> IDBDatabaseProxy::objectStoreNames() const
{
- return m_webIDBDatabase->objectStores();
+ return m_webIDBDatabase->objectStoreNames();
}
PassRefPtr<IDBObjectStoreBackendInterface> IDBDatabaseProxy::createObjectStore(const String& name, const String& keyPath, bool autoIncrement, IDBTransactionBackendInterface* transaction, ExceptionCode& ec)
diff --git a/WebKit/chromium/src/IDBDatabaseProxy.h b/WebKit/chromium/src/IDBDatabaseProxy.h
index 5d20073..8bb4d2f 100644
--- a/WebKit/chromium/src/IDBDatabaseProxy.h
+++ b/WebKit/chromium/src/IDBDatabaseProxy.h
@@ -45,7 +45,7 @@ public:
virtual String name() const;
virtual String description() const;
virtual String version() const;
- virtual PassRefPtr<DOMStringList> objectStores() const;
+ virtual PassRefPtr<DOMStringList> objectStoreNames() const;
virtual PassRefPtr<IDBObjectStoreBackendInterface> createObjectStore(const String& name, const String& keyPath, bool autoIncrement, IDBTransactionBackendInterface*, ExceptionCode&);
virtual void removeObjectStore(const String& name, IDBTransactionBackendInterface*, ExceptionCode&);
diff --git a/WebKit/chromium/src/WebIDBDatabaseImpl.cpp b/WebKit/chromium/src/WebIDBDatabaseImpl.cpp
index 022bb52..9724752 100644
--- a/WebKit/chromium/src/WebIDBDatabaseImpl.cpp
+++ b/WebKit/chromium/src/WebIDBDatabaseImpl.cpp
@@ -59,9 +59,9 @@ WebString WebIDBDatabaseImpl::version() const
return m_databaseBackend->version();
}
-WebDOMStringList WebIDBDatabaseImpl::objectStores() const
+WebDOMStringList WebIDBDatabaseImpl::objectStoreNames() const
{
- return m_databaseBackend->objectStores();
+ return m_databaseBackend->objectStoreNames();
}
WebIDBObjectStore* WebIDBDatabaseImpl::createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction& transaction, WebExceptionCode& ec)
diff --git a/WebKit/chromium/src/WebIDBDatabaseImpl.h b/WebKit/chromium/src/WebIDBDatabaseImpl.h
index 659bb40..fb2a8be 100644
--- a/WebKit/chromium/src/WebIDBDatabaseImpl.h
+++ b/WebKit/chromium/src/WebIDBDatabaseImpl.h
@@ -47,7 +47,7 @@ public:
virtual WebString name() const;
virtual WebString version() const;
- virtual WebDOMStringList objectStores() const;
+ virtual WebDOMStringList objectStoreNames() const;
virtual WebIDBObjectStore* createObjectStore(const WebString& name, const WebString& keyPath, bool autoIncrement, const WebIDBTransaction&, WebExceptionCode&);
virtual void removeObjectStore(const WebString& name, const WebIDBTransaction&, WebExceptionCode&);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list