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

Side by Side Diff: chrome/worker/webworkerclient_proxy.cc

Issue 149575: Roll WebKit DEPS from 45738 to 45840. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/worker/webworkerclient_proxy.h ('k') | webkit/api/public/WebWorkerClient.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chrome/worker/webworkerclient_proxy.h" 5 #include "chrome/worker/webworkerclient_proxy.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/common/child_process.h" 8 #include "chrome/common/child_process.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/common/ipc_logging.h" 10 #include "chrome/common/ipc_logging.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 const WebString& error_message, 86 const WebString& error_message,
87 int line_number, 87 int line_number,
88 const WebString& source_url) { 88 const WebString& source_url) {
89 Send(new WorkerHostMsg_PostExceptionToWorkerObject( 89 Send(new WorkerHostMsg_PostExceptionToWorkerObject(
90 route_id_, error_message, line_number, source_url)); 90 route_id_, error_message, line_number, source_url));
91 } 91 }
92 92
93 void WebWorkerClientProxy::postConsoleMessageToWorkerObject( 93 void WebWorkerClientProxy::postConsoleMessageToWorkerObject(
94 int destination, 94 int destination,
95 int source, 95 int source,
96 int type,
96 int level, 97 int level,
97 const WebString& message, 98 const WebString& message,
98 int line_number, 99 int line_number,
99 const WebString& source_url) { 100 const WebString& source_url) {
100 Send(new WorkerHostMsg_PostConsoleMessageToWorkerObject( 101 Send(new WorkerHostMsg_PostConsoleMessageToWorkerObject(
101 route_id_, destination, source, level,message, line_number, source_url)); 102 route_id_, destination, source, type, level,
103 message, line_number, source_url));
102 } 104 }
103 105
104 void WebWorkerClientProxy::confirmMessageFromWorkerObject( 106 void WebWorkerClientProxy::confirmMessageFromWorkerObject(
105 bool has_pending_activity) { 107 bool has_pending_activity) {
106 Send(new WorkerHostMsg_ConfirmMessageFromWorkerObject( 108 Send(new WorkerHostMsg_ConfirmMessageFromWorkerObject(
107 route_id_, has_pending_activity)); 109 route_id_, has_pending_activity));
108 } 110 }
109 111
110 void WebWorkerClientProxy::reportPendingActivity(bool has_pending_activity) { 112 void WebWorkerClientProxy::reportPendingActivity(bool has_pending_activity) {
111 Send(new WorkerHostMsg_ReportPendingActivity( 113 Send(new WorkerHostMsg_ReportPendingActivity(
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 switches::kWebWorkerShareProcesses)) { 153 switches::kWebWorkerShareProcesses)) {
152 // Can't kill the process since there could be workers from other 154 // Can't kill the process since there could be workers from other
153 // renderer process. 155 // renderer process.
154 NOTIMPLEMENTED(); 156 NOTIMPLEMENTED();
155 return; 157 return;
156 } 158 }
157 159
158 MessageLoop::current()->PostDelayedTask(FROM_HERE, 160 MessageLoop::current()->PostDelayedTask(FROM_HERE,
159 new KillProcessTask(this), kMaxTimeForRunawayWorkerMs); 161 new KillProcessTask(this), kMaxTimeForRunawayWorkerMs);
160 } 162 }
OLDNEW
« no previous file with comments | « chrome/worker/webworkerclient_proxy.h ('k') | webkit/api/public/WebWorkerClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698