| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Message definition file, included multiple times, hence no include guard. | 5 // Message definition file, included multiple times, hence no include guard. |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "content/common/indexed_db/indexed_db_key.h" | 9 #include "content/common/indexed_db/indexed_db_key.h" |
| 10 #include "content/common/indexed_db/indexed_db_key_path.h" |
| 10 #include "content/common/indexed_db/indexed_db_key_range.h" | 11 #include "content/common/indexed_db/indexed_db_key_range.h" |
| 11 #include "content/common/indexed_db/indexed_db_param_traits.h" | 12 #include "content/common/indexed_db/indexed_db_param_traits.h" |
| 12 #include "content/public/common/serialized_script_value.h" | 13 #include "content/public/common/serialized_script_value.h" |
| 13 #include "ipc/ipc_message_macros.h" | 14 #include "ipc/ipc_message_macros.h" |
| 14 #include "ipc/ipc_param_traits.h" | 15 #include "ipc/ipc_param_traits.h" |
| 15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebExceptionCode.h" | 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebExceptionCode.h" |
| 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h" | 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h" |
| 17 | 18 |
| 18 #define IPC_MESSAGE_START IndexedDBMsgStart | 19 #define IPC_MESSAGE_START IndexedDBMsgStart |
| 19 | 20 |
| (...skipping 30 matching lines...) Expand all Loading... |
| 50 IPC_STRUCT_MEMBER(string16, origin) | 51 IPC_STRUCT_MEMBER(string16, origin) |
| 51 // The name of the database. | 52 // The name of the database. |
| 52 IPC_STRUCT_MEMBER(string16, name) | 53 IPC_STRUCT_MEMBER(string16, name) |
| 53 IPC_STRUCT_END() | 54 IPC_STRUCT_END() |
| 54 | 55 |
| 55 // Used to create an object store. | 56 // Used to create an object store. |
| 56 IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateObjectStore_Params) | 57 IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateObjectStore_Params) |
| 57 // The name of the object store. | 58 // The name of the object store. |
| 58 IPC_STRUCT_MEMBER(string16, name) | 59 IPC_STRUCT_MEMBER(string16, name) |
| 59 // The keyPath of the object store. | 60 // The keyPath of the object store. |
| 60 IPC_STRUCT_MEMBER(NullableString16, key_path) | 61 IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, key_path) |
| 61 // Whether the object store created should have a key generator. | 62 // Whether the object store created should have a key generator. |
| 62 IPC_STRUCT_MEMBER(bool, auto_increment) | 63 IPC_STRUCT_MEMBER(bool, auto_increment) |
| 63 // The transaction this is associated with. | 64 // The transaction this is associated with. |
| 64 IPC_STRUCT_MEMBER(int32, transaction_id) | 65 IPC_STRUCT_MEMBER(int32, transaction_id) |
| 65 // The database the object store belongs to. | 66 // The database the object store belongs to. |
| 66 IPC_STRUCT_MEMBER(int32, idb_database_id) | 67 IPC_STRUCT_MEMBER(int32, idb_database_id) |
| 67 IPC_STRUCT_END() | 68 IPC_STRUCT_END() |
| 68 | 69 |
| 69 // Used to open both cursors and object cursors in IndexedDB. | 70 // Used to open both cursors and object cursors in IndexedDB. |
| 70 IPC_STRUCT_BEGIN(IndexedDBHostMsg_IndexOpenCursor_Params) | 71 IPC_STRUCT_BEGIN(IndexedDBHostMsg_IndexOpenCursor_Params) |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 109 IPC_STRUCT_MEMBER(WebKit::WebIDBObjectStore::PutMode, put_mode) | 110 IPC_STRUCT_MEMBER(WebKit::WebIDBObjectStore::PutMode, put_mode) |
| 110 // The transaction it's associated with. | 111 // The transaction it's associated with. |
| 111 IPC_STRUCT_MEMBER(int, transaction_id) | 112 IPC_STRUCT_MEMBER(int, transaction_id) |
| 112 IPC_STRUCT_END() | 113 IPC_STRUCT_END() |
| 113 | 114 |
| 114 // Used to create an index. | 115 // Used to create an index. |
| 115 IPC_STRUCT_BEGIN(IndexedDBHostMsg_ObjectStoreCreateIndex_Params) | 116 IPC_STRUCT_BEGIN(IndexedDBHostMsg_ObjectStoreCreateIndex_Params) |
| 116 // The name of the index. | 117 // The name of the index. |
| 117 IPC_STRUCT_MEMBER(string16, name) | 118 IPC_STRUCT_MEMBER(string16, name) |
| 118 // The keyPath of the index. | 119 // The keyPath of the index. |
| 119 IPC_STRUCT_MEMBER(NullableString16, key_path) | 120 IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, key_path) |
| 120 // Whether the index created has unique keys. | 121 // Whether the index created has unique keys. |
| 121 IPC_STRUCT_MEMBER(bool, unique) | 122 IPC_STRUCT_MEMBER(bool, unique) |
| 122 // Whether the index created produces keys for each array entry. | 123 // Whether the index created produces keys for each array entry. |
| 123 IPC_STRUCT_MEMBER(bool, multi_entry) | 124 IPC_STRUCT_MEMBER(bool, multi_entry) |
| 124 // The transaction this is associated with. | 125 // The transaction this is associated with. |
| 125 IPC_STRUCT_MEMBER(int32, transaction_id) | 126 IPC_STRUCT_MEMBER(int32, transaction_id) |
| 126 // The object store the index belongs to. | 127 // The object store the index belongs to. |
| 127 IPC_STRUCT_MEMBER(int32, idb_object_store_id) | 128 IPC_STRUCT_MEMBER(int32, idb_object_store_id) |
| 128 IPC_STRUCT_END() | 129 IPC_STRUCT_END() |
| 129 | 130 |
| (...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 string16 /* name */) | 378 string16 /* name */) |
| 378 | 379 |
| 379 // WebIDBIndex::storeName() message. | 380 // WebIDBIndex::storeName() message. |
| 380 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexStoreName, | 381 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexStoreName, |
| 381 int32, /* idb_index_id */ | 382 int32, /* idb_index_id */ |
| 382 string16 /* store_name */) | 383 string16 /* store_name */) |
| 383 | 384 |
| 384 // WebIDBIndex::keyPath() message. | 385 // WebIDBIndex::keyPath() message. |
| 385 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexKeyPath, | 386 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexKeyPath, |
| 386 int32, /* idb_index_id */ | 387 int32, /* idb_index_id */ |
| 387 NullableString16 /* key_path */) | 388 content::IndexedDBKeyPath /* key_path */) |
| 388 | 389 |
| 389 // WebIDBIndex::unique() message. | 390 // WebIDBIndex::unique() message. |
| 390 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexUnique, | 391 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexUnique, |
| 391 int32, /* idb_index_id */ | 392 int32, /* idb_index_id */ |
| 392 bool /* unique */) | 393 bool /* unique */) |
| 393 | 394 |
| 394 // WebIDBIndex::multiEntry() message. | 395 // WebIDBIndex::multiEntry() message. |
| 395 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexMultiEntry, | 396 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_IndexMultiEntry, |
| 396 int32, /* idb_index_id */ | 397 int32, /* idb_index_id */ |
| 397 bool /* multi_entry */) | 398 bool /* multi_entry */) |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 434 int32 /* idb_index_id */) | 435 int32 /* idb_index_id */) |
| 435 | 436 |
| 436 // WebIDBObjectStore::name() message. | 437 // WebIDBObjectStore::name() message. |
| 437 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_ObjectStoreName, | 438 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_ObjectStoreName, |
| 438 int32, /* idb_object_store_id */ | 439 int32, /* idb_object_store_id */ |
| 439 string16 /* name */) | 440 string16 /* name */) |
| 440 | 441 |
| 441 // WebIDBObjectStore::keyPath() message. | 442 // WebIDBObjectStore::keyPath() message. |
| 442 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_ObjectStoreKeyPath, | 443 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_ObjectStoreKeyPath, |
| 443 int32, /* idb_object_store_id */ | 444 int32, /* idb_object_store_id */ |
| 444 NullableString16 /* keyPath */) | 445 content::IndexedDBKeyPath /* keyPath */) |
| 445 | 446 |
| 446 // WebIDBObjectStore::indexNames() message. | 447 // WebIDBObjectStore::indexNames() message. |
| 447 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_ObjectStoreIndexNames, | 448 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_ObjectStoreIndexNames, |
| 448 int32, /* idb_object_store_id */ | 449 int32, /* idb_object_store_id */ |
| 449 std::vector<string16> /* index_names */) | 450 std::vector<string16> /* index_names */) |
| 450 | 451 |
| 451 // WebIDBObjectStore::get() message. | 452 // WebIDBObjectStore::get() message. |
| 452 IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_ObjectStoreGet, | 453 IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_ObjectStoreGet, |
| 453 int32, /* idb_object_store_id */ | 454 int32, /* idb_object_store_id */ |
| 454 int32, /* thread_id */ | 455 int32, /* thread_id */ |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 542 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionAbort, | 543 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionAbort, |
| 543 int32 /* idb_transaction_id */) | 544 int32 /* idb_transaction_id */) |
| 544 | 545 |
| 545 // IDBTransaction::DidCompleteTaskEvents() message. | 546 // IDBTransaction::DidCompleteTaskEvents() message. |
| 546 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDidCompleteTaskEvents, | 547 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDidCompleteTaskEvents, |
| 547 int32 /* idb_transaction_id */) | 548 int32 /* idb_transaction_id */) |
| 548 | 549 |
| 549 // WebIDBTransaction::~WebIDBTransaction() message. | 550 // WebIDBTransaction::~WebIDBTransaction() message. |
| 550 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDestroyed, | 551 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDestroyed, |
| 551 int32 /* idb_transaction_id */) | 552 int32 /* idb_transaction_id */) |
| OLD | NEW |