| 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/frame/FrameHost.h" | 8 #include "core/frame/FrameHost.h" |
| 9 #include "core/frame/FrameView.h" | 9 #include "core/frame/FrameView.h" |
| 10 #include "core/frame/LocalFrame.h" | 10 #include "core/frame/LocalFrame.h" |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 135 void WebFrame::setFrameOwnerProperties( | 135 void WebFrame::setFrameOwnerProperties( |
| 136 const WebFrameOwnerProperties& properties) { | 136 const WebFrameOwnerProperties& properties) { |
| 137 // At the moment, this is only used to replicate frame owner properties | 137 // At the moment, this is only used to replicate frame owner properties |
| 138 // for frames with a remote owner. | 138 // for frames with a remote owner. |
| 139 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); | 139 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); |
| 140 DCHECK(owner); | 140 DCHECK(owner); |
| 141 owner->setScrollingMode(properties.scrollingMode); | 141 owner->setScrollingMode(properties.scrollingMode); |
| 142 owner->setMarginWidth(properties.marginWidth); | 142 owner->setMarginWidth(properties.marginWidth); |
| 143 owner->setMarginHeight(properties.marginHeight); | 143 owner->setMarginHeight(properties.marginHeight); |
| 144 owner->setAllowFullscreen(properties.allowFullscreen); | 144 owner->setAllowFullscreen(properties.allowFullscreen); |
| 145 owner->setAllowPaymentRequest(properties.allowPaymentRequest); |
| 145 owner->setCsp(properties.requiredCsp); | 146 owner->setCsp(properties.requiredCsp); |
| 146 owner->setDelegatedpermissions(properties.delegatedPermissions); | 147 owner->setDelegatedpermissions(properties.delegatedPermissions); |
| 147 } | 148 } |
| 148 | 149 |
| 149 WebFrame* WebFrame::opener() const { | 150 WebFrame* WebFrame::opener() const { |
| 150 return m_opener; | 151 return m_opener; |
| 151 } | 152 } |
| 152 | 153 |
| 153 void WebFrame::setOpener(WebFrame* opener) { | 154 void WebFrame::setOpener(WebFrame* opener) { |
| 154 if (m_opener) | 155 if (m_opener) |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \ | 326 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \ |
| 326 clearWeakFramesImpl(visitor); \ | 327 clearWeakFramesImpl(visitor); \ |
| 327 } | 328 } |
| 328 | 329 |
| 329 DEFINE_VISITOR_METHOD(Visitor*) | 330 DEFINE_VISITOR_METHOD(Visitor*) |
| 330 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) | 331 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) |
| 331 | 332 |
| 332 #undef DEFINE_VISITOR_METHOD | 333 #undef DEFINE_VISITOR_METHOD |
| 333 | 334 |
| 334 } // namespace blink | 335 } // namespace blink |
| OLD | NEW |