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