Index: Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp |
diff --git a/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp b/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp |
index 3669d50e7701983de0bc2b4cd2f7883d7aa6e8bd..d84819ad6cbcfc98a0d751e82c74c8e6b8db2504 100644 |
--- a/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp |
+++ b/Source/WebKit/chromium/src/IDBDatabaseBackendProxy.cpp |
@@ -43,9 +43,9 @@ using namespace WebCore; |
namespace WebKit { |
-PassRefPtr<IDBDatabaseBackendInterface> IDBDatabaseBackendProxy::create(PassOwnPtr<WebIDBDatabase> database) |
+IDBDatabaseBackendInterface* IDBDatabaseBackendProxy::create(PassOwnPtr<WebIDBDatabase> database) |
{ |
- return adoptRef(new IDBDatabaseBackendProxy(database)); |
+ return new IDBDatabaseBackendProxy(database); |
} |
IDBDatabaseBackendProxy::IDBDatabaseBackendProxy(PassOwnPtr<WebIDBDatabase> database) |
@@ -69,7 +69,7 @@ void IDBDatabaseBackendProxy::deleteObjectStore(int64_t transactionId, int64_t o |
m_webIDBDatabase->deleteObjectStore(transactionId, objectStoreId); |
} |
-void IDBDatabaseBackendProxy::createTransaction(int64_t id, PassRefPtr<IDBDatabaseCallbacks> callbacks, const Vector<int64_t>& objectStoreIds, unsigned short mode) |
+void IDBDatabaseBackendProxy::createTransaction(int64_t id, IDBDatabaseCallbacks* callbacks, const Vector<int64_t>& objectStoreIds, unsigned short mode) |
{ |
m_webIDBDatabase->createTransaction(id, new WebIDBDatabaseCallbacksImpl(callbacks), objectStoreIds, mode); |
} |
@@ -89,24 +89,24 @@ void IDBDatabaseBackendProxy::abort(int64_t transactionId, PassRefPtr<IDBDatabas |
m_webIDBDatabase->abort(transactionId, error); |
} |
-void IDBDatabaseBackendProxy::openCursor(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange> keyRange, IndexedDB::CursorDirection direction, bool keyOnly, TaskType taskType, PassRefPtr<IDBCallbacks> callbacks) |
+void IDBDatabaseBackendProxy::openCursor(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange> keyRange, IndexedDB::CursorDirection direction, bool keyOnly, TaskType taskType, IDBCallbacks* callbacks) |
{ |
m_webIDBDatabase->openCursor(transactionId, objectStoreId, indexId, keyRange, static_cast<WebIDBCursor::Direction>(direction), keyOnly, static_cast<WebIDBDatabase::TaskType>(taskType), new WebIDBCallbacksImpl(callbacks)); |
} |
-void IDBDatabaseBackendProxy::count(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange> keyRange, PassRefPtr<IDBCallbacks> callbacks) |
+void IDBDatabaseBackendProxy::count(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange> keyRange, IDBCallbacks* callbacks) |
{ |
if (m_webIDBDatabase) |
m_webIDBDatabase->count(transactionId, objectStoreId, indexId, keyRange, new WebIDBCallbacksImpl(callbacks)); |
} |
-void IDBDatabaseBackendProxy::get(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange> keyRange, bool keyOnly, PassRefPtr<IDBCallbacks> callbacks) |
+void IDBDatabaseBackendProxy::get(int64_t transactionId, int64_t objectStoreId, int64_t indexId, PassRefPtr<IDBKeyRange> keyRange, bool keyOnly, IDBCallbacks* callbacks) |
{ |
if (m_webIDBDatabase) |
m_webIDBDatabase->get(transactionId, objectStoreId, indexId, keyRange, keyOnly, new WebIDBCallbacksImpl(callbacks)); |
} |
-void IDBDatabaseBackendProxy::put(int64_t transactionId, int64_t objectStoreId, PassRefPtr<SharedBuffer> value, PassRefPtr<IDBKey> key, PutMode putMode, PassRefPtr<IDBCallbacks> callbacks, const Vector<int64_t>& indexIds, const Vector<IndexKeys>& indexKeys) |
+void IDBDatabaseBackendProxy::put(int64_t transactionId, int64_t objectStoreId, PassRefPtr<SharedBuffer> value, PassRefPtr<IDBKey> key, PutMode putMode, IDBCallbacks* callbacks, const Vector<int64_t>& indexIds, const Vector<IndexKeys>& indexKeys) |
{ |
if (m_webIDBDatabase) { |
m_webIDBDatabase->put(transactionId, objectStoreId, WebData(value), key, static_cast<WebIDBDatabase::PutMode>(putMode), new WebIDBCallbacksImpl(callbacks), indexIds, indexKeys); |
@@ -125,13 +125,13 @@ void IDBDatabaseBackendProxy::setIndexesReady(int64_t transactionId, int64_t obj |
m_webIDBDatabase->setIndexesReady(transactionId, objectStoreId, indexIds); |
} |
-void IDBDatabaseBackendProxy::deleteRange(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBKeyRange> keyRange, PassRefPtr<IDBCallbacks> callbacks) |
+void IDBDatabaseBackendProxy::deleteRange(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBKeyRange> keyRange, IDBCallbacks* callbacks) |
{ |
if (m_webIDBDatabase) |
m_webIDBDatabase->deleteRange(transactionId, objectStoreId, keyRange, new WebIDBCallbacksImpl(callbacks)); |
} |
-void IDBDatabaseBackendProxy::clear(int64_t transactionId, int64_t objectStoreId, PassRefPtr<IDBCallbacks> callbacks) |
+void IDBDatabaseBackendProxy::clear(int64_t transactionId, int64_t objectStoreId, IDBCallbacks* callbacks) |
{ |
if (m_webIDBDatabase) |
m_webIDBDatabase->clear(transactionId, objectStoreId, new WebIDBCallbacksImpl(callbacks)); |
@@ -149,7 +149,7 @@ void IDBDatabaseBackendProxy::deleteIndex(int64_t transactionId, int64_t objectS |
m_webIDBDatabase->deleteIndex(transactionId, objectStoreId, indexId); |
} |
-void IDBDatabaseBackendProxy::close(PassRefPtr<IDBDatabaseCallbacks>) |
+void IDBDatabaseBackendProxy::close(IDBDatabaseCallbacks*) |
{ |
m_webIDBDatabase->close(); |
} |