Changeset 125713 in webkit
- Timestamp:
- Aug 15, 2012 2:54:50 PM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r125711 r125713 1 2012-08-15 David Grogan <dgrogan@chromium.org> 2 3 IndexedDB: Add some ASSERTs 4 https://bugs.webkit.org/show_bug.cgi?id=94055 5 6 Reviewed by Ojan Vafai. 7 8 These are just some additional ASSERTS and some ASSERT_WITH_MESSAGE in 9 place of ASSERT. They are from the patch in 10 https://bugs.webkit.org/show_bug.cgi?id=92897 11 12 No new tests - we should never hit this behavior. 13 14 * Modules/indexeddb/IDBDatabase.cpp: 15 (WebCore::IDBDatabase::setVersion): 16 (WebCore::IDBDatabase::registerFrontendCallbacks): 17 * Modules/indexeddb/IDBRequest.cpp: 18 (WebCore::IDBRequest::dispatchEvent): 19 (WebCore::IDBRequest::enqueueEvent): 20 * Modules/indexeddb/IDBTransaction.cpp: 21 (WebCore::IDBTransaction::setActive): 22 1 23 2012-08-15 Sheriff Bot <webkit.review.bot@gmail.com> 2 24 -
trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp
r123683 r125713 209 209 210 210 RefPtr<IDBVersionChangeRequest> request = IDBVersionChangeRequest::create(context, IDBAny::create(this), version); 211 ASSERT(m_backend); 211 212 m_backend->setVersion(version, request, m_databaseCallbacks, ec); 212 213 return request; … … 315 316 void IDBDatabase::registerFrontendCallbacks() 316 317 { 318 ASSERT(m_backend); 317 319 m_backend->registerFrontendCallbacks(m_databaseCallbacks); 318 320 } -
trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp
r125568 r125713 427 427 ASSERT(scriptExecutionContext()); 428 428 ASSERT(event->target() == this); 429 ASSERT_WITH_MESSAGE(m_readyState < DONE, "m_readyState < DONE(%d), was %d", DONE, m_readyState); 430 429 ASSERT_WITH_MESSAGE(m_readyState < DONE, "When dispatching event %s, m_readyState < DONE(%d), was %d", event->type().string().utf8().data(), DONE, m_readyState); 431 430 if (event->type() != eventNames().blockedEvent) 432 431 m_readyState = DONE; … … 457 456 458 457 // FIXME: When we allow custom event dispatching, this will probably need to change. 459 ASSERT (event->type() == eventNames().successEvent || event->type() == eventNames().errorEvent || event->type() == eventNames().blockedEvent);458 ASSERT_WITH_MESSAGE(event->type() == eventNames().successEvent || event->type() == eventNames().errorEvent || event->type() == eventNames().blockedEvent, "event type was %s", event->type().string().utf8().data()); 460 459 const bool setTransactionActive = m_transaction && (event->type() == eventNames().successEvent || (event->type() == eventNames().errorEvent && m_errorCode != IDBDatabaseException::IDB_ABORT_ERR)); 461 460 … … 502 501 return; 503 502 504 ASSERT (m_readyState == PENDING);503 ASSERT_WITH_MESSAGE(m_readyState == PENDING, "When queueing event %s, m_readyState was %d", event->type().string().utf8().data(), m_readyState); 505 504 506 505 EventQueue* eventQueue = scriptExecutionContext()->eventQueue(); -
trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp
r125627 r125713 183 183 void IDBTransaction::setActive(bool active) 184 184 { 185 ASSERT (m_state != Finished);185 ASSERT_WITH_MESSAGE(m_state != Finished, "A finished transaction tried to setActive(%s)", active ? "true" : "false"); 186 186 if (m_state == Finishing) 187 187 return; -
trunk/Source/WebKit/chromium/ChangeLog
r125702 r125713 1 2012-08-15 David Grogan <dgrogan@chromium.org> 2 3 IndexedDB: Add some ASSERTs 4 https://bugs.webkit.org/show_bug.cgi?id=94055 5 6 Reviewed by Ojan Vafai. 7 8 * src/IDBDatabaseBackendProxy.cpp: 9 (WebKit::IDBDatabaseBackendProxy::setVersion): 10 1 11 2012-08-15 Ian Vollick <vollick@chromium.org> 2 12 -
trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp
r122172 r125713 88 88 void IDBDatabaseBackendProxy::setVersion(const String& version, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<IDBDatabaseCallbacks> databaseCallbacks, ExceptionCode& ec) 89 89 { 90 ASSERT(m_webIDBDatabase); 90 91 m_webIDBDatabase->setVersion(version, new WebIDBCallbacksImpl(callbacks), ec); 91 92 }
Note: See TracChangeset
for help on using the changeset viewer.