Chromium Code Reviews| Index: Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp |
| diff --git a/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp b/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp |
| index 862204f21fdfd3df618adb75405914d31968a8cb..e7c19ae75ad7b31bf69d377de02815c77cd86644 100644 |
| --- a/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp |
| +++ b/Source/WebKit/chromium/src/WebIDBDatabaseImpl.cpp |
| @@ -45,7 +45,7 @@ using namespace WebCore; |
| namespace WebKit { |
| -WebIDBDatabaseImpl::WebIDBDatabaseImpl(PassRefPtr<IDBDatabaseBackendInterface> databaseBackend, WTF::PassRefPtr<IDBDatabaseCallbacksProxy> databaseCallbacks) |
| +WebIDBDatabaseImpl::WebIDBDatabaseImpl(IDBDatabaseBackendInterface* databaseBackend, IDBDatabaseCallbacksProxy* databaseCallbacks) |
| : m_databaseBackend(databaseBackend) |
| , m_databaseCallbacks(databaseCallbacks) |
| { |
| @@ -71,8 +71,8 @@ void WebIDBDatabaseImpl::createTransaction(long long id, WebIDBDatabaseCallbacks |
| Vector<int64_t> objectStoreIdList(objectStoreIds.size()); |
| for (size_t i = 0; i < objectStoreIds.size(); ++i) |
| objectStoreIdList[i] = objectStoreIds[i]; |
| - RefPtr<IDBDatabaseCallbacksProxy> databaseCallbacksProxy = IDBDatabaseCallbacksProxy::create(adoptPtr(callbacks)); |
| - m_databaseBackend->createTransaction(id, databaseCallbacksProxy.get(), objectStoreIdList, mode); |
| + IDBDatabaseCallbacksProxy* databaseCallbacksProxy = IDBDatabaseCallbacksProxy::create(adoptPtr(callbacks)); |
| + m_databaseBackend->createTransaction(id, databaseCallbacksProxy, objectStoreIdList, mode); |
| } |
| void WebIDBDatabaseImpl::close() |
| @@ -81,14 +81,14 @@ void WebIDBDatabaseImpl::close() |
| // multi-process chromium knows which database connection is closing. |
| if (!m_databaseCallbacks) |
| return; |
| - m_databaseBackend->close(m_databaseCallbacks.release()); |
| + m_databaseBackend->close(m_databaseCallbacks.clear()); |
| } |
| void WebIDBDatabaseImpl::forceClose() |
| { |
| if (!m_databaseCallbacks) |
| return; |
| - RefPtr<IDBDatabaseCallbacksProxy> callbacks = m_databaseCallbacks.release(); |
| + IDBDatabaseCallbacksProxy* callbacks = m_databaseCallbacks; |
|
Mads Ager (chromium)
2013/11/28 10:24:46
Shouldn't this be m_databaseCallbacks.clear()?
haraken
2013/12/02 09:13:27
Nice catch. Done.
|
| m_databaseBackend->close(callbacks); |
| callbacks->onForcedClose(); |
| } |