Index: content/common/indexed_db/indexed_db_messages.h |
diff --git a/content/common/indexed_db/indexed_db_messages.h b/content/common/indexed_db/indexed_db_messages.h |
index ac3fa2bcac98515715105ef910fde834953d81ed..1af371d543d24f35c75195a5ac4b69e5fbe2ac10 100644 |
--- a/content/common/indexed_db/indexed_db_messages.h |
+++ b/content/common/indexed_db/indexed_db_messages.h |
@@ -13,8 +13,7 @@ |
#include "content/common/indexed_db/indexed_db_param_traits.h" |
#include "ipc/ipc_message_macros.h" |
#include "ipc/ipc_param_traits.h" |
-#include "third_party/WebKit/public/platform/WebIDBCursor.h" |
-#include "third_party/WebKit/public/platform/WebIDBDatabase.h" |
+#include "third_party/WebKit/public/platform/WebIDBTypes.h" |
#undef IPC_MESSAGE_EXPORT |
#define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
@@ -22,13 +21,11 @@ |
// Argument structures used in messages |
-IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBCursor::Direction, |
- blink::WebIDBCursor::DirectionLast) |
-IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBDatabase::PutMode, |
- blink::WebIDBDatabase::PutModeLast) |
-IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBDatabase::TaskType, |
- blink::WebIDBDatabase::TaskTypeLast) |
-IPC_ENUM_TRAITS(blink::WebIDBDatabase::TransactionMode) |
+IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBCursorDirection, |
+ blink::WebIDBCursorDirectionLast) |
+IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBPutMode, blink::WebIDBPutModeLast) |
+IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBTaskType, blink::WebIDBTaskTypeLast) |
+IPC_ENUM_TRAITS(blink::WebIDBTransactionMode) |
jsbell
2014/06/11 16:42:02
Change this to IPC_ENUM_TRAITS_MAX_VALUE once Last
Pritam Nikam
2014/06/12 11:19:20
Done.
|
IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBDataLoss, blink::WebIDBDataLossTotal) |
@@ -84,7 +81,7 @@ IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateTransaction_Params) |
// The scope of the transaction. |
IPC_STRUCT_MEMBER(std::vector<int64>, object_store_ids) |
// The transaction mode. |
- IPC_STRUCT_MEMBER(blink::WebIDBDatabase::TransactionMode, mode) |
+ IPC_STRUCT_MEMBER(blink::WebIDBTransactionMode, mode) |
IPC_STRUCT_END() |
// Used to create an object store. |
@@ -149,7 +146,7 @@ IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabasePut_Params) |
// The key to set it on (may not be "valid"/set in some cases). |
IPC_STRUCT_MEMBER(content::IndexedDBKey, key) |
// Whether this is an add or a put. |
- IPC_STRUCT_MEMBER(blink::WebIDBDatabase::PutMode, put_mode) |
+ IPC_STRUCT_MEMBER(blink::WebIDBPutMode, put_mode) |
// The index ids and the list of keys for each index. |
IPC_STRUCT_MEMBER(std::vector<IndexKeys>, index_keys) |
// Sideband data for any blob or file encoded in value. |
@@ -172,11 +169,11 @@ IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseOpenCursor_Params) |
// The serialized key range. |
IPC_STRUCT_MEMBER(content::IndexedDBKeyRange, key_range) |
// The direction of this cursor. |
- IPC_STRUCT_MEMBER(blink::WebIDBCursor::Direction, direction) |
+ IPC_STRUCT_MEMBER(blink::WebIDBCursorDirection, direction) |
// If this is just retrieving the key |
IPC_STRUCT_MEMBER(bool, key_only) |
// The priority of this cursor. |
- IPC_STRUCT_MEMBER(blink::WebIDBDatabase::TaskType, task_type) |
+ IPC_STRUCT_MEMBER(blink::WebIDBTaskType, task_type) |
IPC_STRUCT_END() |
// Used to open both cursors and object cursors in IndexedDB. |