| 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 "core/frame/RemoteFrameClient.h" | 8 #include "core/frame/RemoteFrameClient.h" |
| 9 #include "core/frame/RemoteFrameView.h" | 9 #include "core/frame/RemoteFrameView.h" |
| 10 #include "core/html/HTMLFrameOwnerElement.h" | 10 #include "core/html/HTMLFrameOwnerElement.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 { | 30 { |
| 31 remoteFrameClient()->navigate(ResourceRequest(url, referrer), lockBackForwar
dList); | 31 remoteFrameClient()->navigate(ResourceRequest(url, referrer), lockBackForwar
dList); |
| 32 } | 32 } |
| 33 | 33 |
| 34 void RemoteFrame::detach() | 34 void RemoteFrame::detach() |
| 35 { | 35 { |
| 36 detachChildren(); | 36 detachChildren(); |
| 37 m_host = nullptr; | 37 m_host = nullptr; |
| 38 } | 38 } |
| 39 | 39 |
| 40 void RemoteFrame::setView(PassRefPtr<RemoteFrameView> view) | 40 void RemoteFrame::trace(Visitor* visitor) |
| 41 { |
| 42 visitor->trace(m_view); |
| 43 Frame::trace(visitor); |
| 44 } |
| 45 |
| 46 void RemoteFrame::setView(PassRefPtrWillBeRawPtr<RemoteFrameView> view) |
| 41 { | 47 { |
| 42 m_view = view; | 48 m_view = view; |
| 43 } | 49 } |
| 44 | 50 |
| 45 void RemoteFrame::createView() | 51 void RemoteFrame::createView() |
| 46 { | 52 { |
| 47 RefPtr<RemoteFrameView> view = RemoteFrameView::create(this); | 53 RefPtrWillBeRawPtr<RemoteFrameView> view = RemoteFrameView::create(this); |
| 48 setView(view); | 54 setView(view); |
| 49 | 55 |
| 50 if (ownerRenderer()) { | 56 if (ownerRenderer()) { |
| 51 HTMLFrameOwnerElement* owner = deprecatedLocalOwner(); | 57 HTMLFrameOwnerElement* owner = deprecatedLocalOwner(); |
| 52 ASSERT(owner); | 58 ASSERT(owner); |
| 53 owner->setWidget(view); | 59 owner->setWidget(view); |
| 54 } | 60 } |
| 55 } | 61 } |
| 56 | 62 |
| 57 RemoteFrameClient* RemoteFrame::remoteFrameClient() const | 63 RemoteFrameClient* RemoteFrame::remoteFrameClient() const |
| 58 { | 64 { |
| 59 return static_cast<RemoteFrameClient*>(client()); | 65 return static_cast<RemoteFrameClient*>(client()); |
| 60 } | 66 } |
| 61 | 67 |
| 62 } // namespace blink | 68 } // namespace blink |
| OLD | NEW |