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 e7b73eddf8019c6d34cc05259c338ebbc4c7b205..240c6553144c888c6f57b259fcf8a779834cd87c 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" |
@@ -175,7 +174,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; |
} |
@@ -217,7 +216,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; |
} |
@@ -265,7 +264,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; |
} |
@@ -313,7 +312,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; |
} |
@@ -520,7 +519,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; |
} |
@@ -568,7 +567,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; |
} |
@@ -604,7 +603,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; |
} |
@@ -902,9 +901,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; |
} |
@@ -949,7 +948,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; |
} |
@@ -987,7 +986,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; |
} |