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

Side by Side Diff: third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp

Issue 2104913002: Rename threadSafeBind() to crossThreadBind() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@TRV_CTCPointer
Patch Set: Rebase Created 4 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
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 29 matching lines...) Expand all
40 #include "core/loader/FrameLoader.h" 40 #include "core/loader/FrameLoader.h"
41 #include "core/page/Page.h" 41 #include "core/page/Page.h"
42 #include "core/workers/SharedWorkerGlobalScope.h" 42 #include "core/workers/SharedWorkerGlobalScope.h"
43 #include "core/workers/SharedWorkerThread.h" 43 #include "core/workers/SharedWorkerThread.h"
44 #include "core/workers/WorkerClients.h" 44 #include "core/workers/WorkerClients.h"
45 #include "core/workers/WorkerGlobalScope.h" 45 #include "core/workers/WorkerGlobalScope.h"
46 #include "core/workers/WorkerInspectorProxy.h" 46 #include "core/workers/WorkerInspectorProxy.h"
47 #include "core/workers/WorkerLoaderProxy.h" 47 #include "core/workers/WorkerLoaderProxy.h"
48 #include "core/workers/WorkerScriptLoader.h" 48 #include "core/workers/WorkerScriptLoader.h"
49 #include "core/workers/WorkerThreadStartupData.h" 49 #include "core/workers/WorkerThreadStartupData.h"
50 #include "platform/CrossThreadFunctional.h"
50 #include "platform/RuntimeEnabledFeatures.h" 51 #include "platform/RuntimeEnabledFeatures.h"
51 #include "platform/ThreadSafeFunctional.h"
52 #include "platform/heap/Handle.h" 52 #include "platform/heap/Handle.h"
53 #include "platform/network/ContentSecurityPolicyParsers.h" 53 #include "platform/network/ContentSecurityPolicyParsers.h"
54 #include "platform/network/ResourceResponse.h" 54 #include "platform/network/ResourceResponse.h"
55 #include "platform/weborigin/KURL.h" 55 #include "platform/weborigin/KURL.h"
56 #include "platform/weborigin/SecurityOrigin.h" 56 #include "platform/weborigin/SecurityOrigin.h"
57 #include "public/platform/Platform.h" 57 #include "public/platform/Platform.h"
58 #include "public/platform/WebFileError.h" 58 #include "public/platform/WebFileError.h"
59 #include "public/platform/WebMessagePortChannel.h" 59 #include "public/platform/WebMessagePortChannel.h"
60 #include "public/platform/WebString.h" 60 #include "public/platform/WebString.h"
61 #include "public/platform/WebURL.h" 61 #include "public/platform/WebURL.h"
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 m_mainFrame->frame()->document()->postInspectorTask(BLINK_FROM_HERE, createC rossThreadTask(&WebSharedWorkerImpl::postMessageToPageInspectorOnMainThread, cro ssThreadUnretained(this), message)); 234 m_mainFrame->frame()->document()->postInspectorTask(BLINK_FROM_HERE, createC rossThreadTask(&WebSharedWorkerImpl::postMessageToPageInspectorOnMainThread, cro ssThreadUnretained(this), message));
235 } 235 }
236 236
237 void WebSharedWorkerImpl::postMessageToPageInspectorOnMainThread(const String& m essage) 237 void WebSharedWorkerImpl::postMessageToPageInspectorOnMainThread(const String& m essage)
238 { 238 {
239 m_workerInspectorProxy->dispatchMessageFromWorker(message); 239 m_workerInspectorProxy->dispatchMessageFromWorker(message);
240 } 240 }
241 241
242 void WebSharedWorkerImpl::workerGlobalScopeClosed() 242 void WebSharedWorkerImpl::workerGlobalScopeClosed()
243 { 243 {
244 Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_H ERE, threadSafeBind(&WebSharedWorkerImpl::workerGlobalScopeClosedOnMainThread, c rossThreadUnretained(this))); 244 Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_H ERE, crossThreadBind(&WebSharedWorkerImpl::workerGlobalScopeClosedOnMainThread, crossThreadUnretained(this)));
245 } 245 }
246 246
247 void WebSharedWorkerImpl::workerGlobalScopeClosedOnMainThread() 247 void WebSharedWorkerImpl::workerGlobalScopeClosedOnMainThread()
248 { 248 {
249 m_client->workerContextClosed(); 249 m_client->workerContextClosed();
250 250
251 terminateWorkerThread(); 251 terminateWorkerThread();
252 } 252 }
253 253
254 void WebSharedWorkerImpl::workerGlobalScopeStarted(WorkerGlobalScope*) 254 void WebSharedWorkerImpl::workerGlobalScopeStarted(WorkerGlobalScope*)
255 { 255 {
256 } 256 }
257 257
258 void WebSharedWorkerImpl::workerThreadTerminated() 258 void WebSharedWorkerImpl::workerThreadTerminated()
259 { 259 {
260 Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_H ERE, threadSafeBind(&WebSharedWorkerImpl::workerThreadTerminatedOnMainThread, cr ossThreadUnretained(this))); 260 Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_H ERE, crossThreadBind(&WebSharedWorkerImpl::workerThreadTerminatedOnMainThread, c rossThreadUnretained(this)));
261 } 261 }
262 262
263 void WebSharedWorkerImpl::workerThreadTerminatedOnMainThread() 263 void WebSharedWorkerImpl::workerThreadTerminatedOnMainThread()
264 { 264 {
265 m_client->workerContextDestroyed(); 265 m_client->workerContextDestroyed();
266 // The lifetime of this proxy is controlled by the worker context. 266 // The lifetime of this proxy is controlled by the worker context.
267 delete this; 267 delete this;
268 } 268 }
269 269
270 // WorkerLoaderProxyProvider --------------------------------------------------- -------- 270 // WorkerLoaderProxyProvider --------------------------------------------------- --------
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 if (devtoolsAgent) 399 if (devtoolsAgent)
400 devtoolsAgent->dispatchOnInspectorBackend(sessionId, callId, method, mes sage); 400 devtoolsAgent->dispatchOnInspectorBackend(sessionId, callId, method, mes sage);
401 } 401 }
402 402
403 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) 403 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client)
404 { 404 {
405 return new WebSharedWorkerImpl(client); 405 return new WebSharedWorkerImpl(client);
406 } 406 }
407 407
408 } // namespace blink 408 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebDevToolsAgentImpl.cpp ('k') | third_party/WebKit/Source/web/tests/SpinLockTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698