| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 // Defines messages between the browser and worker process, as well as between | 5 // Defines messages between the browser and worker process, as well as between |
| 6 // the renderer and worker process. | 6 // the renderer and worker process. |
| 7 | 7 |
| 8 // Multiply-included message file, hence no include guard. | 8 // Multiply-included message file, hence no include guard. |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| 11 #include <utility> | 11 #include <utility> |
| 12 #include <vector> | 12 #include <vector> |
| 13 | 13 |
| 14 #include "base/basictypes.h" | 14 #include "base/basictypes.h" |
| 15 #include "base/string16.h" | 15 #include "base/string16.h" |
| 16 #include "content/common/content_export.h" |
| 16 #include "googleurl/src/gurl.h" | 17 #include "googleurl/src/gurl.h" |
| 17 #include "ipc/ipc_message_macros.h" | 18 #include "ipc/ipc_message_macros.h" |
| 18 #include "ipc/ipc_message_utils.h" | 19 #include "ipc/ipc_message_utils.h" |
| 19 | 20 |
| 20 // Singly-included section, not converted. | 21 // Singly-included section, not converted. |
| 21 #ifndef CONTENT_COMMON_WORKER_MESSAGES_H_ | 22 #ifndef CONTENT_COMMON_WORKER_MESSAGES_H_ |
| 22 #define CONTENT_COMMON_WORKER_MESSAGES_H_ | 23 #define CONTENT_COMMON_WORKER_MESSAGES_H_ |
| 23 | 24 |
| 24 typedef std::pair<string16, std::vector<int> > QueuedMessage; | 25 typedef std::pair<string16, std::vector<int> > QueuedMessage; |
| 25 | 26 |
| 26 #endif // CONTENT_COMMON_WORKER_MESSAGES_H_ | 27 #endif // CONTENT_COMMON_WORKER_MESSAGES_H_ |
| 27 | 28 |
| 29 #undef IPC_MESSAGE_EXPORT |
| 30 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 28 #define IPC_MESSAGE_START WorkerMsgStart | 31 #define IPC_MESSAGE_START WorkerMsgStart |
| 29 | 32 |
| 30 // Parameters structure for WorkerHostMsg_PostConsoleMessageToWorkerObject, | 33 // Parameters structure for WorkerHostMsg_PostConsoleMessageToWorkerObject, |
| 31 // which has too many data parameters to be reasonably put in a predefined | 34 // which has too many data parameters to be reasonably put in a predefined |
| 32 // IPC message. The data members directly correspond to parameters of | 35 // IPC message. The data members directly correspond to parameters of |
| 33 // WebWorkerClient::postConsoleMessageToWorkerObject() | 36 // WebWorkerClient::postConsoleMessageToWorkerObject() |
| 34 IPC_STRUCT_BEGIN(WorkerHostMsg_PostConsoleMessageToWorkerObject_Params) | 37 IPC_STRUCT_BEGIN(WorkerHostMsg_PostConsoleMessageToWorkerObject_Params) |
| 35 IPC_STRUCT_MEMBER(int, source_identifier) | 38 IPC_STRUCT_MEMBER(int, source_identifier) |
| 36 IPC_STRUCT_MEMBER(int, message_type) | 39 IPC_STRUCT_MEMBER(int, message_type) |
| 37 IPC_STRUCT_MEMBER(int, message_level) | 40 IPC_STRUCT_MEMBER(int, message_level) |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ConfirmMessageFromWorkerObject, | 173 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ConfirmMessageFromWorkerObject, |
| 171 bool /* bool has_pending_activity */) | 174 bool /* bool has_pending_activity */) |
| 172 | 175 |
| 173 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ReportPendingActivity, | 176 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ReportPendingActivity, |
| 174 bool /* bool has_pending_activity */) | 177 bool /* bool has_pending_activity */) |
| 175 | 178 |
| 176 IPC_MESSAGE_CONTROL1(WorkerHostMsg_WorkerContextClosed, | 179 IPC_MESSAGE_CONTROL1(WorkerHostMsg_WorkerContextClosed, |
| 177 int /* worker_route_id */) | 180 int /* worker_route_id */) |
| 178 IPC_MESSAGE_ROUTED0(WorkerHostMsg_WorkerContextDestroyed) | 181 IPC_MESSAGE_ROUTED0(WorkerHostMsg_WorkerContextDestroyed) |
| 179 | 182 |
| OLD | NEW |