Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2370)

Unified Diff: Source/web/SharedWorkerRepositoryClientImpl.cpp

Issue 102243010: Move the worker script loading code to the worker process (phase:1/5) (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/web/WebSharedWorkerImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/SharedWorkerRepositoryClientImpl.cpp
diff --git a/Source/web/SharedWorkerRepositoryClientImpl.cpp b/Source/web/SharedWorkerRepositoryClientImpl.cpp
index a519ea9ecb7008747edb40470990b6a4f5ca78f0..6010196d0714280d06eed57cc2ba703a84cefe6b 100644
--- a/Source/web/SharedWorkerRepositoryClientImpl.cpp
+++ b/Source/web/SharedWorkerRepositoryClientImpl.cpp
@@ -159,7 +159,7 @@ void SharedWorkerRepositoryClientImpl::connect(PassRefPtr<SharedWorker> worker,
// No nested workers (for now) - connect() should only be called from document context.
ASSERT(worker->executionContext()->isDocument());
Document* document = toDocument(worker->executionContext());
- OwnPtr<WebSharedWorkerConnector> webWorkerConnector = adoptPtr(m_client->createSharedWorkerConnector(url, name, getId(document)));
+ OwnPtr<WebSharedWorkerConnector> webWorkerConnector = adoptPtr(m_client->createSharedWorkerConnector(url, name, getId(document), worker->executionContext()->contentSecurityPolicy()->deprecatedHeader(), static_cast<blink::WebContentSecurityPolicyType>(worker->executionContext()->contentSecurityPolicy()->deprecatedHeaderType())));
if (!webWorkerConnector) {
// Existing worker does not match this url, so return an error back to the caller.
exceptionState.throwDOMException(URLMismatchError, "The location of the SharedWorker named '" + name + "' does not exactly match the provided URL ('" + url.elidedString() + "').");
« no previous file with comments | « no previous file | Source/web/WebSharedWorkerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698