| 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 } | 153 } |
| 154 | 154 |
| 155 owner->setBrowsingContextContainerName(properties.name); | 155 owner->setBrowsingContextContainerName(properties.name); |
| 156 owner->setScrollingMode(properties.scrollingMode); | 156 owner->setScrollingMode(properties.scrollingMode); |
| 157 owner->setMarginWidth(properties.marginWidth); | 157 owner->setMarginWidth(properties.marginWidth); |
| 158 owner->setMarginHeight(properties.marginHeight); | 158 owner->setMarginHeight(properties.marginHeight); |
| 159 owner->setAllowFullscreen(properties.allowFullscreen); | 159 owner->setAllowFullscreen(properties.allowFullscreen); |
| 160 owner->setAllowPaymentRequest(properties.allowPaymentRequest); | 160 owner->setAllowPaymentRequest(properties.allowPaymentRequest); |
| 161 owner->setCsp(properties.requiredCsp); | 161 owner->setCsp(properties.requiredCsp); |
| 162 owner->setDelegatedpermissions(properties.delegatedPermissions); | 162 owner->setDelegatedpermissions(properties.delegatedPermissions); |
| 163 owner->setAllowedFeatureNames(properties.allowedFeatureNames); |
| 163 } | 164 } |
| 164 | 165 |
| 165 WebFrame* WebFrame::opener() const { | 166 WebFrame* WebFrame::opener() const { |
| 166 return m_opener; | 167 return m_opener; |
| 167 } | 168 } |
| 168 | 169 |
| 169 void WebFrame::setOpener(WebFrame* opener) { | 170 void WebFrame::setOpener(WebFrame* opener) { |
| 170 if (m_opener) | 171 if (m_opener) |
| 171 m_opener->m_openedFrameTracker->remove(this); | 172 m_opener->m_openedFrameTracker->remove(this); |
| 172 if (opener) | 173 if (opener) |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 320 // m_opener is a weak reference. | 321 // m_opener is a weak reference. |
| 321 frame->m_openedFrameTracker->traceFrames(visitor); | 322 frame->m_openedFrameTracker->traceFrames(visitor); |
| 322 } | 323 } |
| 323 | 324 |
| 324 void WebFrame::clearWeakFrames(Visitor* visitor) { | 325 void WebFrame::clearWeakFrames(Visitor* visitor) { |
| 325 if (!isFrameAlive(m_opener)) | 326 if (!isFrameAlive(m_opener)) |
| 326 m_opener = nullptr; | 327 m_opener = nullptr; |
| 327 } | 328 } |
| 328 | 329 |
| 329 } // namespace blink | 330 } // namespace blink |
| OLD | NEW |