Chromium side of plumbing for passing renderer-generated keys through IPC

content/common/indexed_db/proxy_webidbobjectstore_impl.cc

Index: content/common/indexed_db/proxy_webidbobjectstore_impl.cc
diff --git a/content/common/indexed_db/proxy_webidbobjectstore_impl.cc b/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
index 85a5838d2bc996d34ff9718d14f3547db535c014..4e34db519ec0cd4e66ecd8920c348cd97e92b6ca 100644
--- a/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
+++ b/content/common/indexed_db/proxy_webidbobjectstore_impl.cc
@@ -18,7 +18,9 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
+using content::IndexedDBKey;
 using content::IndexedDBKeyPath;
+using content::IndexedDBKeyRange;
 using content::SerializedScriptValue;
 using WebKit::WebDOMStringList;
 using WebKit::WebExceptionCode;
@@ -31,6 +33,7 @@ using WebKit::WebIDBKey;
 using WebKit::WebIDBTransaction;
 using WebKit::WebSerializedScriptValue;
 using WebKit::WebString;
+using WebKit::WebVector;
 
 RendererWebIDBObjectStoreImpl::RendererWebIDBObjectStoreImpl(
     int32 idb_object_store_id)
@@ -54,7 +57,7 @@ void RendererWebIDBObjectStoreImpl::get(
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
   dispatcher->RequestIDBObjectStoreGet(
-      content::IndexedDBKeyRange(key_range), callbacks,
+      IndexedDBKeyRange(key_range), callbacks,
       idb_object_store_id_, transaction, &ec);
 }
 
@@ -67,9 +70,29 @@ void RendererWebIDBObjectStoreImpl::put(
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
+  WebVector<WebString> emptyIndexNames;
+  WebVector<WebVector<WebIDBKey> > emptyIndexKeys;
   dispatcher->RequestIDBObjectStorePut(
-      SerializedScriptValue(value), content::IndexedDBKey(key),
-      put_mode, callbacks, idb_object_store_id_, transaction, &ec);
+      SerializedScriptValue(value), IndexedDBKey(key),
+      put_mode, callbacks, idb_object_store_id_, transaction,
+      emptyIndexNames, emptyIndexKeys, &ec);
+}
+
+void RendererWebIDBObjectStoreImpl::putWithIndexKeys(
+    const WebSerializedScriptValue& value,
+    const WebIDBKey& key,
+    PutMode put_mode,
+    WebIDBCallbacks* callbacks,
+    const WebIDBTransaction& transaction,
+    const WebVector<WebString>& indexNames,
+    const WebVector<WebVector<WebIDBKey> >& indexKeys,
+    WebExceptionCode& ec) {
+  IndexedDBDispatcher* dispatcher =
+      IndexedDBDispatcher::ThreadSpecificInstance();
+  dispatcher->RequestIDBObjectStorePut(
+      SerializedScriptValue(value), IndexedDBKey(key),
+      put_mode, callbacks, idb_object_store_id_, transaction,
+      indexNames, indexKeys, &ec);
 }
 
 void RendererWebIDBObjectStoreImpl::deleteFunction(
@@ -80,7 +103,7 @@ void RendererWebIDBObjectStoreImpl::deleteFunction(
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance();
   dispatcher->RequestIDBObjectStoreDelete(
-      content::IndexedDBKeyRange(key_range), callbacks, idb_object_store_id_,
+      IndexedDBKeyRange(key_range), callbacks, idb_object_store_id_,
       transaction, &ec);
 }