| 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 // for frames with a remote owner. | 142 // for frames with a remote owner. |
| 143 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); | 143 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner()); |
| 144 DCHECK(owner); | 144 DCHECK(owner); |
| 145 | 145 |
| 146 Frame* frame = toImplBase()->frame(); | 146 Frame* frame = toImplBase()->frame(); |
| 147 DCHECK(frame); | 147 DCHECK(frame); |
| 148 | 148 |
| 149 if (frame->isLocalFrame()) { | 149 if (frame->isLocalFrame()) { |
| 150 toLocalFrame(frame)->document()->willChangeFrameOwnerProperties( | 150 toLocalFrame(frame)->document()->willChangeFrameOwnerProperties( |
| 151 properties.marginWidth, properties.marginHeight, | 151 properties.marginWidth, properties.marginHeight, |
| 152 static_cast<ScrollbarMode>(properties.scrollingMode), | 152 static_cast<ScrollbarMode>(properties.scrollingMode)); |
| 153 properties.isDisplayNone); | |
| 154 } | 153 } |
| 155 | 154 |
| 156 owner->setBrowsingContextContainerName(properties.name); | 155 owner->setBrowsingContextContainerName(properties.name); |
| 157 owner->setScrollingMode(properties.scrollingMode); | 156 owner->setScrollingMode(properties.scrollingMode); |
| 158 owner->setMarginWidth(properties.marginWidth); | 157 owner->setMarginWidth(properties.marginWidth); |
| 159 owner->setMarginHeight(properties.marginHeight); | 158 owner->setMarginHeight(properties.marginHeight); |
| 160 owner->setAllowFullscreen(properties.allowFullscreen); | 159 owner->setAllowFullscreen(properties.allowFullscreen); |
| 161 owner->setAllowPaymentRequest(properties.allowPaymentRequest); | 160 owner->setAllowPaymentRequest(properties.allowPaymentRequest); |
| 162 owner->setIsDisplayNone(properties.isDisplayNone); | |
| 163 owner->setCsp(properties.requiredCsp); | 161 owner->setCsp(properties.requiredCsp); |
| 164 owner->setDelegatedpermissions(properties.delegatedPermissions); | 162 owner->setDelegatedpermissions(properties.delegatedPermissions); |
| 165 } | 163 } |
| 166 | 164 |
| 167 WebFrame* WebFrame::opener() const { | 165 WebFrame* WebFrame::opener() const { |
| 168 return m_opener; | 166 return m_opener; |
| 169 } | 167 } |
| 170 | 168 |
| 171 void WebFrame::setOpener(WebFrame* opener) { | 169 void WebFrame::setOpener(WebFrame* opener) { |
| 172 if (m_opener) | 170 if (m_opener) |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 322 // m_opener is a weak reference. | 320 // m_opener is a weak reference. |
| 323 frame->m_openedFrameTracker->traceFrames(visitor); | 321 frame->m_openedFrameTracker->traceFrames(visitor); |
| 324 } | 322 } |
| 325 | 323 |
| 326 void WebFrame::clearWeakFrames(Visitor* visitor) { | 324 void WebFrame::clearWeakFrames(Visitor* visitor) { |
| 327 if (!isFrameAlive(m_opener)) | 325 if (!isFrameAlive(m_opener)) |
| 328 m_opener = nullptr; | 326 m_opener = nullptr; |
| 329 } | 327 } |
| 330 | 328 |
| 331 } // namespace blink | 329 } // namespace blink |
| OLD | NEW |