diff options
author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp | |
parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp')
-rw-r--r-- | Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp b/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp index bb7a19b..38ac360 100644 --- a/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp +++ b/Source/WebKit/chromium/src/WebIDBCallbacksImpl.cpp @@ -32,14 +32,12 @@ #include "IDBDatabaseProxy.h" #include "IDBIndexBackendProxy.h" #include "IDBKey.h" -#include "IDBObjectStoreProxy.h" #include "IDBTransactionBackendProxy.h" #include "WebIDBCallbacks.h" #include "WebIDBDatabase.h" #include "WebIDBDatabaseError.h" #include "WebIDBIndex.h" #include "WebIDBKey.h" -#include "WebIDBObjectStore.h" #include "WebIDBTransaction.h" #include "WebSerializedScriptValue.h" @@ -81,11 +79,6 @@ void WebIDBCallbacksImpl::onSuccess(WebKit::WebIDBIndex* webKitInstance) m_callbacks->onSuccess(IDBIndexBackendProxy::create(webKitInstance)); } -void WebIDBCallbacksImpl::onSuccess(WebKit::WebIDBObjectStore* webKitInstance) -{ - m_callbacks->onSuccess(IDBObjectStoreProxy::create(webKitInstance)); -} - void WebIDBCallbacksImpl::onSuccess(WebKit::WebIDBTransaction* webKitInstance) { m_callbacks->onSuccess(IDBTransactionBackendProxy::create(webKitInstance)); @@ -96,6 +89,11 @@ void WebIDBCallbacksImpl::onSuccess(const WebKit::WebSerializedScriptValue& seri m_callbacks->onSuccess(serializedScriptValue); } +void WebIDBCallbacksImpl::onBlocked() +{ + m_callbacks->onBlocked(); +} + } // namespace WebCore #endif // ENABLE(INDEXED_DATABASE) |