| 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 002b61fe03a86ff0d6d3a579691bbca8d5981615..45ecd188b67663876d9dbc8de448c5adeca1dcb3 100644
|
| --- a/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp
|
| @@ -87,6 +87,7 @@ WebSharedWorkerImpl::WebSharedWorkerImpl(WebSharedWorkerClient* client)
|
| , m_client(client)
|
| , m_pauseWorkerContextOnStart(false)
|
| , m_isPausedOnStart(false)
|
| + , m_creationAddressSpace(WebAddressSpacePublic)
|
| {
|
| }
|
|
|
| @@ -178,6 +179,7 @@ void WebSharedWorkerImpl::didFinishDocumentLoad(WebLocalFrame* frame, bool)
|
| *m_loadingDocument.get(),
|
| m_url,
|
| DenyCrossOriginRequests,
|
| + m_creationAddressSpace,
|
| bind(&WebSharedWorkerImpl::didReceiveScriptLoaderResponse, this),
|
| bind(&WebSharedWorkerImpl::onScriptLoaderFinished, this));
|
| // Do nothing here since onScriptLoaderFinished() might have been already
|
| @@ -292,10 +294,11 @@ void WebSharedWorkerImpl::connectTask(PassOwnPtr<WebMessagePortChannel> channel,
|
| workerGlobalScope->dispatchEvent(createConnectEvent(port));
|
| }
|
|
|
| -void WebSharedWorkerImpl::startWorkerContext(const WebURL& url, const WebString& name, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType policyType)
|
| +void WebSharedWorkerImpl::startWorkerContext(const WebURL& url, const WebString& name, const WebString& contentSecurityPolicy, WebContentSecurityPolicyType policyType, WebAddressSpace creationAddressSpace)
|
| {
|
| m_url = url;
|
| m_name = name;
|
| + m_creationAddressSpace = creationAddressSpace;
|
| initializeLoader();
|
| }
|
|
|
|
|