third_party/WebKit/Source/core/dom/SecurityContext.h - Issue 1738613002: Rename enums/functions that collide in chromium style in core/dom/

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/dom/SecurityContext.h

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

Patch Set: get-names-4: 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

« third_party/WebKit/Source/core/dom/Node.h ('K') | « third_party/WebKit/Source/core/dom/ScriptableDocumentParser.h ('k') | third_party/WebKit/Source/core/dom/StyleEngine.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/SecurityContext.h

diff --git a/third_party/WebKit/Source/core/dom/SecurityContext.h b/third_party/WebKit/Source/core/dom/SecurityContext.h

index c15a4edb2782dfc3f696b6e0fa95ea7bb0375806..1693b3578fb3e0b31fb047b21142dc2b10e35643 100644

--- a/third_party/WebKit/Source/core/dom/SecurityContext.h

+++ b/third_party/WebKit/Source/core/dom/SecurityContext.h

@@ -67,7 +67,7 @@ public:

void setSecurityOrigin(PassRefPtr<SecurityOrigin>);

virtual void didUpdateSecurityOrigin() = 0;

- SandboxFlags sandboxFlags() const { return m_sandboxFlags; }

+ SandboxFlags getSandboxFlags() const { return m_sandboxFlags; }

bool isSandboxed(SandboxFlags mask) const { return m_sandboxFlags & mask; }

void enforceSandboxFlags(SandboxFlags mask);

@@ -75,7 +75,7 @@ public:

bool isHostedInReservedIPRange() const { return m_hostedInReservedIPRange; }

void setInsecureRequestsPolicy(InsecureRequestsPolicy policy) { m_insecureRequestsPolicy = policy; }

- InsecureRequestsPolicy insecureRequestsPolicy() const { return m_insecureRequestsPolicy; }

+ InsecureRequestsPolicy getInsecureRequestsPolicy() const { return m_insecureRequestsPolicy; }

void addInsecureNavigationUpgrade(unsigned hashedHost) { m_insecureNavigationsToUpgrade.add(hashedHost); }

InsecureNavigationsSet* insecureNavigationsToUpgrade() { return &m_insecureNavigationsToUpgrade; }