third_party/WebKit/Source/core/html/parser/XSSAuditor.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/html/parser/XSSAuditor.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/html/parser/PreloadRequest.h ('k') | third_party/WebKit/Source/core/input/EventHandler.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp

diff --git a/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp b/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp

index d0cac91376490052cdb670614abe01eefb2645a5..158eca5ba48bd8bded6de13a31c21c6732b35a6c 100644

--- a/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp

+++ b/third_party/WebKit/Source/core/html/parser/XSSAuditor.cpp

@@ -353,7 +353,7 @@ void XSSAuditor::init(Document* document, XSSAuditorDelegate* auditorDelegate)

if (xssProtectionHeader == ReflectedXSSInvalid)

document->addConsoleMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, "Error parsing header X-XSS-Protection: " + headerValue + ": " + errorDetails + " at character position " + String::format("%u", errorPosition) + ". The default protections will be applied."));

- ReflectedXSSDisposition cspHeader = document->contentSecurityPolicy()->reflectedXSSDisposition();

+ ReflectedXSSDisposition cspHeader = document->contentSecurityPolicy()->getReflectedXSSDisposition();

m_didSendValidCSPHeader = cspHeader != ReflectedXSSUnset && cspHeader != ReflectedXSSInvalid;

m_xssProtection = combineXSSProtectionHeaderAndCSP(xssProtectionHeader, cspHeader);