third_party/WebKit/Source/core/dom/DocumentInit.cpp - 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/DocumentInit.cpp

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

« no previous file with comments | « third_party/WebKit/Source/core/dom/DocumentInit.h ('k') | third_party/WebKit/Source/core/dom/DocumentLifecycle.h » ('j') | third_party/WebKit/Source/core/dom/Node.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/dom/DocumentInit.cpp

diff --git a/third_party/WebKit/Source/core/dom/DocumentInit.cpp b/third_party/WebKit/Source/core/dom/DocumentInit.cpp

index 389db7bfd877a1c6e0e991ab91f6a6cd8441482d..c75e302fb53fa52ee48faf6f25fb67338b1af2fe 100644

--- a/third_party/WebKit/Source/core/dom/DocumentInit.cpp

+++ b/third_party/WebKit/Source/core/dom/DocumentInit.cpp

@@ -101,7 +101,7 @@ LocalFrame* DocumentInit::frameForSecurityContext() const

return 0;

}

-SandboxFlags DocumentInit::sandboxFlags() const

+SandboxFlags DocumentInit::getSandboxFlags() const

{

ASSERT(frameForSecurityContext());

return frameForSecurityContext()->loader().effectiveSandboxFlags();

@@ -113,10 +113,10 @@ bool DocumentInit::shouldEnforceStrictMixedContentChecking() const

return frameForSecurityContext()->loader().shouldEnforceStrictMixedContentChecking();

}

-SecurityContext::InsecureRequestsPolicy DocumentInit::insecureRequestsPolicy() const

+SecurityContext::InsecureRequestsPolicy DocumentInit::getInsecureRequestsPolicy() const

{

ASSERT(frameForSecurityContext());

- return frameForSecurityContext()->loader().insecureRequestsPolicy();

+ return frameForSecurityContext()->loader().getInsecureRequestsPolicy();

}

SecurityContext::InsecureNavigationsSet* DocumentInit::insecureNavigationsToUpgrade() const