Chromium Code Reviews| Index: third_party/WebKit/Source/core/dom/SecurityContext.cpp |
| diff --git a/third_party/WebKit/Source/core/dom/SecurityContext.cpp b/third_party/WebKit/Source/core/dom/SecurityContext.cpp |
| index 9b640af387ebedeae508d86ca8868640a23dce5b..cbec3077e5adfef068f70f2a171b238fe051054e 100644 |
| --- a/third_party/WebKit/Source/core/dom/SecurityContext.cpp |
| +++ b/third_party/WebKit/Source/core/dom/SecurityContext.cpp |
| @@ -34,7 +34,7 @@ namespace blink { |
| SecurityContext::SecurityContext() |
| : m_sandboxFlags(SandboxNone) |
| - , m_hostedInReservedIPRange(false) |
| + , m_addressSpace(WebURLRequest::AddressSpacePublic) |
| , m_insecureRequestsPolicy(InsecureRequestsDoNotUpgrade) |
| , m_enforceStrictMixedContentChecking(false) |
| { |
| @@ -69,12 +69,20 @@ void SecurityContext::enforceSandboxFlags(SandboxFlags mask) |
| } |
| } |
| -WebURLRequest::AddressSpace SecurityContext::addressSpace() const |
| +String SecurityContext::addressSpaceAsString() const |
| { |
| - if (m_hostedInReservedIPRange) |
| - return securityOrigin()->isLocalhost() ? WebURLRequest::AddressSpaceLocal : WebURLRequest::AddressSpacePrivate; |
| + switch (m_addressSpace) { |
| + case WebURLRequest::AddressSpacePublic: |
| + return "public"; |
| - return WebURLRequest::AddressSpacePublic; |
| + case WebURLRequest::AddressSpacePrivate: |
| + return "private"; |
| + |
| + case WebURLRequest::AddressSpaceLocal: |
| + return "local"; |
| + } |
| + NOTREACHED(); |
|
philipj_slow
2016/03/04 04:35:08
ASSERT_NOT_REACHED? I see NOTREACHED() only in Sou
Mike West
2016/03/04 05:53:54
*sigh* Wouldn't it be nice if style-folks would co
philipj_slow
2016/03/04 10:47:14
:)
|
| + return "public"; |
| } |
| bool SecurityContext::hasSuborigin() |