| 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 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 306 { | 306 { |
| 307 // Construct substitute data source for the 'shadow page'. We only need it | 307 // Construct substitute data source for the 'shadow page'. We only need it |
| 308 // to have same origin as the worker so the loading checks work correctly. | 308 // to have same origin as the worker so the loading checks work correctly. |
| 309 CString content(""); | 309 CString content(""); |
| 310 RefPtr<SharedBuffer> buffer(SharedBuffer::create(content.data(), content.len
gth())); | 310 RefPtr<SharedBuffer> buffer(SharedBuffer::create(content.data(), content.len
gth())); |
| 311 m_loadingShadowPage = true; | 311 m_loadingShadowPage = true; |
| 312 m_mainFrame->frame()->loader().load(FrameLoadRequest(0, ResourceRequest(m_wo
rkerStartData.scriptURL), SubstituteData(buffer, "text/html", "UTF-8", KURL())))
; | 312 m_mainFrame->frame()->loader().load(FrameLoadRequest(0, ResourceRequest(m_wo
rkerStartData.scriptURL), SubstituteData(buffer, "text/html", "UTF-8", KURL())))
; |
| 313 } | 313 } |
| 314 | 314 |
| 315 void WebEmbeddedWorkerImpl::willSendRequest( | 315 void WebEmbeddedWorkerImpl::willSendRequest( |
| 316 WebLocalFrame* frame, unsigned, WebURLRequest& request, | 316 WebLocalFrame* frame, WebURLRequest& request) |
| 317 const WebURLResponse& redirectResponse) | |
| 318 { | 317 { |
| 319 if (m_networkProvider) | 318 if (m_networkProvider) |
| 320 m_networkProvider->willSendRequest(frame->dataSource(), request); | 319 m_networkProvider->willSendRequest(frame->dataSource(), request); |
| 321 } | 320 } |
| 322 | 321 |
| 323 void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame) | 322 void WebEmbeddedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame) |
| 324 { | 323 { |
| 325 DCHECK(!m_mainScriptLoader); | 324 DCHECK(!m_mainScriptLoader); |
| 326 DCHECK(!m_networkProvider); | 325 DCHECK(!m_networkProvider); |
| 327 DCHECK(m_mainFrame); | 326 DCHECK(m_mainFrame); |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 437 m_mainScriptLoader.clear(); | 436 m_mainScriptLoader.clear(); |
| 438 | 437 |
| 439 m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *doc
ument, *m_workerContextClient); | 438 m_workerGlobalScopeProxy = ServiceWorkerGlobalScopeProxy::create(*this, *doc
ument, *m_workerContextClient); |
| 440 m_loaderProxy = WorkerLoaderProxy::create(this); | 439 m_loaderProxy = WorkerLoaderProxy::create(this); |
| 441 m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalS
copeProxy); | 440 m_workerThread = ServiceWorkerThread::create(m_loaderProxy, *m_workerGlobalS
copeProxy); |
| 442 m_workerThread->start(std::move(startupData)); | 441 m_workerThread->start(std::move(startupData)); |
| 443 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(),
scriptURL); | 442 m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(),
scriptURL); |
| 444 } | 443 } |
| 445 | 444 |
| 446 } // namespace blink | 445 } // namespace blink |
| OLD | NEW |