Index: Source/WebKit/chromium/src/IDBCallbacksProxy.cpp |
diff --git a/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp b/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp |
index d6b9764ef3cae18a7cdc9bb0570bac2f34ab407a..0683c83ca0376abee58ffe363086604c913fb111 100644 |
--- a/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp |
+++ b/Source/WebKit/chromium/src/IDBCallbacksProxy.cpp |
@@ -49,9 +49,9 @@ using namespace WebCore; |
namespace WebKit { |
-PassRefPtr<IDBCallbacksProxy> IDBCallbacksProxy::create(PassOwnPtr<WebIDBCallbacks> callbacks) |
+IDBCallbacksProxy* IDBCallbacksProxy::create(PassOwnPtr<WebIDBCallbacks> callbacks) |
{ |
- return adoptRef(new IDBCallbacksProxy(callbacks)); |
+ return new IDBCallbacksProxy(callbacks); |
} |
IDBCallbacksProxy::IDBCallbacksProxy(PassOwnPtr<WebIDBCallbacks> callbacks) |
@@ -80,11 +80,11 @@ void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBCursorBackendInterface> idbCurso |
m_callbacks->onSuccess(new WebIDBCursorImpl(idbCursorBackend), key, primaryKey, WebData(value)); |
} |
-void IDBCallbacksProxy::onSuccess(PassRefPtr<IDBDatabaseBackendInterface> backend, const IDBDatabaseMetadata& metadata) |
+void IDBCallbacksProxy::onSuccess(IDBDatabaseBackendInterface* backend, const IDBDatabaseMetadata& metadata) |
{ |
- ASSERT(m_databaseCallbacks.get()); |
+ ASSERT(m_databaseCallbacks); |
m_didComplete = true; |
- WebIDBDatabaseImpl* impl = m_didCreateProxy ? 0 : new WebIDBDatabaseImpl(backend, m_databaseCallbacks.release()); |
+ WebIDBDatabaseImpl* impl = m_didCreateProxy ? 0 : new WebIDBDatabaseImpl(backend, m_databaseCallbacks.clear()); |
m_callbacks->onSuccess(impl, metadata); |
} |
@@ -153,17 +153,22 @@ void IDBCallbacksProxy::onBlocked(int64_t existingVersion) |
m_callbacks->onBlocked(existingVersion); |
} |
-void IDBCallbacksProxy::onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBDatabaseBackendInterface> database, const IDBDatabaseMetadata& metadata) |
+void IDBCallbacksProxy::onUpgradeNeeded(int64_t oldVersion, IDBDatabaseBackendInterface* database, const IDBDatabaseMetadata& metadata) |
{ |
ASSERT(m_databaseCallbacks); |
m_didCreateProxy = true; |
m_callbacks->onUpgradeNeeded(oldVersion, new WebIDBDatabaseImpl(database, m_databaseCallbacks), metadata); |
} |
-void IDBCallbacksProxy::setDatabaseCallbacks(PassRefPtr<IDBDatabaseCallbacksProxy> databaseCallbacks) |
+void IDBCallbacksProxy::setDatabaseCallbacks(IDBDatabaseCallbacksProxy* databaseCallbacks) |
{ |
ASSERT(!m_databaseCallbacks); |
m_databaseCallbacks = databaseCallbacks; |
} |
+void IDBCallbacksProxy::trace(Visitor* visitor) |
+{ |
+ visitor->trace(m_databaseCallbacks); |
+} |
+ |
} // namespace WebKit |