diff options
Diffstat (limited to 'Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp b/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp index 0d142bc02..52879a9a7 100644 --- a/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp +++ b/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp @@ -45,8 +45,9 @@ using namespace WebCore; namespace WebKit { -WebIDBDatabaseImpl::WebIDBDatabaseImpl(PassRefPtr<IDBDatabaseBackendInterface> databaseBackend) +WebIDBDatabaseImpl::WebIDBDatabaseImpl(PassRefPtr<IDBDatabaseBackendInterface> databaseBackend, WTF::PassRefPtr<IDBDatabaseCallbacksProxy> databaseCallbacks) : m_databaseBackend(databaseBackend) + , m_databaseCallbacks(databaseCallbacks) , m_closePending(false) { } @@ -93,7 +94,7 @@ WebIDBTransaction* WebIDBDatabaseImpl::transaction(const WebDOMStringList& names void WebIDBDatabaseImpl::close() { - // Use the callbacks that ::open gave us so that the backend in + // Use the callbacks passed in to the constructor so that the backend in // multi-process chromium knows which database connection is closing. if (!m_databaseCallbacks) { m_closePending = true; @@ -113,15 +114,6 @@ void WebIDBDatabaseImpl::forceClose() callbacks->onForcedClose(); } -void WebIDBDatabaseImpl::open(WebIDBDatabaseCallbacks* callbacks) -{ - ASSERT(!m_databaseCallbacks); - m_databaseCallbacks = IDBDatabaseCallbacksProxy::create(adoptPtr(callbacks)); - m_databaseBackend->registerFrontendCallbacks(m_databaseCallbacks); - if (m_closePending) - close(); -} - } // namespace WebKit #endif // ENABLE(INDEXED_DATABASE) |