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

Side by Side Diff: Source/WebKit/chromium/src/WebSharedWorkerImpl.cpp

Issue 10270006: Merge 113138 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 } 313 }
314 314
315 // WorkerLoaderProxy ----------------------------------------------------------- 315 // WorkerLoaderProxy -----------------------------------------------------------
316 316
317 void WebSharedWorkerImpl::postTaskToLoader(PassOwnPtr<ScriptExecutionContext::Ta sk> task) 317 void WebSharedWorkerImpl::postTaskToLoader(PassOwnPtr<ScriptExecutionContext::Ta sk> task)
318 { 318 {
319 ASSERT(m_loadingDocument->isDocument()); 319 ASSERT(m_loadingDocument->isDocument());
320 m_loadingDocument->postTask(task); 320 m_loadingDocument->postTask(task);
321 } 321 }
322 322
323 void WebSharedWorkerImpl::postTaskForModeToWorkerContext( 323 bool WebSharedWorkerImpl::postTaskForModeToWorkerContext(
324 PassOwnPtr<ScriptExecutionContext::Task> task, const String& mode) 324 PassOwnPtr<ScriptExecutionContext::Task> task, const String& mode)
325 { 325 {
326 m_workerThread->runLoop().postTaskForMode(task, mode); 326 m_workerThread->runLoop().postTaskForMode(task, mode);
327 return true;
327 } 328 }
328 329
329 330
330 331
331 bool WebSharedWorkerImpl::isStarted() 332 bool WebSharedWorkerImpl::isStarted()
332 { 333 {
333 // Should not ever be called from the worker thread (this API is only called on WebSharedWorkerProxy on the renderer thread). 334 // Should not ever be called from the worker thread (this API is only called on WebSharedWorkerProxy on the renderer thread).
334 ASSERT_NOT_REACHED(); 335 ASSERT_NOT_REACHED();
335 return workerThread(); 336 return workerThread();
336 } 337 }
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(workerThread()); 447 WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(workerThread());
447 } 448 }
448 449
449 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) 450 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client)
450 { 451 {
451 return new WebSharedWorkerImpl(client); 452 return new WebSharedWorkerImpl(client);
452 } 453 }
453 #endif // ENABLE(SHARED_WORKERS) 454 #endif // ENABLE(SHARED_WORKERS)
454 455
455 } // namespace WebKit 456 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebSharedWorkerImpl.h ('k') | Source/WebKit/chromium/src/WebWorkerClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698