OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
254 m_workerThread->runLoop().postDebuggerTask(createCrossThreadTask(reconnectTo
WorkerContextInspectorTask, String(savedState))); | 254 m_workerThread->runLoop().postDebuggerTask(createCrossThreadTask(reconnectTo
WorkerContextInspectorTask, String(savedState))); |
255 } | 255 } |
256 | 256 |
257 void WebEmbeddedWorkerImpl::detachDevTools() | 257 void WebEmbeddedWorkerImpl::detachDevTools() |
258 { | 258 { |
259 m_workerThread->runLoop().postDebuggerTask(createCrossThreadTask(disconnectF
romWorkerContextInspectorTask, true)); | 259 m_workerThread->runLoop().postDebuggerTask(createCrossThreadTask(disconnectF
romWorkerContextInspectorTask, true)); |
260 } | 260 } |
261 | 261 |
262 void WebEmbeddedWorkerImpl::dispatchDevToolsMessage(const WebString& message) | 262 void WebEmbeddedWorkerImpl::dispatchDevToolsMessage(const WebString& message) |
263 { | 263 { |
| 264 if (m_askedToTerminate) |
| 265 return; |
264 m_workerThread->runLoop().postDebuggerTask(createCrossThreadTask(dispatchOnI
nspectorBackendTask, String(message))); | 266 m_workerThread->runLoop().postDebuggerTask(createCrossThreadTask(dispatchOnI
nspectorBackendTask, String(message))); |
265 WorkerDebuggerAgent::interruptAndDispatchInspectorCommands(m_workerThread.ge
t()); | 267 m_workerThread->interruptAndDispatchInspectorCommands(); |
266 } | 268 } |
267 | 269 |
268 void WebEmbeddedWorkerImpl::prepareShadowPageForLoader() | 270 void WebEmbeddedWorkerImpl::prepareShadowPageForLoader() |
269 { | 271 { |
270 // Create 'shadow page', which is never displayed and is used mainly to | 272 // Create 'shadow page', which is never displayed and is used mainly to |
271 // provide a context for loading on the main thread. | 273 // provide a context for loading on the main thread. |
272 // | 274 // |
273 // FIXME: This does mostly same as WebSharedWorkerImpl::initializeLoader. | 275 // FIXME: This does mostly same as WebSharedWorkerImpl::initializeLoader. |
274 // This code, and probably most of the code in this class should be shared | 276 // This code, and probably most of the code in this class should be shared |
275 // with SharedWorker. | 277 // with SharedWorker. |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 m_mainScriptLoader.clear(); | 361 m_mainScriptLoader.clear(); |
360 | 362 |
361 m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *toW
ebLocalFrameImpl(m_mainFrame)->frame()->document(), *m_workerContextClient); | 363 m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *toW
ebLocalFrameImpl(m_mainFrame)->frame()->document(), *m_workerContextClient); |
362 m_loaderProxy = LoaderProxy::create(*this); | 364 m_loaderProxy = LoaderProxy::create(*this); |
363 | 365 |
364 m_workerThread = ServiceWorkerThread::create(*m_loaderProxy, *m_workerGlobal
ScopeProxy, startupData.release()); | 366 m_workerThread = ServiceWorkerThread::create(*m_loaderProxy, *m_workerGlobal
ScopeProxy, startupData.release()); |
365 m_workerThread->start(); | 367 m_workerThread->start(); |
366 } | 368 } |
367 | 369 |
368 } // namespace blink | 370 } // namespace blink |
OLD | NEW |