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

Side by Side Diff: webkit/glue/webworker_impl.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 | « webkit/glue/webworker_impl.h ('k') | webkit/glue/webworkerclient_impl.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 "config.h" 5 #include "config.h"
6 6
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 8
9 #include "GenericWorkerTask.h" 9 #include "GenericWorkerTask.h"
10 #include "KURL.h" 10 #include "KURL.h"
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
270 const WebCore::String& source_url) { 270 const WebCore::String& source_url) {
271 this_ptr->client_->postExceptionToWorkerObject( 271 this_ptr->client_->postExceptionToWorkerObject(
272 webkit_glue::StringToWebString(error_message), 272 webkit_glue::StringToWebString(error_message),
273 line_number, 273 line_number,
274 webkit_glue::StringToWebString(source_url)); 274 webkit_glue::StringToWebString(source_url));
275 } 275 }
276 276
277 void WebWorkerImpl::postConsoleMessageToWorkerObject( 277 void WebWorkerImpl::postConsoleMessageToWorkerObject(
278 WebCore::MessageDestination destination, 278 WebCore::MessageDestination destination,
279 WebCore::MessageSource source, 279 WebCore::MessageSource source,
280 WebCore::MessageType type,
280 WebCore::MessageLevel level, 281 WebCore::MessageLevel level,
281 const WebCore::String& message, 282 const WebCore::String& message,
282 int line_number, 283 int line_number,
283 const WebCore::String& source_url) { 284 const WebCore::String& source_url) {
284 DispatchTaskToMainThread(WebCore::createCallbackTask( 285 DispatchTaskToMainThread(WebCore::createCallbackTask(
285 &PostConsoleMessageTask, 286 &PostConsoleMessageTask,
286 this, 287 this,
287 static_cast<int>(destination), 288 static_cast<int>(destination),
288 static_cast<int>(source), 289 static_cast<int>(source),
290 static_cast<int>(type),
289 static_cast<int>(level), 291 static_cast<int>(level),
290 message, 292 message,
291 line_number, 293 line_number,
292 source_url)); 294 source_url));
293 } 295 }
294 296
295 void WebWorkerImpl::PostConsoleMessageTask( 297 void WebWorkerImpl::PostConsoleMessageTask(
296 WebCore::ScriptExecutionContext* context, 298 WebCore::ScriptExecutionContext* context,
297 WebWorkerImpl* this_ptr, 299 WebWorkerImpl* this_ptr,
298 int destination, 300 int destination,
299 int source, 301 int source,
302 int type,
300 int level, 303 int level,
301 const WebCore::String& message, 304 const WebCore::String& message,
302 int line_number, 305 int line_number,
303 const WebCore::String& source_url) { 306 const WebCore::String& source_url) {
304 this_ptr->client_->postConsoleMessageToWorkerObject( 307 this_ptr->client_->postConsoleMessageToWorkerObject(
305 destination, 308 destination,
306 source, 309 source,
310 type,
307 level, 311 level,
308 webkit_glue::StringToWebString(message), 312 webkit_glue::StringToWebString(message),
309 line_number, 313 line_number,
310 webkit_glue::StringToWebString(source_url)); 314 webkit_glue::StringToWebString(source_url));
311 } 315 }
312 316
313 void WebWorkerImpl::confirmMessageFromWorkerObject(bool has_pending_activity) { 317 void WebWorkerImpl::confirmMessageFromWorkerObject(bool has_pending_activity) {
314 DispatchTaskToMainThread(WebCore::createCallbackTask( 318 DispatchTaskToMainThread(WebCore::createCallbackTask(
315 &ConfirmMessageTask, 319 &ConfirmMessageTask,
316 this, 320 this,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 375
372 namespace WebKit { 376 namespace WebKit {
373 377
374 WebWorker* WebWorker::create(WebWorkerClient* client) { 378 WebWorker* WebWorker::create(WebWorkerClient* client) {
375 return NULL; 379 return NULL;
376 } 380 }
377 381
378 } 382 }
379 383
380 #endif 384 #endif
OLDNEW
« no previous file with comments | « webkit/glue/webworker_impl.h ('k') | webkit/glue/webworkerclient_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698