Index: third_party/WebKit/Source/modules/indexeddb/IDBIndex.cpp |
diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBIndex.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBIndex.cpp |
index 75157c238f3a53f7ebf8e3bf187a19310922919b..dc6aa29d280bc6667f48f54e875da87a4672c6fb 100644 |
--- a/third_party/WebKit/Source/modules/indexeddb/IDBIndex.cpp |
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBIndex.cpp |
@@ -35,7 +35,6 @@ |
#include "modules/indexeddb/IDBObjectStore.h" |
#include "modules/indexeddb/IDBTracing.h" |
#include "modules/indexeddb/IDBTransaction.h" |
-#include "modules/indexeddb/WebIDBCallbacksImpl.h" |
#include "public/platform/modules/indexeddb/WebIDBKeyRange.h" |
#include <memory> |
@@ -142,7 +141,7 @@ IDBRequest* IDBIndex::openCursor(ScriptState* scriptState, IDBKeyRange* keyRange |
{ |
IDBRequest* request = IDBRequest::create(scriptState, IDBAny::create(this), m_transaction.get()); |
request->setCursorDetails(IndexedDB::CursorKeyAndValue, direction); |
- backendDB()->openCursor(m_transaction->id(), m_objectStore->id(), id(), keyRange, direction, false, WebIDBTaskTypeNormal, WebIDBCallbacksImpl::create(request).release()); |
+ backendDB()->openCursor(m_transaction->id(), m_objectStore->id(), id(), keyRange, direction, false, WebIDBTaskTypeNormal, request->createWebCallbacks().release()); |
return request; |
} |
@@ -172,7 +171,7 @@ IDBRequest* IDBIndex::count(ScriptState* scriptState, const ScriptValue& range, |
} |
IDBRequest* request = IDBRequest::create(scriptState, IDBAny::create(this), m_transaction.get()); |
- backendDB()->count(m_transaction->id(), m_objectStore->id(), id(), keyRange, WebIDBCallbacksImpl::create(request).release()); |
+ backendDB()->count(m_transaction->id(), m_objectStore->id(), id(), keyRange, request->createWebCallbacks().release()); |
return request; |
} |
@@ -202,7 +201,7 @@ IDBRequest* IDBIndex::openKeyCursor(ScriptState* scriptState, const ScriptValue& |
IDBRequest* request = IDBRequest::create(scriptState, IDBAny::create(this), m_transaction.get()); |
request->setCursorDetails(IndexedDB::CursorKeyOnly, direction); |
- backendDB()->openCursor(m_transaction->id(), m_objectStore->id(), id(), keyRange, direction, true, WebIDBTaskTypeNormal, WebIDBCallbacksImpl::create(request).release()); |
+ backendDB()->openCursor(m_transaction->id(), m_objectStore->id(), id(), keyRange, direction, true, WebIDBTaskTypeNormal, request->createWebCallbacks().release()); |
return request; |
} |
@@ -268,7 +267,7 @@ IDBRequest* IDBIndex::getInternal(ScriptState* scriptState, const ScriptValue& k |
} |
IDBRequest* request = IDBRequest::create(scriptState, IDBAny::create(this), m_transaction.get()); |
- backendDB()->get(m_transaction->id(), m_objectStore->id(), id(), keyRange, keyOnly, WebIDBCallbacksImpl::create(request).release()); |
+ backendDB()->get(m_transaction->id(), m_objectStore->id(), id(), keyRange, keyOnly, request->createWebCallbacks().release()); |
return request; |
} |
@@ -299,7 +298,7 @@ IDBRequest* IDBIndex::getAllInternal(ScriptState* scriptState, const ScriptValue |
} |
IDBRequest* request = IDBRequest::create(scriptState, IDBAny::create(this), m_transaction.get()); |
- backendDB()->getAll(m_transaction->id(), m_objectStore->id(), id(), keyRange, maxCount, keyOnly, WebIDBCallbacksImpl::create(request).release()); |
+ backendDB()->getAll(m_transaction->id(), m_objectStore->id(), id(), keyRange, maxCount, keyOnly, request->createWebCallbacks().release()); |
return request; |
} |