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