| 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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 } | 269 } |
| 270 | 270 |
| 271 void WebEmbeddedWorkerImpl::willSendRequest( | 271 void WebEmbeddedWorkerImpl::willSendRequest( |
| 272 WebLocalFrame* frame, unsigned, WebURLRequest& request, | 272 WebLocalFrame* frame, unsigned, WebURLRequest& request, |
| 273 const WebURLResponse& redirectResponse) | 273 const WebURLResponse& redirectResponse) |
| 274 { | 274 { |
| 275 if (m_networkProvider) | 275 if (m_networkProvider) |
| 276 m_networkProvider->willSendRequest(frame->dataSource(), request); | 276 m_networkProvider->willSendRequest(frame->dataSource(), request); |
| 277 } | 277 } |
| 278 | 278 |
| 279 void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame, bool) | 279 void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame) |
| 280 { | 280 { |
| 281 ASSERT(!m_mainScriptLoader); | 281 ASSERT(!m_mainScriptLoader); |
| 282 ASSERT(!m_networkProvider); | 282 ASSERT(!m_networkProvider); |
| 283 ASSERT(m_mainFrame); | 283 ASSERT(m_mainFrame); |
| 284 ASSERT(m_workerContextClient); | 284 ASSERT(m_workerContextClient); |
| 285 ASSERT(m_loadingShadowPage); | 285 ASSERT(m_loadingShadowPage); |
| 286 ASSERT(!m_askedToTerminate); | 286 ASSERT(!m_askedToTerminate); |
| 287 m_loadingShadowPage = false; | 287 m_loadingShadowPage = false; |
| 288 m_networkProvider = adoptPtr(m_workerContextClient->createServiceWorkerNetwo
rkProvider(frame->dataSource())); | 288 m_networkProvider = adoptPtr(m_workerContextClient->createServiceWorkerNetwo
rkProvider(frame->dataSource())); |
| 289 m_mainScriptLoader = WorkerScriptLoader::create(); | 289 m_mainScriptLoader = WorkerScriptLoader::create(); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 376 m_mainScriptLoader.clear(); | 376 m_mainScriptLoader.clear(); |
| 377 | 377 |
| 378 m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *doc
ument, *m_workerContextClient); | 378 m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *doc
ument, *m_workerContextClient); |
| 379 m_loaderProxy = WorkerLoaderProxy::create(this); | 379 m_loaderProxy = WorkerLoaderProxy::create(this); |
| 380 m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalS
copeProxy); | 380 m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalS
copeProxy); |
| 381 m_workerThread->start(startupData.release()); | 381 m_workerThread->start(startupData.release()); |
| 382 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(),
scriptURL); | 382 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(),
scriptURL); |
| 383 } | 383 } |
| 384 | 384 |
| 385 } // namespace blink | 385 } // namespace blink |
| OLD | NEW |