| 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 static_cast<ScrollbarMode>(properties.scrollingMode)); | 157 static_cast<ScrollbarMode>(properties.scrollingMode)); |
| 158 } | 158 } |
| 159 | 159 |
| 160 owner->setBrowsingContextContainerName(properties.name); | 160 owner->setBrowsingContextContainerName(properties.name); |
| 161 owner->setScrollingMode(properties.scrollingMode); | 161 owner->setScrollingMode(properties.scrollingMode); |
| 162 owner->setMarginWidth(properties.marginWidth); | 162 owner->setMarginWidth(properties.marginWidth); |
| 163 owner->setMarginHeight(properties.marginHeight); | 163 owner->setMarginHeight(properties.marginHeight); |
| 164 owner->setAllowFullscreen(properties.allowFullscreen); | 164 owner->setAllowFullscreen(properties.allowFullscreen); |
| 165 owner->setAllowPaymentRequest(properties.allowPaymentRequest); | 165 owner->setAllowPaymentRequest(properties.allowPaymentRequest); |
| 166 owner->setCsp(properties.requiredCsp); | 166 owner->setCsp(properties.requiredCsp); |
| 167 owner->setDelegatedpermissions(properties.delegatedPermissions); | |
| 168 owner->setAllowedFeatures(properties.allowedFeatures); | 167 owner->setAllowedFeatures(properties.allowedFeatures); |
| 169 } | 168 } |
| 170 | 169 |
| 171 WebFrame* WebFrame::opener() const { | 170 WebFrame* WebFrame::opener() const { |
| 172 return m_opener; | 171 return m_opener; |
| 173 } | 172 } |
| 174 | 173 |
| 175 void WebFrame::setOpener(WebFrame* opener) { | 174 void WebFrame::setOpener(WebFrame* opener) { |
| 176 if (m_opener) | 175 if (m_opener) |
| 177 m_opener->m_openedFrameTracker->remove(this); | 176 m_opener->m_openedFrameTracker->remove(this); |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 for (WebFrame* child = frame->firstChild(); child; | 312 for (WebFrame* child = frame->firstChild(); child; |
| 314 child = child->nextSibling()) | 313 child = child->nextSibling()) |
| 315 traceFrame(visitor, child); | 314 traceFrame(visitor, child); |
| 316 } | 315 } |
| 317 | 316 |
| 318 void WebFrame::close() { | 317 void WebFrame::close() { |
| 319 m_openedFrameTracker->dispose(); | 318 m_openedFrameTracker->dispose(); |
| 320 } | 319 } |
| 321 | 320 |
| 322 } // namespace blink | 321 } // namespace blink |
| OLD | NEW |