| Index: Source/core/page/EventSource.cpp
|
| diff --git a/Source/core/page/EventSource.cpp b/Source/core/page/EventSource.cpp
|
| index 38e5d5deb3877a0af7332614024d4dc2483abc0f..f301fadcfc0a1dcb47e45f7bf66e52dcd56e2b89 100644
|
| --- a/Source/core/page/EventSource.cpp
|
| +++ b/Source/core/page/EventSource.cpp
|
| @@ -86,12 +86,12 @@ PassRefPtrWillBeRawPtr<EventSource> EventSource::create(ExecutionContext* contex
|
| }
|
|
|
| // FIXME: Convert this to check the isolated world's Content Security Policy once webkit.org/b/104520 is solved.
|
| - bool shouldBypassMainWorldContentSecurityPolicy = false;
|
| + bool shouldBypassMainWorldCSP = false;
|
| if (context->isDocument()) {
|
| Document* document = toDocument(context);
|
| - shouldBypassMainWorldContentSecurityPolicy = document->frame()->script().shouldBypassMainWorldContentSecurityPolicy();
|
| + shouldBypassMainWorldCSP = document->frame()->script().shouldBypassMainWorldCSP();
|
| }
|
| - if (!shouldBypassMainWorldContentSecurityPolicy && !context->contentSecurityPolicy()->allowConnectToSource(fullURL)) {
|
| + if (!shouldBypassMainWorldCSP && !context->contentSecurityPolicy()->allowConnectToSource(fullURL)) {
|
| // We can safely expose the URL to JavaScript, as this exception is generate synchronously before any redirects take place.
|
| exceptionState.throwSecurityError("Refused to connect to '" + fullURL.elidedString() + "' because it violates the document's Content Security Policy.");
|
| return nullptr;
|
|
|