Changeset 125713 in webkit


Ignore:
Timestamp:
Aug 15, 2012 2:54:50 PM (12 years ago)
Author:
dgrogan@chromium.org
Message:

IndexedDB: Add some ASSERTs
https://bugs.webkit.org/show_bug.cgi?id=94055

Reviewed by Ojan Vafai.

Source/WebCore:

These are just some additional ASSERTS and some ASSERT_WITH_MESSAGE in
place of ASSERT. They are from the patch in
https://bugs.webkit.org/show_bug.cgi?id=92897

No new tests - we should never hit this behavior.

  • Modules/indexeddb/IDBDatabase.cpp:

(WebCore::IDBDatabase::setVersion):
(WebCore::IDBDatabase::registerFrontendCallbacks):

  • Modules/indexeddb/IDBRequest.cpp:

(WebCore::IDBRequest::dispatchEvent):
(WebCore::IDBRequest::enqueueEvent):

  • Modules/indexeddb/IDBTransaction.cpp:

(WebCore::IDBTransaction::setActive):

Source/WebKit/chromium:

  • src/IDBDatabaseBackendProxy.cpp:

(WebKit::IDBDatabaseBackendProxy::setVersion):

Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r125711 r125713  
     12012-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
    1232012-08-15  Sheriff Bot  <webkit.review.bot@gmail.com>
    224
  • trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp

    r123683 r125713  
    209209
    210210    RefPtr<IDBVersionChangeRequest> request = IDBVersionChangeRequest::create(context, IDBAny::create(this), version);
     211    ASSERT(m_backend);
    211212    m_backend->setVersion(version, request, m_databaseCallbacks, ec);
    212213    return request;
     
    315316void IDBDatabase::registerFrontendCallbacks()
    316317{
     318    ASSERT(m_backend);
    317319    m_backend->registerFrontendCallbacks(m_databaseCallbacks);
    318320}
  • trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp

    r125568 r125713  
    427427    ASSERT(scriptExecutionContext());
    428428    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);
    431430    if (event->type() != eventNames().blockedEvent)
    432431        m_readyState = DONE;
     
    457456
    458457    // 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());
    460459    const bool setTransactionActive = m_transaction && (event->type() == eventNames().successEvent || (event->type() == eventNames().errorEvent && m_errorCode != IDBDatabaseException::IDB_ABORT_ERR));
    461460
     
    502501        return;
    503502
    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);
    505504
    506505    EventQueue* eventQueue = scriptExecutionContext()->eventQueue();
  • trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp

    r125627 r125713  
    183183void IDBTransaction::setActive(bool active)
    184184{
    185     ASSERT(m_state != Finished);
     185    ASSERT_WITH_MESSAGE(m_state != Finished, "A finished transaction tried to setActive(%s)", active ? "true" : "false");
    186186    if (m_state == Finishing)
    187187        return;
  • trunk/Source/WebKit/chromium/ChangeLog

    r125702 r125713  
     12012-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
    1112012-08-15  Ian Vollick  <vollick@chromium.org>
    212
  • trunk/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp

    r122172 r125713  
    8888void IDBDatabaseBackendProxy::setVersion(const String& version, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<IDBDatabaseCallbacks> databaseCallbacks, ExceptionCode& ec)
    8989{
     90    ASSERT(m_webIDBDatabase);
    9091    m_webIDBDatabase->setVersion(version, new WebIDBCallbacksImpl(callbacks), ec);
    9192}
Note: See TracChangeset for help on using the changeset viewer.