Source/web/WebLocalFrameImpl.cpp - Issue 605453002: Merge 182515 "Revert "Mixed Content: Make MixedContentChecker co..."

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/web/WebLocalFrameImpl.cpp

Issue 605453002: Merge 182515 "Revert "Mixed Content: Make MixedContentChecker co..." (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/2167/

Patch Set: Created 6 years, 3 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

Index: Source/web/WebLocalFrameImpl.cpp

===================================================================

--- Source/web/WebLocalFrameImpl.cpp (revision 182628)

+++ Source/web/WebLocalFrameImpl.cpp (working copy)

@@ -131,7 +131,6 @@

#include "core/loader/FrameLoadRequest.h"

#include "core/loader/FrameLoader.h"

#include "core/loader/HistoryItem.h"

-#include "core/loader/MixedContentChecker.h"

#include "core/loader/SubstituteData.h"

#include "core/page/Chrome.h"

#include "core/page/EventHandler.h"

@@ -778,7 +777,7 @@

bool WebLocalFrameImpl::checkIfRunInsecureContent(const WebURL& url) const

{

ASSERT(frame());

- return !MixedContentChecker::shouldBlockFetch(frame(), WebURLRequest::RequestContextIframe, WebURLRequest::FrameTypeNested, url);

+ return frame()->loader().mixedContentChecker()->canFrameInsecureContent(frame()->document()->securityOrigin(), url);

}

v8::Handle<v8::Value> WebLocalFrameImpl::executeScriptAndReturnValue(const WebScriptSource& source)

« no previous file with comments | « Source/modules/websockets/NewWebSocketChannelImpl.cpp ('k') | no next file » | no next file with comments »