Changeset 117338 in webkit
- Timestamp:
- May 16, 2012 2:02:21 PM (12 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r117336 r117338 1 2012-05-16 Joshua Bell <jsbell@chromium.org> 2 3 IndexedDB: Rename valid/finished methods to isValid/isFinished to match coding standard 4 https://bugs.webkit.org/show_bug.cgi?id=86655 5 6 Reviewed by Tony Chang. 7 8 No new tests - no functional changes. 9 10 * Modules/indexeddb/IDBKey.h: 11 (WebCore::IDBKey::isValid): valid() => isValid() 12 * Modules/indexeddb/IDBObjectStore.cpp: 13 (WebCore::IDBObjectStore::deleteFunction): 14 (WebCore::IDBObjectStore::index): 15 (WebCore::IDBObjectStore::transactionFinished): 16 * Modules/indexeddb/IDBObjectStoreBackendImpl.cpp: 17 (WebCore::IDBObjectStoreBackendImpl::put): 18 (WebCore::IDBObjectStoreBackendImpl::putInternal): 19 (WebCore::IDBObjectStoreBackendImpl::deleteFunction): 20 * Modules/indexeddb/IDBRequest.cpp: 21 (WebCore::IDBRequest::onSuccess): 22 * Modules/indexeddb/IDBTransaction.cpp: 23 (WebCore::IDBTransaction::isFinished): finished() => isFinished() 24 * Modules/indexeddb/IDBTransaction.h: 25 * inspector/InspectorIndexedDBAgent.cpp: 26 (WebCore): 27 1 28 2012-05-16 Jeffrey Pfau <jpfau@apple.com> 2 29 -
trunk/Source/WebCore/Modules/indexeddb/IDBKey.h
r109493 r117338 99 99 100 100 Type type() const { return m_type; } 101 bool valid() const { return m_type != InvalidType; }101 bool isValid() const { return m_type != InvalidType; } 102 102 103 103 const KeyArray& array() const -
trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp
r116337 r117338 178 178 { 179 179 IDB_TRACE("IDBObjectStore::delete"); 180 if (!key || !key-> valid()) {180 if (!key || !key->isValid()) { 181 181 ec = IDBDatabaseException::DATA_ERR; 182 182 return 0; … … 232 232 { 233 233 IDB_TRACE("IDBObjectStore::index"); 234 if (m_transaction-> finished()) {234 if (m_transaction->isFinished()) { 235 235 ec = IDBDatabaseException::NOT_ALLOWED_ERR; 236 236 return 0; … … 325 325 void IDBObjectStore::transactionFinished() 326 326 { 327 ASSERT(m_transaction-> finished());327 ASSERT(m_transaction->isFinished()); 328 328 329 329 // Break reference cycles. -
trunk/Source/WebCore/Modules/indexeddb/IDBObjectStoreBackendImpl.cpp
r117334 r117338 185 185 if (hasKeyPath) { 186 186 RefPtr<IDBKey> keyPathKey = fetchKeyFromKeyPath(value.get(), objectStore->m_keyPath); 187 if (keyPathKey && !keyPathKey-> valid()) {187 if (keyPathKey && !keyPathKey->isValid()) { 188 188 ec = IDBDatabaseException::DATA_ERR; 189 189 return; … … 202 202 } 203 203 } 204 if (key && !key-> valid()) {204 if (key && !key->isValid()) { 205 205 ec = IDBDatabaseException::DATA_ERR; 206 206 return; … … 209 209 const RefPtr<IDBIndexBackendImpl>& index = it->second; 210 210 RefPtr<IDBKey> indexKey = fetchKeyFromKeyPath(value.get(), index->keyPath()); 211 if (indexKey && !indexKey-> valid()) {211 if (indexKey && !indexKey->isValid()) { 212 212 ec = IDBDatabaseException::DATA_ERR; 213 213 return; … … 256 256 if (!key) { 257 257 RefPtr<IDBKey> autoIncKey = objectStore->genAutoIncrementKey(); 258 if (!autoIncKey-> valid()) {258 if (!autoIncKey->isValid()) { 259 259 callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::DATA_ERR, "Maximum key generator value reached.")); 260 260 return; … … 280 280 } 281 281 282 ASSERT(key && key-> valid());282 ASSERT(key && key->isValid()); 283 283 284 284 RefPtr<IDBBackingStore::ObjectStoreRecordIdentifier> recordIdentifier = objectStore->backingStore()->createInvalidRecordIdentifier(); … … 298 298 continue; 299 299 } 300 ASSERT(indexKey-> valid());300 ASSERT(indexKey->isValid()); 301 301 302 302 if ((!index->multiEntry() || indexKey->type() != IDBKey::ArrayType) && !index->addingKeyAllowed(indexKey.get(), key.get())) { … … 373 373 IDB_TRACE("IDBObjectStoreBackendImpl::delete"); 374 374 RefPtr<IDBKey> key = prpKey; 375 if (!key || !key-> valid()) {375 if (!key || !key->isValid()) { 376 376 ec = IDBDatabaseException::DATA_ERR; 377 377 return; -
trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp
r116337 r117338 252 252 IDB_TRACE("IDBRequest::onSuccess(IDBKey)"); 253 253 ASSERT(!m_errorCode && m_errorMessage.isNull() && !m_result); 254 if (idbKey && idbKey-> valid())254 if (idbKey && idbKey->isValid()) 255 255 m_result = IDBAny::create(idbKey); 256 256 else -
trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp
r116337 r117338 101 101 } 102 102 103 bool IDBTransaction:: finished() const103 bool IDBTransaction::isFinished() const 104 104 { 105 105 return m_transactionFinished; -
trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.h
r116337 r117338 67 67 68 68 IDBTransactionBackendInterface* backend() const; 69 bool finished() const;69 bool isFinished() const; 70 70 71 71 const String& mode() const; -
trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
r114373 r117338 362 362 static PassRefPtr<Key> keyFromIDBKey(IDBKey* idbKey) 363 363 { 364 if (!idbKey || !idbKey-> valid())364 if (!idbKey || !idbKey->isValid()) 365 365 return 0; 366 366
Note: See TracChangeset
for help on using the changeset viewer.