| 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 "config.h" | 5 #include "config.h" |
| 6 #include "web/WebRemoteFrameImpl.h" | 6 #include "web/WebRemoteFrameImpl.h" |
| 7 | 7 |
| 8 #include "core/frame/FrameOwner.h" | 8 #include "core/frame/FrameOwner.h" |
| 9 #include "core/frame/FrameView.h" | 9 #include "core/frame/FrameView.h" |
| 10 #include "core/frame/RemoteFrame.h" | 10 #include "core/frame/RemoteFrame.h" |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 125 #if ENABLE(OILPAN) | 125 #if ENABLE(OILPAN) |
| 126 , m_selfKeepAlive(this) | 126 , m_selfKeepAlive(this) |
| 127 #endif | 127 #endif |
| 128 { | 128 { |
| 129 } | 129 } |
| 130 | 130 |
| 131 WebRemoteFrameImpl::~WebRemoteFrameImpl() | 131 WebRemoteFrameImpl::~WebRemoteFrameImpl() |
| 132 { | 132 { |
| 133 } | 133 } |
| 134 | 134 |
| 135 #if ENABLE(OILPAN) |
| 135 void WebRemoteFrameImpl::trace(Visitor* visitor) | 136 void WebRemoteFrameImpl::trace(Visitor* visitor) |
| 136 { | 137 { |
| 137 #if ENABLE(OILPAN) | |
| 138 visitor->trace(m_frame); | 138 visitor->trace(m_frame); |
| 139 visitor->trace(m_ownersForChildren); | 139 visitor->trace(m_ownersForChildren); |
| 140 | 140 visitor->registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>(this); |
| 141 WebFrame::traceChildren(visitor, this); | 141 WebFrame::traceFrames(visitor, this); |
| 142 } |
| 142 #endif | 143 #endif |
| 143 } | |
| 144 | 144 |
| 145 bool WebRemoteFrameImpl::isWebLocalFrame() const | 145 bool WebRemoteFrameImpl::isWebLocalFrame() const |
| 146 { | 146 { |
| 147 return false; | 147 return false; |
| 148 } | 148 } |
| 149 | 149 |
| 150 WebLocalFrame* WebRemoteFrameImpl::toWebLocalFrame() | 150 WebLocalFrame* WebRemoteFrameImpl::toWebLocalFrame() |
| 151 { | 151 { |
| 152 ASSERT_NOT_REACHED(); | 152 ASSERT_NOT_REACHED(); |
| 153 return 0; | 153 return 0; |
| (...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 861 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const | 861 void WebRemoteFrameImpl::initializeFromFrame(WebLocalFrame* source) const |
| 862 { | 862 { |
| 863 ASSERT(source); | 863 ASSERT(source); |
| 864 WebLocalFrameImpl* localFrameImpl = toWebLocalFrameImpl(source); | 864 WebLocalFrameImpl* localFrameImpl = toWebLocalFrameImpl(source); |
| 865 client()->initializeChildFrame( | 865 client()->initializeChildFrame( |
| 866 localFrameImpl->frame()->view()->frameRect(), | 866 localFrameImpl->frame()->view()->frameRect(), |
| 867 localFrameImpl->frame()->view()->visibleContentScaleFactor()); | 867 localFrameImpl->frame()->view()->visibleContentScaleFactor()); |
| 868 } | 868 } |
| 869 | 869 |
| 870 } // namespace blink | 870 } // namespace blink |
| OLD | NEW |