| Index: third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
|
| index 49263604c7f4b7443f369213c95eb01dc43f6c79..8ed026274878af5a53fa08718f263c6a7dab82a9 100644
|
| --- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
|
| @@ -168,17 +168,16 @@ void WebSharedWorkerImpl::loadShadowPage() {
|
| SubstituteData(buffer, "text/html", "UTF-8", KURL())));
|
| }
|
|
|
| -void WebSharedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame) {
|
| - DCHECK_EQ(frame, m_mainFrame);
|
| +void WebSharedWorkerImpl::didFinishDocumentLoad() {
|
| DCHECK(isMainThread());
|
| DCHECK(!m_loadingDocument);
|
| DCHECK(!m_mainScriptLoader);
|
| - frame->dataSource()->setServiceWorkerNetworkProvider(
|
| + m_mainFrame->dataSource()->setServiceWorkerNetworkProvider(
|
| WTF::wrapUnique(m_client->createServiceWorkerNetworkProvider()));
|
| m_mainScriptLoader = WorkerScriptLoader::create();
|
| m_mainScriptLoader->setRequestContext(
|
| WebURLRequest::RequestContextSharedWorker);
|
| - m_loadingDocument = toWebLocalFrameImpl(frame)->frame()->document();
|
| + m_loadingDocument = m_mainFrame->frame()->document();
|
|
|
| CrossOriginRequestPolicy crossOriginRequestPolicy =
|
| (static_cast<KURL>(m_url)).protocolIsData() ? AllowCrossOriginRequests
|
|
|