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

Side by Side 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 unified diff | 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')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)	2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)

3 * (C) 1999 Antti Koivisto (koivisto@kde.org)	3 * (C) 1999 Antti Koivisto (koivisto@kde.org)

4 * (C) 2001 Dirk Mueller (mueller@kde.org)	4 * (C) 2001 Dirk Mueller (mueller@kde.org)

5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)	5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)

6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.	6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.

7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)	7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)

8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)	8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)

9 * Copyright (C) 2013 Google Inc. All rights reserved.	9 * Copyright (C) 2013 Google Inc. All rights reserved.

10 *	10 *

(...skipping 83 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
94	94

95 LocalFrame* DocumentInit::frameForSecurityContext() const	95 LocalFrame* DocumentInit::frameForSecurityContext() const

96 {	96 {

97 if (m_frame)	97 if (m_frame)

98 return m_frame;	98 return m_frame;

99 if (m_importsController)	99 if (m_importsController)

100 return m_importsController->master()->frame();	100 return m_importsController->master()->frame();

101 return 0;	101 return 0;

102 }	102 }

103	103

104 SandboxFlags DocumentInit::sandboxFlags() const	104 SandboxFlags DocumentInit::getSandboxFlags() const

105 {	105 {

106 ASSERT(frameForSecurityContext());	106 ASSERT(frameForSecurityContext());

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

108 }	108 }

109	109

110 bool DocumentInit::shouldEnforceStrictMixedContentChecking() const	110 bool DocumentInit::shouldEnforceStrictMixedContentChecking() const

111 {	111 {

112 ASSERT(frameForSecurityContext());	112 ASSERT(frameForSecurityContext());

113 return frameForSecurityContext()->loader().shouldEnforceStrictMixedContentCh ecking();	113 return frameForSecurityContext()->loader().shouldEnforceStrictMixedContentCh ecking();

114 }	114 }

115	115

116 SecurityContext::InsecureRequestsPolicy DocumentInit::insecureRequestsPolicy() c onst	116 SecurityContext::InsecureRequestsPolicy DocumentInit::getInsecureRequestsPolicy( ) const

117 {	117 {

118 ASSERT(frameForSecurityContext());	118 ASSERT(frameForSecurityContext());

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

120 }	120 }

121	121

122 SecurityContext::InsecureNavigationsSet* DocumentInit::insecureNavigationsToUpgr ade() const	122 SecurityContext::InsecureNavigationsSet* DocumentInit::insecureNavigationsToUpgr ade() const

123 {	123 {

124 ASSERT(frameForSecurityContext());	124 ASSERT(frameForSecurityContext());

125 return frameForSecurityContext()->loader().insecureNavigationsToUpgrade();	125 return frameForSecurityContext()->loader().insecureNavigationsToUpgrade();

126 }	126 }

127	127

128 bool DocumentInit::isHostedInReservedIPRange() const	128 bool DocumentInit::isHostedInReservedIPRange() const

129 {	129 {

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
177 return m_contextDocument;	177 return m_contextDocument;

178 }	178 }

179	179

180 DocumentInit DocumentInit::fromContext(WeakPtrWillBeRawPtr<Document> contextDocu ment, const KURL& url)	180 DocumentInit DocumentInit::fromContext(WeakPtrWillBeRawPtr<Document> contextDocu ment, const KURL& url)

181 {	181 {

182 return DocumentInit(url, 0, contextDocument, 0);	182 return DocumentInit(url, 0, contextDocument, 0);

183 }	183 }

184	184

185 } // namespace blink	185 } // namespace blink

186	186

OLD	NEW