Chromium glue for Preemptive cursors and passing keys from renderer to browser

content/common/indexed_db/indexed_db_dispatcher.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/indexed_db/indexed_db_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/threading/thread_local.h"
 #include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
@@ skipping 430 matching lines @@
       params.index_keys[i].resize(index_keys[i].size());
       for (size_t j = 0; j < index_keys[i].size(); ++j) {
           params.index_keys[i][j] = content::IndexedDBKey(index_keys[i][j]);
       }
   }
   Send(new IndexedDBHostMsg_ObjectStorePut(params, ec));
   if (*ec)
     pending_callbacks_.Remove(params.response_id);
 }
 
+void IndexedDBDispatcher::RequestIDBObjectStoreSetIndexKeys(
+    int32 idb_object_store_id,
+    const IndexedDBKey& primary_key,
+    const WebKit::WebVector<WebKit::WebString>& web_index_names,
+    const WebKit::WebVector<WebKit::WebVector<WebKit::WebIDBKey> >&
+        web_index_keys,
+    const WebKit::WebIDBTransaction& transaction) {
+
+  std::vector<string16> index_names(web_index_names.size());

[dgrogan, 2012/08/08 23:02:50]

It looks like you could move this code to the call site in
RendererWebIDBObjectStoreImpl because you're not using any of
IndexedDBDispatcher's member variables.

I remember you asking about this a while ago.  Instead of the rambling answer
that I gave, I should have said "use the static IndexedDBDispatcher::Send if you
can, resort to dispatcher->RequestIDB... if you have to."

[alecflett, 2012/08/09 20:54:18]

Done.

+  for (size_t i = 0; i < web_index_names.size(); ++i) {
+    index_names[i] = web_index_names[i];
+  }
+
+  std::vector<std::vector<content::IndexedDBKey> >
+          index_keys(web_index_keys.size());
+  for (size_t i = 0; i < web_index_keys.size(); ++i) {
+    index_keys[i].resize(web_index_keys[i].size());
+    for (size_t j = 0; j < web_index_keys[i].size(); ++j) {
+      index_keys[i][j] = content::IndexedDBKey(web_index_keys[i][j]);
+    }
+  }
+  Send(new IndexedDBHostMsg_ObjectStoreSetIndexKeys(
+      idb_object_store_id,
+      primary_key,
+      index_names,
+      index_keys,
+      TransactionId(transaction)));
+}
+
+void IndexedDBDispatcher::RequestIDBObjectStoreSetIndexesReady(
+    int32 idb_object_store_id,
+    const WebKit::WebVector<WebKit::WebString>& index_names,
+    const WebKit::WebIDBTransaction& transaction) {
+    std::vector<string16> index_name_list(index_names.size());
+    for (size_t i = 0; i < index_names.size(); ++i) {
+        index_name_list[i] = index_names[i];
+    }
+
+    Send(new IndexedDBHostMsg_ObjectStoreSetIndexesReady(
+        idb_object_store_id,
+        index_name_list, TransactionId(transaction)));
+}
+
 void IndexedDBDispatcher::RequestIDBObjectStoreDelete(
     const IndexedDBKeyRange& key_range,
     WebIDBCallbacks* callbacks_ptr,
     int32 idb_object_store_id,
     const WebIDBTransaction& transaction,
     WebExceptionCode* ec) {
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
@@ skipping 15 matching lines @@
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   Send(new IndexedDBHostMsg_ObjectStoreClear(
       idb_object_store_id, CurrentWorkerId(), response_id,
       TransactionId(transaction), ec));
   if (*ec)
     pending_callbacks_.Remove(response_id);
 }
 
 void IndexedDBDispatcher::RequestIDBObjectStoreOpenCursor(
     const WebIDBKeyRange& idb_key_range,
-    unsigned short direction,
+    WebKit::WebIDBCursor::Direction direction,
     WebIDBCallbacks* callbacks_ptr,
     int32 idb_object_store_id,
+    WebKit::WebIDBTransaction::TaskType task_type,
     const WebIDBTransaction& transaction,
     WebExceptionCode* ec) {
   ResetCursorPrefetchCaches();
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
   IndexedDBHostMsg_ObjectStoreOpenCursor_Params params;
   params.thread_id = CurrentWorkerId();
   params.response_id = pending_callbacks_.Add(callbacks.release());
   params.key_range = IndexedDBKeyRange(idb_key_range);
   params.direction = direction;
   params.idb_object_store_id = idb_object_store_id;
+  params.task_type = task_type;
   params.transaction_id = TransactionId(transaction);
   Send(new IndexedDBHostMsg_ObjectStoreOpenCursor(params, ec));
   if (*ec)
     pending_callbacks_.Remove(params.response_id);
 }
 
 void IndexedDBDispatcher::RequestIDBObjectStoreCount(
     const WebIDBKeyRange& idb_key_range,
     WebIDBCallbacks* callbacks_ptr,
     int32 idb_object_store_id,
@@ skipping 260 matching lines @@
 }
 
 void IndexedDBDispatcher::ResetCursorPrefetchCaches(int32 exception_cursor_id) {
   typedef std::map<int32, RendererWebIDBCursorImpl*>::iterator Iterator;
   for (Iterator i = cursors_.begin(); i != cursors_.end(); ++i) {
     if (i->first == exception_cursor_id)
       continue;
     i->second->ResetPrefetchCache();
   }
 }