| Index: third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
|
| diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
|
| index 219475a474c4c6a3b5576f525f91ce6b5cc68b3b..8253f815bd78f435394d5d1d2af95b438b6f3af7 100644
|
| --- a/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
|
| +++ b/third_party/WebKit/Source/modules/indexeddb/IDBObjectStore.cpp
|
| @@ -39,7 +39,6 @@
|
| #include "modules/indexeddb/IDBDatabase.h"
|
| #include "modules/indexeddb/IDBKeyPath.h"
|
| #include "modules/indexeddb/IDBTracing.h"
|
| -#include "modules/indexeddb/WebIDBCallbacksImpl.h"
|
| #include "platform/SharedBuffer.h"
|
| #include "public/platform/WebBlobInfo.h"
|
| #include "public/platform/WebData.h"
|
| @@ -169,7 +168,7 @@ IDBRequest* IDBObjectStore::get(ScriptState* scriptState,
|
| m_transaction.get());
|
| backendDB()->get(m_transaction->id(), id(), IDBIndexMetadata::InvalidId,
|
| keyRange, false /* keyOnly */,
|
| - WebIDBCallbacksImpl::create(request).release());
|
| + request->createWebCallbacks().release());
|
| return request;
|
| }
|
|
|
| @@ -211,7 +210,7 @@ IDBRequest* IDBObjectStore::getKey(ScriptState* scriptState,
|
| m_transaction.get());
|
| backendDB()->get(m_transaction->id(), id(), IDBIndexMetadata::InvalidId,
|
| keyRange, true /* keyOnly */,
|
| - WebIDBCallbacksImpl::create(request).release());
|
| + request->createWebCallbacks().release());
|
| return request;
|
| }
|
|
|
| @@ -259,7 +258,7 @@ IDBRequest* IDBObjectStore::getAll(ScriptState* scriptState,
|
| m_transaction.get());
|
| backendDB()->getAll(m_transaction->id(), id(), IDBIndexMetadata::InvalidId,
|
| range, maxCount, false,
|
| - WebIDBCallbacksImpl::create(request).release());
|
| + request->createWebCallbacks().release());
|
| return request;
|
| }
|
|
|
| @@ -307,7 +306,7 @@ IDBRequest* IDBObjectStore::getAllKeys(ScriptState* scriptState,
|
| m_transaction.get());
|
| backendDB()->getAll(m_transaction->id(), id(), IDBIndexMetadata::InvalidId,
|
| range, maxCount, true,
|
| - WebIDBCallbacksImpl::create(request).release());
|
| + request->createWebCallbacks().release());
|
| return request;
|
| }
|
|
|
| @@ -515,7 +514,7 @@ IDBRequest* IDBObjectStore::put(ScriptState* scriptState,
|
|
|
| backendDB()->put(m_transaction->id(), id(), WebData(valueBuffer), blobInfo,
|
| key, static_cast<WebIDBPutMode>(putMode),
|
| - WebIDBCallbacksImpl::create(request).release(), indexIds,
|
| + request->createWebCallbacks().release(), indexIds,
|
| indexKeys);
|
| return request;
|
| }
|
| @@ -563,7 +562,7 @@ IDBRequest* IDBObjectStore::deleteFunction(ScriptState* scriptState,
|
| IDBRequest* request = IDBRequest::create(scriptState, IDBAny::create(this),
|
| m_transaction.get());
|
| backendDB()->deleteRange(m_transaction->id(), id(), keyRange,
|
| - WebIDBCallbacksImpl::create(request).release());
|
| + request->createWebCallbacks().release());
|
| return request;
|
| }
|
|
|
| @@ -599,7 +598,7 @@ IDBRequest* IDBObjectStore::clear(ScriptState* scriptState,
|
| IDBRequest* request = IDBRequest::create(scriptState, IDBAny::create(this),
|
| m_transaction.get());
|
| backendDB()->clear(m_transaction->id(), id(),
|
| - WebIDBCallbacksImpl::create(request).release());
|
| + request->createWebCallbacks().release());
|
| return request;
|
| }
|
|
|
| @@ -900,9 +899,9 @@ IDBRequest* IDBObjectStore::openCursor(ScriptState* scriptState,
|
| m_transaction.get());
|
| request->setCursorDetails(IndexedDB::CursorKeyAndValue, direction);
|
|
|
| - backendDB()->openCursor(
|
| - m_transaction->id(), id(), IDBIndexMetadata::InvalidId, range, direction,
|
| - false, taskType, WebIDBCallbacksImpl::create(request).release());
|
| + backendDB()->openCursor(m_transaction->id(), id(),
|
| + IDBIndexMetadata::InvalidId, range, direction, false,
|
| + taskType, request->createWebCallbacks().release());
|
| return request;
|
| }
|
|
|
| @@ -947,7 +946,7 @@ IDBRequest* IDBObjectStore::openKeyCursor(ScriptState* scriptState,
|
| backendDB()->openCursor(m_transaction->id(), id(),
|
| IDBIndexMetadata::InvalidId, keyRange, direction,
|
| true, WebIDBTaskTypeNormal,
|
| - WebIDBCallbacksImpl::create(request).release());
|
| + request->createWebCallbacks().release());
|
| return request;
|
| }
|
|
|
| @@ -985,7 +984,7 @@ IDBRequest* IDBObjectStore::count(ScriptState* scriptState,
|
| IDBRequest* request = IDBRequest::create(scriptState, IDBAny::create(this),
|
| m_transaction.get());
|
| backendDB()->count(m_transaction->id(), id(), IDBIndexMetadata::InvalidId,
|
| - keyRange, WebIDBCallbacksImpl::create(request).release());
|
| + keyRange, request->createWebCallbacks().release());
|
| return request;
|
| }
|
|
|
|
|