third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp - Issue 1738623004: Rename enums/functions that collide in chromium style.

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/frame/csp/ContentSecurityPolicy.cpp

Issue 1738623004: Rename enums/functions that collide in chromium style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@get-names-4

Patch Set: get-names-5: rebase-and-stuff Created 4 years, 10 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/frame/csp/ContentSecurityPolicy.h ('k') | third_party/WebKit/Source/core/html/HTMLImageElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

diff --git a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

index 23085bedd0e0fc846955ef1d0f6419d6647f5483..88e59b9d623759247919b716e421d394e1324cdf 100644

--- a/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

+++ b/third_party/WebKit/Source/core/frame/csp/ContentSecurityPolicy.cpp

@@ -279,7 +279,7 @@ void ContentSecurityPolicy::addPolicyFromHeaderValue(const String& header, Conte

// When a referrer policy has already been set, the most recent

// one takes precedence.

if (type != ContentSecurityPolicyHeaderTypeReport && policy->didSetReferrerPolicy())

- m_referrerPolicy = policy->referrerPolicy();

+ m_referrerPolicy = policy->getReferrerPolicy();

if (!policy->allowEval(0, SuppressReport) && m_disableEvalErrorMessage.isNull())

m_disableEvalErrorMessage = policy->evalDisabledErrorMessage();

@@ -631,12 +631,12 @@ bool ContentSecurityPolicy::isActive() const

return !m_policies.isEmpty();

}

-ReflectedXSSDisposition ContentSecurityPolicy::reflectedXSSDisposition() const

+ReflectedXSSDisposition ContentSecurityPolicy::getReflectedXSSDisposition() const

{

ReflectedXSSDisposition disposition = ReflectedXSSUnset;

for (const auto& policy : m_policies) {

- if (policy->reflectedXSSDisposition() > disposition)

- disposition = std::max(disposition, policy->reflectedXSSDisposition());

+ if (policy->getReflectedXSSDisposition() > disposition)

+ disposition = std::max(disposition, policy->getReflectedXSSDisposition());

}

return disposition;

}