| 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/frame/FrameHost.h" | 8 #include "core/frame/FrameHost.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 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 void WebFrame::setFrameOwnerProperties(const WebFrameOwnerProperties& properties
) | 137 void WebFrame::setFrameOwnerProperties(const WebFrameOwnerProperties& properties
) |
| 138 { | 138 { |
| 139 // At the moment, this is only used to replicate frame owner properties | 139 // At the moment, this is only used to replicate frame owner properties |
| 140 // for frames with a remote owner. | 140 // for frames with a remote owner. |
| 141 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner())
; | 141 RemoteFrameOwner* owner = toRemoteFrameOwner(toImplBase()->frame()->owner())
; |
| 142 DCHECK(owner); | 142 DCHECK(owner); |
| 143 owner->setScrollingMode(properties.scrollingMode); | 143 owner->setScrollingMode(properties.scrollingMode); |
| 144 owner->setMarginWidth(properties.marginWidth); | 144 owner->setMarginWidth(properties.marginWidth); |
| 145 owner->setMarginHeight(properties.marginHeight); | 145 owner->setMarginHeight(properties.marginHeight); |
| 146 owner->setAllowFullscreen(properties.allowFullscreen); | 146 owner->setAllowFullscreen(properties.allowFullscreen); |
| 147 owner->setDelegatedpermissions(properties.delegatedPermissions); |
| 147 } | 148 } |
| 148 | 149 |
| 149 WebFrame* WebFrame::opener() const | 150 WebFrame* WebFrame::opener() const |
| 150 { | 151 { |
| 151 return m_opener; | 152 return m_opener; |
| 152 } | 153 } |
| 153 | 154 |
| 154 void WebFrame::setOpener(WebFrame* opener) | 155 void WebFrame::setOpener(WebFrame* opener) |
| 155 { | 156 { |
| 156 if (m_opener) | 157 if (m_opener) |
| (...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 364 void WebFrame::traceFrame(VisitorDispatcher visitor, WebFrame* frame) { trac
eFrameImpl(visitor, frame); } \ | 365 void WebFrame::traceFrame(VisitorDispatcher visitor, WebFrame* frame) { trac
eFrameImpl(visitor, frame); } \ |
| 365 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra
ceFramesImpl(visitor, frame); } \ | 366 void WebFrame::traceFrames(VisitorDispatcher visitor, WebFrame* frame) { tra
ceFramesImpl(visitor, frame); } \ |
| 366 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI
mpl(visitor); } | 367 void WebFrame::clearWeakFrames(VisitorDispatcher visitor) { clearWeakFramesI
mpl(visitor); } |
| 367 | 368 |
| 368 DEFINE_VISITOR_METHOD(Visitor*) | 369 DEFINE_VISITOR_METHOD(Visitor*) |
| 369 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) | 370 DEFINE_VISITOR_METHOD(InlinedGlobalMarkingVisitor) |
| 370 | 371 |
| 371 #undef DEFINE_VISITOR_METHOD | 372 #undef DEFINE_VISITOR_METHOD |
| 372 | 373 |
| 373 } // namespace blink | 374 } // namespace blink |
| OLD | NEW |