Index: content/browser/in_process_webkit/indexed_db_dispatcher_host.cc |
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc |
index 86e3e4974dc0f4bab757aa93bcb639f4d2711f58..832d04834a7ef9a7ee83cc726967d51013a17d52 100644 |
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc |
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc |
@@ -552,7 +552,7 @@ void IndexedDBDispatcherHost::IndexDispatcherHost::OnOpenObjectCursor( |
*ec = 0; |
scoped_ptr<WebIDBCallbacks> callbacks( |
- new IndexedDBCallbacks<WebIDBCursor>(parent_, params.response_id)); |
+ new IndexedDBCallbacks<WebIDBCursor>(parent_, params.response_id, -1)); |
idb_index->openObjectCursor( |
WebIDBKeyRange(params.lower_key, params.upper_key, params.lower_open, |
params.upper_open), |
@@ -572,7 +572,7 @@ void IndexedDBDispatcherHost::IndexDispatcherHost::OnOpenKeyCursor( |
*ec = 0; |
scoped_ptr<WebIDBCallbacks> callbacks( |
- new IndexedDBCallbacks<WebIDBCursor>(parent_, params.response_id)); |
+ new IndexedDBCallbacks<WebIDBCursor>(parent_, params.response_id, -1)); |
idb_index->openKeyCursor( |
WebIDBKeyRange(params.lower_key, params.upper_key, params.lower_open, |
params.upper_open), |
@@ -843,7 +843,7 @@ void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnOpenCursor( |
*ec = 0; |
scoped_ptr<WebIDBCallbacks> callbacks( |
- new IndexedDBCallbacks<WebIDBCursor>(parent_, params.response_id)); |
+ new IndexedDBCallbacks<WebIDBCursor>(parent_, params.response_id, -1)); |
idb_object_store->openCursor( |
WebIDBKeyRange(params.lower_key, params.upper_key, params.lower_open, |
params.upper_open), |
@@ -953,7 +953,8 @@ void IndexedDBDispatcherHost::CursorDispatcherHost::OnContinue( |
*ec = 0; |
idb_cursor->continueFunction( |
- key, new IndexedDBCallbacks<WebIDBCursor>(parent_, response_id), *ec); |
+ key, new IndexedDBCallbacks<WebIDBCursor>(parent_, response_id, |
+ cursor_id), *ec); |
} |
void IndexedDBDispatcherHost::CursorDispatcherHost::OnDelete( |
@@ -1073,3 +1074,8 @@ void IndexedDBDispatcherHost::TransactionDispatcherHost::OnDestroyed( |
transaction_url_map_.erase(object_id); |
parent_->DestroyObject(&map_, object_id); |
} |
+ |
+WebIDBCursor* IndexedDBDispatcherHost::getCursorFromId(int32 cursor_id) { |
michaeln
2011/11/01 18:38:37
nit: please you move this method up in the .cc fil
hans
2011/11/02 17:16:58
Done.
|
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::WEBKIT)); |
+ return cursor_dispatcher_host_->map_.Lookup(cursor_id); |
+} |