Source/core/fetch/ResourceFetcher.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/core/fetch/ResourceFetcher.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

« no previous file with comments | « LayoutTests/http/tests/security/mixedContent/websocket/insecure-websocket-in-secure-page-worker-expected.txt ('k') | Source/core/html/HTMLFormElement.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/fetch/ResourceFetcher.cpp

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

--- Source/core/fetch/ResourceFetcher.cpp (revision 182628)

+++ Source/core/fetch/ResourceFetcher.cpp (working copy)

@@ -51,7 +51,6 @@

#include "core/loader/DocumentLoader.h"

#include "core/loader/FrameLoader.h"

#include "core/loader/FrameLoaderClient.h"

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

#include "core/loader/PingLoader.h"

#include "core/loader/SubstituteData.h"

#include "core/loader/UniqueIdentifier.h"

@@ -580,7 +579,7 @@

effectiveFrame = toLocalFrame(frame()->tree().parent());

}

- return !MixedContentChecker::shouldBlockFetch(effectiveFrame, resourceRequest.requestContext(), resourceRequest.frameType(), url);

+ return !MixedContentChecker::shouldBlockFetch(effectiveFrame, resourceRequest, url);

}

bool ResourceFetcher::canAccessResource(Resource* resource, SecurityOrigin* sourceOrigin, const KURL& url) const

@@ -1206,7 +1205,6 @@

request.setCharset(encoding);

request.setForPreload(true);

- request.mutableResourceRequest().setRequestContext(WebURLRequest::RequestContextPrefetch);

ResourcePtr<Resource> resource;

// Loading images involves several special cases, so use dedicated fetch method instead.