Source/core/page/EventSource.cpp - Issue 785933005: Check that ExecutionContext and LocalFrame pointers are not null before getting shouldBypassMainWor…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/page/EventSource.cpp

Issue 785933005: Check that ExecutionContext and LocalFrame pointers are not null before getting shouldBypassMainWor… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Fixed expectation file. Was empty Created 6 years 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 | « LayoutTests/http/tests/websocket/resources/construct-in-detached-frame.html ('k') | Source/modules/websockets/DOMWebSocket.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/page/EventSource.cpp

diff --git a/Source/core/page/EventSource.cpp b/Source/core/page/EventSource.cpp

index f60aa0124e07284a3ead5d743b2124d399366025..feca3979f1c04da7dcd3b7e863a5001df12f6274 100644

--- a/Source/core/page/EventSource.cpp

+++ b/Source/core/page/EventSource.cpp

@@ -87,12 +87,7 @@ 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 shouldBypassMainWorldCSP = false;

- if (context->isDocument()) {

- Document* document = toDocument(context);

- shouldBypassMainWorldCSP = document->frame()->script().shouldBypassMainWorldCSP();

- }

- if (!shouldBypassMainWorldCSP && !context->contentSecurityPolicy()->allowConnectToSource(fullURL)) {

+ if (!ContentSecurityPolicy::shouldBypassMainWorld(context) && !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;