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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
133 void WebFrame::setFrameOwnerProperties( | 133 void WebFrame::setFrameOwnerProperties( |
134 const WebFrameOwnerProperties& properties) { | 134 const WebFrameOwnerProperties& properties) { |
135 // At the moment, this is only used to replicate frame owner properties | 135 // At the moment, this is only used to replicate frame owner properties |
136 // for frames with a remote owner. | 136 // for frames with a remote owner. |
137 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); | 137 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); |
138 DCHECK(owner); | 138 DCHECK(owner); |
139 owner->setScrollingMode(properties.scrollingMode); | 139 owner->setScrollingMode(properties.scrollingMode); |
140 owner->setMarginWidth(properties.marginWidth); | 140 owner->setMarginWidth(properties.marginWidth); |
141 owner->setMarginHeight(properties.marginHeight); | 141 owner->setMarginHeight(properties.marginHeight); |
142 owner->setAllowFullscreen(properties.allowFullscreen); | 142 owner->setAllowFullscreen(properties.allowFullscreen); |
| 143 owner->setCsp(properties.requiredCsp); |
143 owner->setDelegatedpermissions(properties.delegatedPermissions); | 144 owner->setDelegatedpermissions(properties.delegatedPermissions); |
144 } | 145 } |
145 | 146 |
146 WebFrame* WebFrame::opener() const { | 147 WebFrame* WebFrame::opener() const { |
147 return m_opener; | 148 return m_opener; |
148 } | 149 } |
149 | 150 |
150 void WebFrame::setOpener(WebFrame* opener) { | 151 void WebFrame::setOpener(WebFrame* opener) { |
151 if (m_opener) | 152 if (m_opener) |
152 m_opener->m_openedFrameTracker->remove(this); | 153 m_opener->m_openedFrameTracker->remove(this); |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
345 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \ | 346 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \ |
346 clearWeakFramesImpl(visitor); \ | 347 clearWeakFramesImpl(visitor); \ |
347 } | 348 } |
348 | 349 |
349 DEFINE_VISITOR_METHOD(Visitor*) | 350 DEFINE_VISITOR_METHOD(Visitor*) |
350 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) | 351 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) |
351 | 352 |
352 #undef DEFINE_VISITOR_METHOD | 353 #undef DEFINE_VISITOR_METHOD |
353 | 354 |
354 } // namespace blink | 355 } // namespace blink |
OLD | NEW |