summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/browser/in_process_webkit/indexed_db_dispatcher_host.cc3
-rw-r--r--content/common/indexed_db_messages.h2
-rw-r--r--content/renderer/renderer_webidbobjectstore_impl.cc2
-rw-r--r--content/renderer/renderer_webidbobjectstore_impl.h1
4 files changed, 7 insertions, 1 deletions
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 f521667..d03b1d6 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -797,7 +797,8 @@ void IndexedDBDispatcherHost::ObjectStoreDispatcherHost::OnCreateIndex(
*ec = 0;
WebIDBIndex* index = idb_object_store->createIndex(
- params.name, params.key_path, params.unique, *idb_transaction, *ec);
+ params.name, params.key_path, params.unique, params.multi_entry,
+ *idb_transaction, *ec);
*index_id = *ec ? 0 : parent_->Add(index);
WebIDBObjectIDToURLMap* transaction_url_map =
&parent_->transaction_dispatcher_host_->transaction_url_map_;
diff --git a/content/common/indexed_db_messages.h b/content/common/indexed_db_messages.h
index 31a0974..07784f3 100644
--- a/content/common/indexed_db_messages.h
+++ b/content/common/indexed_db_messages.h
@@ -106,6 +106,8 @@ IPC_STRUCT_BEGIN(IndexedDBHostMsg_ObjectStoreCreateIndex_Params)
IPC_STRUCT_MEMBER(NullableString16, key_path)
// Whether the index created has unique keys.
IPC_STRUCT_MEMBER(bool, unique)
+ // Whether the index created produces keys for each array entry.
+ IPC_STRUCT_MEMBER(bool, multi_entry)
// The transaction this is associated with.
IPC_STRUCT_MEMBER(int32, transaction_id)
// The object store the index belongs to.
diff --git a/content/renderer/renderer_webidbobjectstore_impl.cc b/content/renderer/renderer_webidbobjectstore_impl.cc
index 65db64e..94a0a48 100644
--- a/content/renderer/renderer_webidbobjectstore_impl.cc
+++ b/content/renderer/renderer_webidbobjectstore_impl.cc
@@ -119,12 +119,14 @@ WebIDBIndex* RendererWebIDBObjectStoreImpl::createIndex(
const WebString& name,
const WebString& key_path,
bool unique,
+ bool multi_entry,
const WebIDBTransaction& transaction,
WebExceptionCode& ec) {
IndexedDBHostMsg_ObjectStoreCreateIndex_Params params;
params.name = name;
params.key_path = key_path;
params.unique = unique;
+ params.multi_entry = multi_entry;
params.transaction_id = IndexedDBDispatcher::TransactionId(transaction);
params.idb_object_store_id = idb_object_store_id_;
diff --git a/content/renderer/renderer_webidbobjectstore_impl.h b/content/renderer/renderer_webidbobjectstore_impl.h
index c95e5bf..21c922d 100644
--- a/content/renderer/renderer_webidbobjectstore_impl.h
+++ b/content/renderer/renderer_webidbobjectstore_impl.h
@@ -50,6 +50,7 @@ class RendererWebIDBObjectStoreImpl : public WebKit::WebIDBObjectStore {
const WebKit::WebString& name,
const WebKit::WebString& key_path,
bool unique,
+ bool multi_entry,
const WebKit::WebIDBTransaction& transaction,
WebKit::WebExceptionCode& ec);
// Transfers ownership of the WebIDBIndex to the caller.