| 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..716acfb69d082673a96572abd6a3e652f6b92db8 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::addressSpaceForBindings() 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";
|
| + }
|
| + ASSERT_NOT_REACHED();
|
| + return "public";
|
| }
|
|
|
| bool SecurityContext::hasSuborigin()
|
|
|