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 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 // for frames with a remote owner. | 139 // for frames with a remote owner. |
140 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); | 140 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); |
141 DCHECK(owner); | 141 DCHECK(owner); |
142 | 142 |
143 Frame* frame = toImplBase()->frame(); | 143 Frame* frame = toImplBase()->frame(); |
144 DCHECK(frame); | 144 DCHECK(frame); |
145 | 145 |
146 if (frame->isLocalFrame()) { | 146 if (frame->isLocalFrame()) { |
147 toLocalFrame(frame)->document()->willChangeFrameOwnerProperties( | 147 toLocalFrame(frame)->document()->willChangeFrameOwnerProperties( |
148 properties.marginWidth, properties.marginHeight, | 148 properties.marginWidth, properties.marginHeight, |
149 static_cast<ScrollbarMode>(properties.scrollingMode)); | 149 static_cast<ScrollbarMode>(properties.scrollingMode), |
| 150 properties.isDisplayNone); |
150 } | 151 } |
151 | 152 |
152 owner->setScrollingMode(properties.scrollingMode); | 153 owner->setScrollingMode(properties.scrollingMode); |
153 owner->setMarginWidth(properties.marginWidth); | 154 owner->setMarginWidth(properties.marginWidth); |
154 owner->setMarginHeight(properties.marginHeight); | 155 owner->setMarginHeight(properties.marginHeight); |
155 owner->setAllowFullscreen(properties.allowFullscreen); | 156 owner->setAllowFullscreen(properties.allowFullscreen); |
156 owner->setAllowPaymentRequest(properties.allowPaymentRequest); | 157 owner->setAllowPaymentRequest(properties.allowPaymentRequest); |
| 158 owner->setIsDisplayNone(properties.isDisplayNone); |
157 owner->setCsp(properties.requiredCsp); | 159 owner->setCsp(properties.requiredCsp); |
158 owner->setDelegatedpermissions(properties.delegatedPermissions); | 160 owner->setDelegatedpermissions(properties.delegatedPermissions); |
159 } | 161 } |
160 | 162 |
161 WebFrame* WebFrame::opener() const { | 163 WebFrame* WebFrame::opener() const { |
162 return m_opener; | 164 return m_opener; |
163 } | 165 } |
164 | 166 |
165 void WebFrame::setOpener(WebFrame* opener) { | 167 void WebFrame::setOpener(WebFrame* opener) { |
166 if (m_opener) | 168 if (m_opener) |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
337 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \ | 339 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { \ |
338 clearWeakFramesImpl(visitor); \ | 340 clearWeakFramesImpl(visitor); \ |
339 } | 341 } |
340 | 342 |
341 DEFINE_VISITOR_METHOD(Visitor*) | 343 DEFINE_VISITOR_METHOD(Visitor*) |
342 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) | 344 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) |
343 | 345 |
344 #undef DEFINE_VISITOR_METHOD | 346 #undef DEFINE_VISITOR_METHOD |
345 | 347 |
346 } // namespace blink | 348 } // namespace blink |
OLD | NEW |