Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(232)

Side by Side Diff: content/common/indexed_db/indexed_db_messages.h

Issue 11828054: Remove IPC code for old methods. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix merge conflicts Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_path.h"
11 #include "content/common/indexed_db/indexed_db_key_range.h" 11 #include "content/common/indexed_db/indexed_db_key_range.h"
12 #include "content/common/indexed_db/indexed_db_param_traits.h" 12 #include "content/common/indexed_db/indexed_db_param_traits.h"
13 #include "content/public/common/serialized_script_value.h" 13 #include "content/public/common/serialized_script_value.h"
14 #include "ipc/ipc_message_macros.h" 14 #include "ipc/ipc_message_macros.h"
15 #include "ipc/ipc_param_traits.h" 15 #include "ipc/ipc_param_traits.h"
16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebExceptionCode.h" 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebExceptionCode.h"
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h" 17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h"
18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabase.h" 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabase.h"
19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBMetadata.h" 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBMetadata.h"
20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h"
21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransaction.h" 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransaction.h"
22 21
23 #define IPC_MESSAGE_START IndexedDBMsgStart 22 #define IPC_MESSAGE_START IndexedDBMsgStart
24 23
25 // Argument structures used in messages 24 // Argument structures used in messages
26 25
27 IPC_ENUM_TRAITS(WebKit::WebIDBObjectStore::PutMode)
28 IPC_ENUM_TRAITS(WebKit::WebIDBCursor::Direction) 26 IPC_ENUM_TRAITS(WebKit::WebIDBCursor::Direction)
29 IPC_ENUM_TRAITS(WebKit::WebIDBTransaction::TaskType) 27 IPC_ENUM_TRAITS(WebKit::WebIDBTransaction::TaskType)
30 IPC_ENUM_TRAITS(WebKit::WebIDBDatabase::PutMode) 28 IPC_ENUM_TRAITS(WebKit::WebIDBDatabase::PutMode)
31 IPC_ENUM_TRAITS(WebKit::WebIDBDatabase::TaskType) 29 IPC_ENUM_TRAITS(WebKit::WebIDBDatabase::TaskType)
32 30
33 // Used to enumerate indexed databases. 31 // Used to enumerate indexed databases.
34 IPC_STRUCT_BEGIN(IndexedDBHostMsg_FactoryGetDatabaseNames_Params) 32 IPC_STRUCT_BEGIN(IndexedDBHostMsg_FactoryGetDatabaseNames_Params)
35 // The response should have these ids. 33 // The response should have these ids.
36 IPC_STRUCT_MEMBER(int32, ipc_thread_id) 34 IPC_STRUCT_MEMBER(int32, ipc_thread_id)
37 IPC_STRUCT_MEMBER(int32, ipc_response_id) 35 IPC_STRUCT_MEMBER(int32, ipc_response_id)
(...skipping 24 matching lines...) Expand all
62 // The response should have these ids. 60 // The response should have these ids.
63 IPC_STRUCT_MEMBER(int32, ipc_thread_id) 61 IPC_STRUCT_MEMBER(int32, ipc_thread_id)
64 IPC_STRUCT_MEMBER(int32, ipc_response_id) 62 IPC_STRUCT_MEMBER(int32, ipc_response_id)
65 // The origin doing the initiating. 63 // The origin doing the initiating.
66 IPC_STRUCT_MEMBER(string16, origin) 64 IPC_STRUCT_MEMBER(string16, origin)
67 // The name of the database. 65 // The name of the database.
68 IPC_STRUCT_MEMBER(string16, name) 66 IPC_STRUCT_MEMBER(string16, name)
69 IPC_STRUCT_END() 67 IPC_STRUCT_END()
70 68
71 // Used to create an object store. 69 // Used to create an object store.
72 IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateObjectStoreOld_Params)
73 // The storage id of the object store.
74 IPC_STRUCT_MEMBER(int64, id)
75 // The name of the object store.
76 IPC_STRUCT_MEMBER(string16, name)
77 // The keyPath of the object store.
78 IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, key_path)
79 // Whether the object store created should have a key generator.
80 IPC_STRUCT_MEMBER(bool, auto_increment)
81 // The transaction this is associated with.
82 IPC_STRUCT_MEMBER(int32, ipc_transaction_id)
83 // The database the object store belongs to.
84 IPC_STRUCT_MEMBER(int32, ipc_database_id)
85 IPC_STRUCT_END()
86
87 // Used to create an object store.
88 IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateObjectStore_Params) 70 IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateObjectStore_Params)
89 // The database the object store belongs to. 71 // The database the object store belongs to.
90 IPC_STRUCT_MEMBER(int32, ipc_database_id) 72 IPC_STRUCT_MEMBER(int32, ipc_database_id)
91 // The transaction its associated with. 73 // The transaction its associated with.
92 IPC_STRUCT_MEMBER(int64, transaction_id) 74 IPC_STRUCT_MEMBER(int64, transaction_id)
93 // The storage id of the object store. 75 // The storage id of the object store.
94 IPC_STRUCT_MEMBER(int64, object_store_id) 76 IPC_STRUCT_MEMBER(int64, object_store_id)
95 // The name of the object store. 77 // The name of the object store.
96 IPC_STRUCT_MEMBER(string16, name) 78 IPC_STRUCT_MEMBER(string16, name)
97 // The keyPath of the object store. 79 // The keyPath of the object store.
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 IPC_STRUCT_MEMBER(int32, ipc_thread_id) 202 IPC_STRUCT_MEMBER(int32, ipc_thread_id)
221 IPC_STRUCT_MEMBER(int32, ipc_response_id) 203 IPC_STRUCT_MEMBER(int32, ipc_response_id)
222 // The serialized key range. 204 // The serialized key range.
223 IPC_STRUCT_MEMBER(content::IndexedDBKeyRange, key_range) 205 IPC_STRUCT_MEMBER(content::IndexedDBKeyRange, key_range)
224 // The index the index belongs to. 206 // The index the index belongs to.
225 IPC_STRUCT_MEMBER(int32, ipc_index_id) 207 IPC_STRUCT_MEMBER(int32, ipc_index_id)
226 // The transaction this request belongs to. 208 // The transaction this request belongs to.
227 IPC_STRUCT_MEMBER(int, ipc_transaction_id) 209 IPC_STRUCT_MEMBER(int, ipc_transaction_id)
228 IPC_STRUCT_END() 210 IPC_STRUCT_END()
229 211
230 // Used to set a value in an object store.
231 IPC_STRUCT_BEGIN(IndexedDBHostMsg_ObjectStorePut_Params)
232 // The object store's id.
233 IPC_STRUCT_MEMBER(int32, ipc_object_store_id)
234 // The id any response should contain.
235 IPC_STRUCT_MEMBER(int32, ipc_thread_id)
236 IPC_STRUCT_MEMBER(int32, ipc_response_id)
237 // The value to set.
238 IPC_STRUCT_MEMBER(content::SerializedScriptValue, serialized_value)
239 // The key to set it on (may not be "valid"/set in some cases).
240 IPC_STRUCT_MEMBER(content::IndexedDBKey, key)
241 // Whether this is an add or a put.
242 IPC_STRUCT_MEMBER(WebKit::WebIDBObjectStore::PutMode, put_mode)
243 // The names of the indexes used below.
244 IPC_STRUCT_MEMBER(std::vector<int64>, index_ids)
245 // The keys for each index, such that each inner vector corresponds
246 // to each index named in index_names, respectively.
247 IPC_STRUCT_MEMBER(std::vector<std::vector<content::IndexedDBKey> >,
248 index_keys)
249 // The transaction it's associated with.
250 IPC_STRUCT_MEMBER(int, ipc_transaction_id)
251 IPC_STRUCT_END()
252
253 IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseSetIndexKeys_Params) 212 IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseSetIndexKeys_Params)
254 // The IPC id of the database. 213 // The IPC id of the database.
255 IPC_STRUCT_MEMBER(int32, ipc_database_id) 214 IPC_STRUCT_MEMBER(int32, ipc_database_id)
256 // The transaction this request belongs to. 215 // The transaction this request belongs to.
257 IPC_STRUCT_MEMBER(int64, transaction_id) 216 IPC_STRUCT_MEMBER(int64, transaction_id)
258 // The object store's id. 217 // The object store's id.
259 IPC_STRUCT_MEMBER(int64, object_store_id) 218 IPC_STRUCT_MEMBER(int64, object_store_id)
260 // The object store key that we're setting index keys for. 219 // The object store key that we're setting index keys for.
261 IPC_STRUCT_MEMBER(content::IndexedDBKey, primary_key) 220 IPC_STRUCT_MEMBER(content::IndexedDBKey, primary_key)
262 // The indexes that we're setting keys on. 221 // The indexes that we're setting keys on.
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after
489 int32) /* ipc_response_id */ 448 int32) /* ipc_response_id */
490 449
491 // WebIDBFactory::getDatabaseNames() message. 450 // WebIDBFactory::getDatabaseNames() message.
492 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_FactoryGetDatabaseNames, 451 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_FactoryGetDatabaseNames,
493 IndexedDBHostMsg_FactoryGetDatabaseNames_Params) 452 IndexedDBHostMsg_FactoryGetDatabaseNames_Params)
494 453
495 // WebIDBFactory::open() message. 454 // WebIDBFactory::open() message.
496 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_FactoryOpen, 455 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_FactoryOpen,
497 IndexedDBHostMsg_FactoryOpen_Params) 456 IndexedDBHostMsg_FactoryOpen_Params)
498 457
499 // WebIDBFactory::open() message.
500 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_FactoryOpenOld,
501 IndexedDBHostMsg_FactoryOpen_Params)
502
503 // WebIDBFactory::deleteDatabase() message. 458 // WebIDBFactory::deleteDatabase() message.
504 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_FactoryDeleteDatabase, 459 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_FactoryDeleteDatabase,
505 IndexedDBHostMsg_FactoryDeleteDatabase_Params) 460 IndexedDBHostMsg_FactoryDeleteDatabase_Params)
506 461
507 // WebIDBDatabase::metadata() payload 462 // WebIDBDatabase::metadata() payload
508 IPC_STRUCT_BEGIN(IndexedDBIndexMetadata) 463 IPC_STRUCT_BEGIN(IndexedDBIndexMetadata)
509 IPC_STRUCT_MEMBER(int64, id) 464 IPC_STRUCT_MEMBER(int64, id)
510 IPC_STRUCT_MEMBER(string16, name) 465 IPC_STRUCT_MEMBER(string16, name)
511 IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, keyPath) 466 IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, keyPath)
512 IPC_STRUCT_MEMBER(bool, unique) 467 IPC_STRUCT_MEMBER(bool, unique)
(...skipping 17 matching lines...) Expand all
530 IPC_STRUCT_MEMBER(int64, max_object_store_id) 485 IPC_STRUCT_MEMBER(int64, max_object_store_id)
531 IPC_STRUCT_MEMBER(std::vector<IndexedDBObjectStoreMetadata>, object_stores) 486 IPC_STRUCT_MEMBER(std::vector<IndexedDBObjectStoreMetadata>, object_stores)
532 IPC_STRUCT_END() 487 IPC_STRUCT_END()
533 488
534 // WebIDBDatabase::metadata() message. 489 // WebIDBDatabase::metadata() message.
535 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_DatabaseMetadata, 490 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_DatabaseMetadata,
536 int32, /* ipc_database_id */ 491 int32, /* ipc_database_id */
537 IndexedDBDatabaseMetadata /* metadata */) 492 IndexedDBDatabaseMetadata /* metadata */)
538 493
539 // WebIDBDatabase::createObjectStore() message. 494 // WebIDBDatabase::createObjectStore() message.
540 IPC_SYNC_MESSAGE_CONTROL1_2(
541 IndexedDBHostMsg_DatabaseCreateObjectStoreOld,
542 IndexedDBHostMsg_DatabaseCreateObjectStoreOld_Params,
543 int32, /* ipc_object_store_id */
544 WebKit::WebExceptionCode /* ec */)
545
546 // WebIDBDatabase::createObjectStore() message.
547 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseCreateObjectStore, 495 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseCreateObjectStore,
548 IndexedDBHostMsg_DatabaseCreateObjectStore_Params) 496 IndexedDBHostMsg_DatabaseCreateObjectStore_Params)
549 497
550 // WebIDBDatabase::deleteObjectStore() message. 498 // WebIDBDatabase::deleteObjectStore() message.
551 IPC_SYNC_MESSAGE_CONTROL3_1(IndexedDBHostMsg_DatabaseDeleteObjectStoreOld,
552 int32, /* ipc_database_id */
553 int64, /* object_store_id */
554 int32, /* ipc_transaction_id */
555 WebKit::WebExceptionCode /* ec */)
556
557 // WebIDBDatabase::deleteObjectStore() message.
558 IPC_MESSAGE_CONTROL3(IndexedDBHostMsg_DatabaseDeleteObjectStore, 499 IPC_MESSAGE_CONTROL3(IndexedDBHostMsg_DatabaseDeleteObjectStore,
559 int32, /* ipc_database_id */ 500 int32, /* ipc_database_id */
560 int64, /* transaction_id */ 501 int64, /* transaction_id */
561 int64) /* object_store_id */ 502 int64) /* object_store_id */
562 503
563 // WebIDBDatabase::createTransaction() message. 504 // WebIDBDatabase::createTransaction() message.
564 // TODO: make this message async. 505 // TODO: make this message async.
565 IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_DatabaseCreateTransaction, 506 IPC_SYNC_MESSAGE_CONTROL5_1(IndexedDBHostMsg_DatabaseCreateTransaction,
566 int32, /* ipc_thread_id */ 507 int32, /* ipc_thread_id */
567 int32, /* ipc_database_id */ 508 int32, /* ipc_database_id */
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
653 int32, /* ipc_index_id */ 594 int32, /* ipc_index_id */
654 int32, /* ipc_thread_id */ 595 int32, /* ipc_thread_id */
655 int32, /* ipc_response_id */ 596 int32, /* ipc_response_id */
656 content::IndexedDBKeyRange, /* key */ 597 content::IndexedDBKeyRange, /* key */
657 int32) /* ipc_transaction_id */ 598 int32) /* ipc_transaction_id */
658 599
659 // WebIDBIndex::~WebIDBIndex() message. 600 // WebIDBIndex::~WebIDBIndex() message.
660 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_IndexDestroyed, 601 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_IndexDestroyed,
661 int32) /* ipc_index_id */ 602 int32) /* ipc_index_id */
662 603
663 // WebIDBObjectStore::get() message.
664 IPC_MESSAGE_CONTROL5(IndexedDBHostMsg_ObjectStoreGet,
665 int32, /* ipc_object_store_id */
666 int32, /* ipc_thread_id */
667 int32, /* ipc_response_id */
668 content::IndexedDBKeyRange, /* key_range */
669 int32) /* ipc_transaction_id */
670
671 // WebIDBObjectStore::put() message.
672 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_ObjectStorePut,
673 IndexedDBHostMsg_ObjectStorePut_Params)
674
675 // WebIDBObjectStore::setIndexKeys() message.
676 IPC_MESSAGE_CONTROL5(IndexedDBHostMsg_ObjectStoreSetIndexKeys,
677 int32, /* ipc_object_store_id */
678 content::IndexedDBKey, /* primary_key */
679 std::vector<int64>, /* index_ids */
680 std::vector<std::vector<content::IndexedDBKey> >,
681 /* index_keys */
682 int32 /* ipc_transaction_id */)
683
684 // WebIDBObjectStore::setIndexesReady() message.
685 IPC_MESSAGE_CONTROL3(IndexedDBHostMsg_ObjectStoreSetIndexesReady,
686 int32, /* ipc_object_store_id */
687 std::vector<int64>, /* index_names */
688 int32 /* ipc_transaction_id */)
689
690 // WebIDBObjectStore::delete() message.
691 IPC_MESSAGE_CONTROL5(IndexedDBHostMsg_ObjectStoreDelete,
692 int32, /* ipc_object_store_id */
693 int32, /* ipc_thread_id */
694 int32, /* ipc_response_id */
695 content::IndexedDBKeyRange, /* key_range */
696 int32) /* ipc_transaction_id */
697
698 // WebIDBObjectStore::clear() message.
699 IPC_MESSAGE_CONTROL4(IndexedDBHostMsg_ObjectStoreClear,
700 int32, /* ipc_object_store_id */
701 int32, /* ipc_thread_id */
702 int32, /* ipc_response_id */
703 int32) /* ipc_transaction_id */
704
705 // WebIDBObjectStore::createIndex() message.
706 IPC_SYNC_MESSAGE_CONTROL1_2(IndexedDBHostMsg_ObjectStoreCreateIndex,
707 IndexedDBHostMsg_ObjectStoreCreateIndex_Params,
708 int32, /* ipc_index_id */
709 WebKit::WebExceptionCode /* ec */)
710
711 // WebIDBObjectStore::index() message.
712 IPC_SYNC_MESSAGE_CONTROL2_1(IndexedDBHostMsg_ObjectStoreIndex,
713 int32, /* ipc_object_store_id */
714 int64, /* name */
715 int32) /* ipc_index_id */
716
717 // WebIDBObjectStore::deleteIndex() message.
718 IPC_SYNC_MESSAGE_CONTROL3_1(IndexedDBHostMsg_ObjectStoreDeleteIndex,
719 int32, /* ipc_object_store_id */
720 int64, /* object_store_id */
721 int32, /* ipc_transaction_id */
722 WebKit::WebExceptionCode /* ec */)
723
724 // WebIDBObjectStore::openCursor() message.
725 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_ObjectStoreOpenCursor,
726 IndexedDBHostMsg_ObjectStoreOpenCursor_Params)
727
728 // WebIDBObjectStore::count() message.
729 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_ObjectStoreCount,
730 IndexedDBHostMsg_ObjectStoreCount_Params)
731
732 // WebIDBObjectStore::~WebIDBObjectStore() message.
733 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_ObjectStoreDestroyed,
734 int32 /* ipc_object_store_id */)
735 604
736 // WebIDBDatabase::~WebIDBCursor() message. 605 // WebIDBDatabase::~WebIDBCursor() message.
737 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_CursorDestroyed, 606 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_CursorDestroyed,
738 int32 /* ipc_cursor_id */) 607 int32 /* ipc_cursor_id */)
739 608
740 // IDBTransaction::ObjectStore message.
741 IPC_SYNC_MESSAGE_CONTROL2_2(IndexedDBHostMsg_TransactionObjectStore,
742 int32, /* ipc_transaction_id */
743 int64, /* id */
744 int32, /* ipc_object_store_id */
745 WebKit::WebExceptionCode /* ec */)
746
747 // WebIDBTransaction::commit() message. 609 // WebIDBTransaction::commit() message.
748 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionCommit, 610 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionCommit,
749 int32 /* ipc_transaction_id */) 611 int32 /* ipc_transaction_id */)
750 612
751 // WebIDBTransaction::abort() message. 613 // WebIDBTransaction::abort() message.
752 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionAbort, 614 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionAbort,
753 int32 /* ipc_transaction_id */) 615 int32 /* ipc_transaction_id */)
754 616
755 // IDBTransaction::DidCompleteTaskEvents() message. 617 // IDBTransaction::DidCompleteTaskEvents() message.
756 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDidCompleteTaskEvents, 618 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDidCompleteTaskEvents,
757 int32 /* ipc_transaction_id */) 619 int32 /* ipc_transaction_id */)
758 620
759 // WebIDBTransaction::~WebIDBTransaction() message. 621 // WebIDBTransaction::~WebIDBTransaction() message.
760 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDestroyed, 622 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDestroyed,
761 int32 /* ipc_transaction_id */) 623 int32 /* ipc_transaction_id */)
OLDNEW
« no previous file with comments | « content/common/indexed_db/indexed_db_dispatcher_unittest.cc ('k') | content/common/indexed_db/proxy_webidbdatabase_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698