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

content/common/indexed_db/indexed_db_dispatcher.h

 // 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.
 
 #ifndef CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 #define CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 
 #include <map>
 #include <vector>
 
 #include "base/id_map.h"
 #include "base/nullable_string16.h"
 #include "content/common/content_export.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebExceptionCode.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCallbacks.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabase.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransaction.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransactionCallbacks.h"
 #include "webkit/glue/worker_task_runner.h"
 
 struct IndexedDBMsg_CallbacksSuccessCursorContinue_Params;
 struct IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params;
 struct IndexedDBMsg_CallbacksSuccessIDBCursor_Params;
 class RendererWebIDBCursorImpl;
 class RendererWebIDBDatabaseImpl;
 
 namespace IPC {
 class Message;
 }
 
 namespace WebKit {
 class WebFrame;
 class WebIDBKeyRange;
-class WebIDBTransaction;
 }
 
 namespace content {
 class IndexedDBKey;
 class IndexedDBKeyPath;
 class IndexedDBKeyRange;
 class SerializedScriptValue;
 }
 
 CONTENT_EXPORT extern const size_t kMaxIDBValueSizeInBytes;
@@ skipping 122 matching lines @@
       const content::SerializedScriptValue& value,
       const content::IndexedDBKey& key,
       WebKit::WebIDBObjectStore::PutMode putMode,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_object_store_id,
       const WebKit::WebIDBTransaction& transaction,
       const WebKit::WebVector<WebKit::WebString>& indexNames,
       const WebKit::WebVector<WebKit::WebVector<WebKit::WebIDBKey> >& indexKeys,
       WebKit::WebExceptionCode* ec);
 
+  void RequestIDBObjectStoreSetIndexKeys(
+      int32 idb_object_store_id,
+      const content::IndexedDBKey& primaryKey,
+      const WebKit::WebVector<WebKit::WebString>& indexNames,
+      const WebKit::WebVector<WebKit::WebVector<WebKit::WebIDBKey> >& indexKeys,
+      const WebKit::WebIDBTransaction& transaction);
+
+  void RequestIDBObjectStoreSetIndexesReady(
+      int32 idb_object_store_id,
+      const WebKit::WebVector<WebKit::WebString>& indexNames,
+      const WebKit::WebIDBTransaction& transaction);
+
   void RequestIDBObjectStoreDelete(
       const content::IndexedDBKeyRange& key_range,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_object_store_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBObjectStoreClear(
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_object_store_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBObjectStoreOpenCursor(
       const WebKit::WebIDBKeyRange& idb_key_range,
-      unsigned short direction,
+      WebKit::WebIDBCursor::Direction direction,

[jsbell, 2012/08/08 23:34:08]

Just a reminder to add the WebIDBCursor::Direction <-> IDBCursor::Direction
tests to WebKit's Source/WebKit/chromium/src/AssertMatchingEnums.cpp

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

good point! https://bugs.webkit.org/show_bug.cgi?id=93618

       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_object_store_id,
+      WebKit::WebIDBTransaction::TaskType task_type,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
   void RequestIDBObjectStoreCount(
       const WebKit::WebIDBKeyRange& idb_key_range,
       WebKit::WebIDBCallbacks* callbacks,
       int32 idb_object_store_id,
       const WebKit::WebIDBTransaction& transaction,
       WebKit::WebExceptionCode* ec);
 
@@ skipping 73 matching lines @@
 
   // Map from cursor id to RendererWebIDBCursorImpl.
   std::map<int32, RendererWebIDBCursorImpl*> cursors_;
 
   std::map<int32, RendererWebIDBDatabaseImpl*> databases_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDispatcher);
 };
 
 #endif  // CONTENT_COMMON_INDEXED_DB_INDEXED_DB_DISPATCHER_H_