Chromium Code Reviews| 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/RemoteFrameView.h" | 8 #include "core/frame/RemoteFrameView.h" |
| 9 #include "core/html/HTMLFrameOwnerElement.h" | 9 #include "core/html/HTMLFrameOwnerElement.h" |
| 10 | 10 |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 { | 24 { |
| 25 setView(nullptr); | 25 setView(nullptr); |
| 26 } | 26 } |
| 27 | 27 |
| 28 void RemoteFrame::detach() | 28 void RemoteFrame::detach() |
| 29 { | 29 { |
| 30 detachChildren(); | 30 detachChildren(); |
| 31 m_host = nullptr; | 31 m_host = nullptr; |
| 32 } | 32 } |
| 33 | 33 |
| 34 void RemoteFrame::setView(PassRefPtr<RemoteFrameView> view) | 34 void RemoteFrame::trace(Visitor* visitor) |
| 35 { | |
| 36 visitor->trace(m_view); | |
| 37 Frame::trace(visitor); | |
| 38 } | |
| 39 | |
| 40 void RemoteFrame::setView(PassRefPtrWillBeRawPtr<RemoteFrameView> view) | |
| 35 { | 41 { |
| 36 m_view = view; | 42 m_view = view; |
|
haraken
2014/09/26 09:19:25
Don't we need to call m_view->dispose() here?
sof
2014/09/28 15:11:25
Not needed, as ~RemoteFrameView is empty.
| |
| 37 } | 43 } |
| 38 | 44 |
| 39 void RemoteFrame::createView() | 45 void RemoteFrame::createView() |
| 40 { | 46 { |
| 41 RefPtr<RemoteFrameView> view = RemoteFrameView::create(this); | 47 RefPtrWillBeRawPtr<RemoteFrameView> view = RemoteFrameView::create(this); |
| 42 setView(view); | 48 setView(view); |
| 43 | 49 |
| 44 if (ownerRenderer()) { | 50 if (ownerRenderer()) { |
| 45 HTMLFrameOwnerElement* owner = deprecatedLocalOwner(); | 51 HTMLFrameOwnerElement* owner = deprecatedLocalOwner(); |
| 46 ASSERT(owner); | 52 ASSERT(owner); |
| 47 owner->setWidget(view); | 53 owner->setWidget(view); |
| 48 } | 54 } |
| 49 } | 55 } |
| 50 | 56 |
| 51 } // namespace blink | 57 } // namespace blink |
| OLD | NEW |