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 "components/guest_view/renderer/guest_view_container.h" | 5 #include "components/guest_view/renderer/guest_view_container.h" |
6 | 6 |
7 #include "components/guest_view/common/guest_view_constants.h" | 7 #include "components/guest_view/common/guest_view_constants.h" |
8 #include "components/guest_view/common/guest_view_messages.h" | 8 #include "components/guest_view/common/guest_view_messages.h" |
9 #include "components/guest_view/renderer/guest_view_request.h" | 9 #include "components/guest_view/renderer/guest_view_request.h" |
10 #include "content/public/renderer/render_frame.h" | 10 #include "content/public/renderer/render_frame.h" |
(...skipping 29 matching lines...) Expand all Loading... |
40 GuestViewContainer* container, | 40 GuestViewContainer* container, |
41 content::RenderFrame* render_frame) | 41 content::RenderFrame* render_frame) |
42 : content::RenderFrameObserver(render_frame), | 42 : content::RenderFrameObserver(render_frame), |
43 container_(container) {} | 43 container_(container) {} |
44 | 44 |
45 void GuestViewContainer::RenderFrameLifetimeObserver::OnDestruct() { | 45 void GuestViewContainer::RenderFrameLifetimeObserver::OnDestruct() { |
46 container_->RenderFrameDestroyed(); | 46 container_->RenderFrameDestroyed(); |
47 } | 47 } |
48 | 48 |
49 GuestViewContainer::GuestViewContainer(content::RenderFrame* render_frame) | 49 GuestViewContainer::GuestViewContainer(content::RenderFrame* render_frame) |
50 : element_instance_id_(guest_view::kInstanceIDNone), | 50 : ready_(false), |
| 51 element_instance_id_(guest_view::kInstanceIDNone), |
51 render_frame_(render_frame), | 52 render_frame_(render_frame), |
52 ready_(false), | |
53 in_destruction_(false) { | 53 in_destruction_(false) { |
54 render_frame_lifetime_observer_.reset( | 54 render_frame_lifetime_observer_.reset( |
55 new RenderFrameLifetimeObserver(this, render_frame_)); | 55 new RenderFrameLifetimeObserver(this, render_frame_)); |
56 } | 56 } |
57 | 57 |
58 GuestViewContainer::~GuestViewContainer() { | 58 GuestViewContainer::~GuestViewContainer() { |
59 // Note: Cleanups should be done in GuestViewContainer::Destroy(), not here. | 59 // Note: Cleanups should be done in GuestViewContainer::Destroy(), not here. |
60 } | 60 } |
61 | 61 |
62 // static. | 62 // static. |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
170 DCHECK(!g_guest_view_container_map.Get().count(element_instance_id)); | 170 DCHECK(!g_guest_view_container_map.Get().count(element_instance_id)); |
171 g_guest_view_container_map.Get().insert( | 171 g_guest_view_container_map.Get().insert( |
172 std::make_pair(element_instance_id, this)); | 172 std::make_pair(element_instance_id, this)); |
173 } | 173 } |
174 | 174 |
175 void GuestViewContainer::DidDestroyElement() { | 175 void GuestViewContainer::DidDestroyElement() { |
176 Destroy(); | 176 Destroy(); |
177 } | 177 } |
178 | 178 |
179 } // namespace guest_view | 179 } // namespace guest_view |
OLD | NEW |