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

Side by Side Diff: branches/1650/src/content/common/worker_messages.h

Issue 103243002: Revert 238433 "Merge 233099 "Kill worker process by way of a syn..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years 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 | Annotate | Revision Log
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 // 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>
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 GURL /* origin url */, 135 GURL /* origin url */,
136 bool /* result */) 136 bool /* result */)
137 137
138 // Sent by the worker process to check whether access to IndexedDB is allowed. 138 // Sent by the worker process to check whether access to IndexedDB is allowed.
139 IPC_SYNC_MESSAGE_CONTROL3_1(WorkerProcessHostMsg_AllowIndexedDB, 139 IPC_SYNC_MESSAGE_CONTROL3_1(WorkerProcessHostMsg_AllowIndexedDB,
140 int /* worker_route_id */, 140 int /* worker_route_id */,
141 GURL /* origin url */, 141 GURL /* origin url */,
142 string16 /* database name */, 142 string16 /* database name */,
143 bool /* result */) 143 bool /* result */)
144 144
145 // Sent by the worker process to request being killed.
146 IPC_SYNC_MESSAGE_CONTROL0_0(WorkerProcessHostMsg_ForceKillWorker);
147
148
149 //----------------------------------------------------------------------------- 145 //-----------------------------------------------------------------------------
150 // Worker messages 146 // Worker messages
151 // These are messages sent from the renderer process to the worker process. 147 // These are messages sent from the renderer process to the worker process.
152 IPC_MESSAGE_ROUTED5(WorkerMsg_StartWorkerContext, 148 IPC_MESSAGE_ROUTED5(WorkerMsg_StartWorkerContext,
153 GURL /* url */, 149 GURL /* url */,
154 string16 /* user_agent */, 150 string16 /* user_agent */,
155 string16 /* source_code */, 151 string16 /* source_code */,
156 string16 /* content_security_policy */, 152 string16 /* content_security_policy */,
157 WebKit::WebContentSecurityPolicyType) 153 WebKit::WebContentSecurityPolicyType)
158 154
(...skipping 25 matching lines...) Expand all
184 180
185 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ConfirmMessageFromWorkerObject, 181 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ConfirmMessageFromWorkerObject,
186 bool /* bool has_pending_activity */) 182 bool /* bool has_pending_activity */)
187 183
188 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ReportPendingActivity, 184 IPC_MESSAGE_ROUTED1(WorkerHostMsg_ReportPendingActivity,
189 bool /* bool has_pending_activity */) 185 bool /* bool has_pending_activity */)
190 186
191 IPC_MESSAGE_CONTROL1(WorkerHostMsg_WorkerContextClosed, 187 IPC_MESSAGE_CONTROL1(WorkerHostMsg_WorkerContextClosed,
192 int /* worker_route_id */) 188 int /* worker_route_id */)
193 IPC_MESSAGE_ROUTED0(WorkerHostMsg_WorkerContextDestroyed) 189 IPC_MESSAGE_ROUTED0(WorkerHostMsg_WorkerContextDestroyed)
OLDNEW
« no previous file with comments | « branches/1650/src/content/browser/worker_host/worker_process_host.cc ('k') | branches/1650/src/content/worker/worker_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698