third_party/WebKit/Source/core/loader/FrameFetchContext.cpp - Issue 2040133003: Replace SecurityContext::InsecureRequestsPolicy with WebInsecureRequestPolicy.

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: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

Issue 2040133003: Replace SecurityContext::InsecureRequestsPolicy with WebInsecureRequestPolicy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@combine-uir-block

Patch Set: Ugh. Created 4 years, 6 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 | « third_party/WebKit/Source/core/loader/FormSubmission.cpp ('k') | third_party/WebKit/Source/core/loader/FrameFetchContextTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

index b733cd30a8677e5123d56e1de03cdc5568b81fae..000596c852d01efe58f7dd90f177f64382a6f260 100644

--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

@@ -71,6 +71,7 @@

#include "platform/weborigin/SecurityPolicy.h"

#include "public/platform/WebCachePolicy.h"

#include "public/platform/WebFrameScheduler.h"

+#include "public/platform/WebInsecureRequestPolicy.h"

#include <algorithm>

@@ -653,10 +654,10 @@ void FrameFetchContext::upgradeInsecureRequest(FetchRequest& fetchRequest)

fetchRequest.mutableResourceRequest().addHTTPHeaderField("Upgrade-Insecure-Requests", "1");

// If we don't yet have an |m_document| (because we're loading an iframe, for instance), check the FrameLoader's policy.

- SecurityContext::InsecureRequestsPolicy relevantPolicy = m_document ? m_document->getInsecureRequestsPolicy() : frame()->loader().getInsecureRequestsPolicy();

+ WebInsecureRequestPolicy relevantPolicy = m_document ? m_document->getInsecureRequestPolicy() : frame()->loader().getInsecureRequestPolicy();

SecurityContext::InsecureNavigationsSet* relevantNavigationSet = m_document ? m_document->insecureNavigationsToUpgrade() : frame()->loader().insecureNavigationsToUpgrade();

- if (url.protocolIs("http") && relevantPolicy == SecurityContext::InsecureRequestsUpgrade) {

+ if (url.protocolIs("http") && relevantPolicy & kUpgradeInsecureRequests) {

// We always upgrade requests that meet any of the following criteria:

// 1. Are for subresources (including nested frames).