Changeset 117338 in webkit

Timestamp:

May 16, 2012 2:02:21 PM (12 years ago)

Author:

jsbell@chromium.org

Message:

IndexedDB: Rename valid/finished methods to isValid/isFinished to match coding standard
​https://bugs.webkit.org/show_bug.cgi?id=86655

Reviewed by Tony Chang.

No new tests - no functional changes.

• Modules/indexeddb/IDBKey.h:

(WebCore::IDBKey::isValid): valid() => isValid()

• Modules/indexeddb/IDBObjectStore.cpp:

(WebCore::IDBObjectStore::deleteFunction):
(WebCore::IDBObjectStore::index):
(WebCore::IDBObjectStore::transactionFinished):

• Modules/indexeddb/IDBObjectStoreBackendImpl.cpp:

(WebCore::IDBObjectStoreBackendImpl::put):
(WebCore::IDBObjectStoreBackendImpl::putInternal):
(WebCore::IDBObjectStoreBackendImpl::deleteFunction):

• Modules/indexeddb/IDBRequest.cpp:

(WebCore::IDBRequest::onSuccess):

• Modules/indexeddb/IDBTransaction.cpp:

(WebCore::IDBTransaction::isFinished): finished() => isFinished()

• Modules/indexeddb/IDBTransaction.h:
• inspector/InspectorIndexedDBAgent.cpp:

(WebCore):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/indexeddb/IDBKey.h (modified) (1 diff)
• Modules/indexeddb/IDBObjectStore.cpp (modified) (3 diffs)
• Modules/indexeddb/IDBObjectStoreBackendImpl.cpp (modified) (7 diffs)
• Modules/indexeddb/IDBRequest.cpp (modified) (1 diff)
• Modules/indexeddb/IDBTransaction.cpp (modified) (1 diff)
• Modules/indexeddb/IDBTransaction.h (modified) (1 diff)
• inspector/InspectorIndexedDBAgent.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-16  Joshua Bell  <jsbell@chromium.org>
+
+        IndexedDB: Rename valid/finished methods to isValid/isFinished to match coding standard
+        https://bugs.webkit.org/show_bug.cgi?id=86655
+
+        Reviewed by Tony Chang.
+
+        No new tests - no functional changes.
+
+        * Modules/indexeddb/IDBKey.h:
+        (WebCore::IDBKey::isValid): valid() => isValid()
+        * Modules/indexeddb/IDBObjectStore.cpp:
+        (WebCore::IDBObjectStore::deleteFunction):
+        (WebCore::IDBObjectStore::index):
+        (WebCore::IDBObjectStore::transactionFinished):
+        * Modules/indexeddb/IDBObjectStoreBackendImpl.cpp:
+        (WebCore::IDBObjectStoreBackendImpl::put):
+        (WebCore::IDBObjectStoreBackendImpl::putInternal):
+        (WebCore::IDBObjectStoreBackendImpl::deleteFunction):
+        * Modules/indexeddb/IDBRequest.cpp:
+        (WebCore::IDBRequest::onSuccess):
+        * Modules/indexeddb/IDBTransaction.cpp:
+        (WebCore::IDBTransaction::isFinished): finished() => isFinished()
+        * Modules/indexeddb/IDBTransaction.h:
+        * inspector/InspectorIndexedDBAgent.cpp:
+        (WebCore):
+
 2012-05-16  Jeffrey Pfau  <jpfau@apple.com>
 

trunk/Source/WebCore/Modules/indexeddb/IDBKey.h

@@ -99 +99 @@
 
     Type type() const { return m_type; }
-    bool valid() const { return m_type != InvalidType; }
+    bool isValid() const { return m_type != InvalidType; }
 
     const KeyArray& array() const

trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp

@@ -178 +178 @@
 {
     IDB_TRACE("IDBObjectStore::delete");
-    if (!key || !key->valid()) {
+    if (!key || !key->isValid()) {
         ec = IDBDatabaseException::DATA_ERR;
         return 0;
@@ -232 +232 @@
 {
     IDB_TRACE("IDBObjectStore::index");
-    if (m_transaction->finished()) {
+    if (m_transaction->isFinished()) {
         ec = IDBDatabaseException::NOT_ALLOWED_ERR;
         return 0;
@@ -325 +325 @@
 void IDBObjectStore::transactionFinished()
 {
-    ASSERT(m_transaction->finished());
+    ASSERT(m_transaction->isFinished());
 
     // Break reference cycles.

trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.cpp

@@ -185 +185 @@
         if (hasKeyPath) {
             RefPtr<IDBKey> keyPathKey = fetchKeyFromKeyPath(value.get(), objectStore->m_keyPath);
-            if (keyPathKey && !keyPathKey->valid()) {
+            if (keyPathKey && !keyPathKey->isValid()) {
                 ec = IDBDatabaseException::DATA_ERR;
                 return;
@@ -202 +202 @@
             }
         }
-        if (key && !key->valid()) {
+        if (key && !key->isValid()) {
             ec = IDBDatabaseException::DATA_ERR;
             return;
@@ -209 +209 @@
             const RefPtr<IDBIndexBackendImpl>& index = it->second;
             RefPtr<IDBKey> indexKey = fetchKeyFromKeyPath(value.get(), index->keyPath());
-            if (indexKey && !indexKey->valid()) {
+            if (indexKey && !indexKey->isValid()) {
                 ec = IDBDatabaseException::DATA_ERR;
                 return;
@@ -256 +256 @@
             if (!key) {
                 RefPtr<IDBKey> autoIncKey = objectStore->genAutoIncrementKey();
-                if (!autoIncKey->valid()) {
+                if (!autoIncKey->isValid()) {
                     callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::DATA_ERR, "Maximum key generator value reached."));
                     return;
@@ -280 +280 @@
     }
 
-    ASSERT(key && key->valid());
+    ASSERT(key && key->isValid());
 
     RefPtr<IDBBackingStore::ObjectStoreRecordIdentifier> recordIdentifier = objectStore->backingStore()->createInvalidRecordIdentifier();
@@ -298 +298 @@
             continue;
         }
-        ASSERT(indexKey->valid());
+        ASSERT(indexKey->isValid());
 
         if ((!index->multiEntry() || indexKey->type() != IDBKey::ArrayType) && !index->addingKeyAllowed(indexKey.get(), key.get())) {
@@ -373 +373 @@
     IDB_TRACE("IDBObjectStoreBackendImpl::delete");
     RefPtr<IDBKey> key = prpKey;
-    if (!key || !key->valid()) {
+    if (!key || !key->isValid()) {
         ec = IDBDatabaseException::DATA_ERR;
         return;

trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp

@@ -252 +252 @@
     IDB_TRACE("IDBRequest::onSuccess(IDBKey)");
     ASSERT(!m_errorCode && m_errorMessage.isNull() && !m_result);
-    if (idbKey && idbKey->valid())
+    if (idbKey && idbKey->isValid())
         m_result = IDBAny::create(idbKey);
     else

trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp

@@ -101 +101 @@
 }
 
-bool IDBTransaction::finished() const
+bool IDBTransaction::isFinished() const
 {
     return m_transactionFinished;

trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h

@@ -67 +67 @@
 
     IDBTransactionBackendInterface* backend() const;
-    bool finished() const;
+    bool isFinished() const;
 
     const String& mode() const;

trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp

@@ -362 +362 @@
 static PassRefPtr<Key> keyFromIDBKey(IDBKey* idbKey)
 {
-    if (!idbKey || !idbKey->valid())
+    if (!idbKey || !idbKey->isValid())
         return 0;