| 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 "core/frame/RemoteFrame.h" | 6 #include "core/frame/RemoteFrame.h" |
| 7 | 7 |
| 8 #include "bindings/core/v8/WindowProxy.h" | 8 #include "bindings/core/v8/WindowProxy.h" |
| 9 #include "bindings/core/v8/WindowProxyManager.h" | 9 #include "bindings/core/v8/WindowProxyManager.h" |
| 10 #include "core/dom/RemoteSecurityContext.h" | 10 #include "core/dom/RemoteSecurityContext.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 { | 33 { |
| 34 } | 34 } |
| 35 | 35 |
| 36 PassRefPtrWillBeRawPtr<RemoteFrame> RemoteFrame::create(RemoteFrameClient* clien
t, FrameHost* host, FrameOwner* owner) | 36 PassRefPtrWillBeRawPtr<RemoteFrame> RemoteFrame::create(RemoteFrameClient* clien
t, FrameHost* host, FrameOwner* owner) |
| 37 { | 37 { |
| 38 return adoptRefWillBeNoop(new RemoteFrame(client, host, owner)); | 38 return adoptRefWillBeNoop(new RemoteFrame(client, host, owner)); |
| 39 } | 39 } |
| 40 | 40 |
| 41 RemoteFrame::~RemoteFrame() | 41 RemoteFrame::~RemoteFrame() |
| 42 { | 42 { |
| 43 ASSERT(!m_view); |
| 43 } | 44 } |
| 44 | 45 |
| 45 DEFINE_TRACE(RemoteFrame) | 46 DEFINE_TRACE(RemoteFrame) |
| 46 { | 47 { |
| 47 visitor->trace(m_view); | 48 visitor->trace(m_view); |
| 48 visitor->trace(m_securityContext); | 49 visitor->trace(m_securityContext); |
| 49 visitor->trace(m_domWindow); | 50 visitor->trace(m_domWindow); |
| 50 visitor->trace(m_windowProxyManager); | 51 visitor->trace(m_windowProxyManager); |
| 51 Frame::trace(visitor); | 52 Frame::trace(visitor); |
| 52 } | 53 } |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 182 ASSERT(owner()); | 183 ASSERT(owner()); |
| 183 toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate(); | 184 toHTMLFrameOwnerElement(owner())->setNeedsCompositingUpdate(); |
| 184 } | 185 } |
| 185 | 186 |
| 186 RemoteFrameView* RemoteFrame::view() const | 187 RemoteFrameView* RemoteFrame::view() const |
| 187 { | 188 { |
| 188 return m_view.get(); | 189 return m_view.get(); |
| 189 } | 190 } |
| 190 | 191 |
| 191 } // namespace blink | 192 } // namespace blink |
| OLD | NEW |