OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 #include <utility> | 5 #include <utility> |
6 #include <vector> | 6 #include <vector> |
7 #include "base/string16.h" | 7 #include "base/string16.h" |
8 #include "googleurl/src/gurl.h" | 8 #include "googleurl/src/gurl.h" |
9 #include "ipc/ipc_message_macros.h" | 9 #include "ipc/ipc_message_macros.h" |
10 | 10 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 string16 /* user_agent */, | 87 string16 /* user_agent */, |
88 string16 /* source_code */) | 88 string16 /* source_code */) |
89 | 89 |
90 IPC_MESSAGE_ROUTED0(WorkerMsg_TerminateWorkerContext) | 90 IPC_MESSAGE_ROUTED0(WorkerMsg_TerminateWorkerContext) |
91 | 91 |
92 IPC_MESSAGE_ROUTED3(WorkerMsg_PostMessage, | 92 IPC_MESSAGE_ROUTED3(WorkerMsg_PostMessage, |
93 string16 /* message */, | 93 string16 /* message */, |
94 std::vector<int> /* sent_message_port_ids */, | 94 std::vector<int> /* sent_message_port_ids */, |
95 std::vector<int> /* new_routing_ids */) | 95 std::vector<int> /* new_routing_ids */) |
96 | 96 |
| 97 IPC_MESSAGE_ROUTED2(WorkerMsg_Connect, |
| 98 int /* sent_message_port_id */, |
| 99 int /* routing_id */) |
| 100 |
97 IPC_MESSAGE_ROUTED0(WorkerMsg_WorkerObjectDestroyed) | 101 IPC_MESSAGE_ROUTED0(WorkerMsg_WorkerObjectDestroyed) |
98 IPC_END_MESSAGES(Worker) | 102 IPC_END_MESSAGES(Worker) |
99 | 103 |
100 | 104 |
101 //----------------------------------------------------------------------------- | 105 //----------------------------------------------------------------------------- |
102 // WorkerHost messages | 106 // WorkerHost messages |
103 // These are messages sent from the worker process to the renderer process. | 107 // These are messages sent from the worker process to the renderer process. |
104 IPC_BEGIN_MESSAGES(WorkerHost) | 108 IPC_BEGIN_MESSAGES(WorkerHost) |
105 // WorkerMsg_PostMessage is also sent here. | 109 // WorkerMsg_PostMessage is also sent here. |
106 IPC_MESSAGE_ROUTED3(WorkerHostMsg_PostExceptionToWorkerObject, | 110 IPC_MESSAGE_ROUTED3(WorkerHostMsg_PostExceptionToWorkerObject, |
107 string16 /* error_message */, | 111 string16 /* error_message */, |
108 int /* line_number */, | 112 int /* line_number */, |
109 string16 /* source_url*/) | 113 string16 /* source_url*/) |
110 | 114 |
111 IPC_MESSAGE_ROUTED1(WorkerHostMsg_PostConsoleMessageToWorkerObject, | 115 IPC_MESSAGE_ROUTED1(WorkerHostMsg_PostConsoleMessageToWorkerObject, |
112 WorkerHostMsg_PostConsoleMessageToWorkerObject_Params) | 116 WorkerHostMsg_PostConsoleMessageToWorkerObject_Params) |
113 | 117 |
114 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ConfirmMessageFromWorkerObject, | 118 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ConfirmMessageFromWorkerObject, |
115 bool /* bool has_pending_activity */) | 119 bool /* bool has_pending_activity */) |
116 | 120 |
117 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ReportPendingActivity, | 121 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ReportPendingActivity, |
118 bool /* bool has_pending_activity */) | 122 bool /* bool has_pending_activity */) |
119 | 123 |
120 IPC_MESSAGE_ROUTED0(WorkerHostMsg_WorkerContextDestroyed) | 124 IPC_MESSAGE_ROUTED0(WorkerHostMsg_WorkerContextDestroyed) |
121 IPC_END_MESSAGES(WorkerHost) | 125 IPC_END_MESSAGES(WorkerHost) |
OLD | NEW |