OLD | NEW |
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 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 | 304 |
305 void WebSharedWorkerImpl::connect(WebMessagePortChannel* webChannel) | 305 void WebSharedWorkerImpl::connect(WebMessagePortChannel* webChannel) |
306 { | 306 { |
307 workerThread()->runLoop().postTask( | 307 workerThread()->runLoop().postTask( |
308 createCallbackTask(&connectTask, adoptPtr(webChannel))); | 308 createCallbackTask(&connectTask, adoptPtr(webChannel))); |
309 } | 309 } |
310 | 310 |
311 void WebSharedWorkerImpl::connectTask(ExecutionContext* context, PassOwnPtr<WebM
essagePortChannel> channel) | 311 void WebSharedWorkerImpl::connectTask(ExecutionContext* context, PassOwnPtr<WebM
essagePortChannel> channel) |
312 { | 312 { |
313 // Wrap the passed-in channel in a MessagePort, and send it off via a connec
t event. | 313 // Wrap the passed-in channel in a MessagePort, and send it off via a connec
t event. |
314 RefPtr<MessagePort> port = MessagePort::create(*context); | 314 RefPtrWillBeRawPtr<MessagePort> port = MessagePort::create(*context); |
315 port->entangle(channel); | 315 port->entangle(channel); |
316 WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context); | 316 WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context); |
317 ASSERT_WITH_SECURITY_IMPLICATION(workerGlobalScope->isSharedWorkerGlobalScop
e()); | 317 ASSERT_WITH_SECURITY_IMPLICATION(workerGlobalScope->isSharedWorkerGlobalScop
e()); |
318 workerGlobalScope->dispatchEvent(createConnectEvent(port)); | 318 workerGlobalScope->dispatchEvent(createConnectEvent(port.release())); |
319 } | 319 } |
320 | 320 |
321 void WebSharedWorkerImpl::startWorkerContext(const WebURL& url, const WebString&
name, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType poli
cyType) | 321 void WebSharedWorkerImpl::startWorkerContext(const WebURL& url, const WebString&
name, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType poli
cyType) |
322 { | 322 { |
323 m_url = url; | 323 m_url = url; |
324 m_name = name; | 324 m_name = name; |
325 m_contentSecurityPolicy = contentSecurityPolicy; | 325 m_contentSecurityPolicy = contentSecurityPolicy; |
326 m_policyType = policyType; | 326 m_policyType = policyType; |
327 initializeLoader(url); | 327 initializeLoader(url); |
328 } | 328 } |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
436 workerThread()->runLoop().postDebuggerTask(createCallbackTask(dispatchOnInsp
ectorBackendTask, String(message))); | 436 workerThread()->runLoop().postDebuggerTask(createCallbackTask(dispatchOnInsp
ectorBackendTask, String(message))); |
437 WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(workerThread()); | 437 WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(workerThread()); |
438 } | 438 } |
439 | 439 |
440 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) | 440 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) |
441 { | 441 { |
442 return new WebSharedWorkerImpl(client); | 442 return new WebSharedWorkerImpl(client); |
443 } | 443 } |
444 | 444 |
445 } // namespace blink | 445 } // namespace blink |
OLD | NEW |