| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "public/web/WebFrame.h" | 5 #include "public/web/WebFrame.h" |
| 6 | 6 |
| 7 #include "bindings/core/v8/WindowProxyManager.h" | 7 #include "bindings/core/v8/WindowProxyManager.h" |
| 8 #include "core/HTMLNames.h" | 8 #include "core/HTMLNames.h" |
| 9 #include "core/frame/FrameHost.h" | 9 #include "core/frame/FrameHost.h" |
| 10 #include "core/frame/FrameView.h" | 10 #include "core/frame/FrameView.h" |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 // for frames with a remote owner. | 126 // for frames with a remote owner. |
| 127 FrameOwner* owner = toImplBase()->frame()->owner(); | 127 FrameOwner* owner = toImplBase()->frame()->owner(); |
| 128 DCHECK(owner); | 128 DCHECK(owner); |
| 129 toRemoteFrameOwner(owner)->setSandboxFlags(static_cast<SandboxFlags>(flags)); | 129 toRemoteFrameOwner(owner)->setSandboxFlags(static_cast<SandboxFlags>(flags)); |
| 130 } | 130 } |
| 131 | 131 |
| 132 WebInsecureRequestPolicy WebFrame::getInsecureRequestPolicy() const { | 132 WebInsecureRequestPolicy WebFrame::getInsecureRequestPolicy() const { |
| 133 return toImplBase()->frame()->securityContext()->getInsecureRequestPolicy(); | 133 return toImplBase()->frame()->securityContext()->getInsecureRequestPolicy(); |
| 134 } | 134 } |
| 135 | 135 |
| 136 std::vector<unsigned> WebFrame::getInsecureRequestToUpgrade() const { |
| 137 SecurityContext::InsecureNavigationsSet* set = |
| 138 toImplBase()->frame()->securityContext()->insecureNavigationsToUpgrade(); |
| 139 DCHECK(set); |
| 140 return SecurityContext::serializeInsecureNavigationSet(*set); |
| 141 } |
| 142 |
| 136 void WebFrame::setFrameOwnerProperties( | 143 void WebFrame::setFrameOwnerProperties( |
| 137 const WebFrameOwnerProperties& properties) { | 144 const WebFrameOwnerProperties& properties) { |
| 138 // At the moment, this is only used to replicate frame owner properties | 145 // At the moment, this is only used to replicate frame owner properties |
| 139 // for frames with a remote owner. | 146 // for frames with a remote owner. |
| 140 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); | 147 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); |
| 141 DCHECK(owner); | 148 DCHECK(owner); |
| 142 | 149 |
| 143 Frame* frame = toImplBase()->frame(); | 150 Frame* frame = toImplBase()->frame(); |
| 144 DCHECK(frame); | 151 DCHECK(frame); |
| 145 | 152 |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 336 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \ | 343 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \ |
| 337 clearWeakFramesImpl(visitor); \ | 344 clearWeakFramesImpl(visitor); \ |
| 338 } | 345 } |
| 339 | 346 |
| 340 DEFINE_VISITOR_METHOD(Visitor*) | 347 DEFINE_VISITOR_METHOD(Visitor*) |
| 341 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) | 348 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) |
| 342 | 349 |
| 343 #undef DEFINE_VISITOR_METHOD | 350 #undef DEFINE_VISITOR_METHOD |
| 344 | 351 |
| 345 } // namespace blink | 352 } // namespace blink |
| OLD | NEW |