| 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/FrameView.h" | 9 #include "core/frame/FrameView.h" |
| 10 #include "core/frame/LocalFrame.h" | 10 #include "core/frame/LocalFrame.h" |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 // for frames with a remote owner. | 144 // for frames with a remote owner. |
| 145 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); | 145 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); |
| 146 DCHECK(owner); | 146 DCHECK(owner); |
| 147 | 147 |
| 148 Frame* frame = toImplBase()->frame(); | 148 Frame* frame = toImplBase()->frame(); |
| 149 DCHECK(frame); | 149 DCHECK(frame); |
| 150 | 150 |
| 151 if (frame->isLocalFrame()) { | 151 if (frame->isLocalFrame()) { |
| 152 toLocalFrame(frame)->document()->willChangeFrameOwnerProperties( | 152 toLocalFrame(frame)->document()->willChangeFrameOwnerProperties( |
| 153 properties.marginWidth, properties.marginHeight, | 153 properties.marginWidth, properties.marginHeight, |
| 154 static_cast<ScrollbarMode>(properties.scrollingMode)); | 154 static_cast<ScrollbarMode>(properties.scrollingMode), |
| 155 properties.isDisplayNone); |
| 155 } | 156 } |
| 156 | 157 |
| 157 owner->setBrowsingContextContainerName(properties.name); | 158 owner->setBrowsingContextContainerName(properties.name); |
| 158 owner->setScrollingMode(properties.scrollingMode); | 159 owner->setScrollingMode(properties.scrollingMode); |
| 159 owner->setMarginWidth(properties.marginWidth); | 160 owner->setMarginWidth(properties.marginWidth); |
| 160 owner->setMarginHeight(properties.marginHeight); | 161 owner->setMarginHeight(properties.marginHeight); |
| 161 owner->setAllowFullscreen(properties.allowFullscreen); | 162 owner->setAllowFullscreen(properties.allowFullscreen); |
| 162 owner->setAllowPaymentRequest(properties.allowPaymentRequest); | 163 owner->setAllowPaymentRequest(properties.allowPaymentRequest); |
| 164 owner->setIsDisplayNone(properties.isDisplayNone); |
| 163 owner->setCsp(properties.requiredCsp); | 165 owner->setCsp(properties.requiredCsp); |
| 164 owner->setAllowedFeatures(properties.allowedFeatures); | 166 owner->setAllowedFeatures(properties.allowedFeatures); |
| 165 } | 167 } |
| 166 | 168 |
| 167 WebFrame* WebFrame::opener() const { | 169 WebFrame* WebFrame::opener() const { |
| 168 return m_opener; | 170 return m_opener; |
| 169 } | 171 } |
| 170 | 172 |
| 171 void WebFrame::setOpener(WebFrame* opener) { | 173 void WebFrame::setOpener(WebFrame* opener) { |
| 172 if (m_opener) | 174 if (m_opener) |
| (...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 309 for (WebFrame* child = frame->firstChild(); child; | 311 for (WebFrame* child = frame->firstChild(); child; |
| 310 child = child->nextSibling()) | 312 child = child->nextSibling()) |
| 311 traceFrame(visitor, child); | 313 traceFrame(visitor, child); |
| 312 } | 314 } |
| 313 | 315 |
| 314 void WebFrame::close() { | 316 void WebFrame::close() { |
| 315 m_openedFrameTracker->dispose(); | 317 m_openedFrameTracker->dispose(); |
| 316 } | 318 } |
| 317 | 319 |
| 318 } // namespace blink | 320 } // namespace blink |
| OLD | NEW |