Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Side by Side Diff: components/guest_view/renderer/guest_view_container.cc

Issue 972313002: Make <webview> use out-of-process iframe architecture. (Closed) Base URL: ssh://saopaulo.wat/mnt/dev/shared/src@testoopif2z-better-chrome
Patch Set: Sync after components/ refactor Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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 render_frame_(render_frame), 51 element_instance_id_(guest_view::kInstanceIDNone),
52 ready_(false) { 52 render_frame_(render_frame) {
53 render_frame_lifetime_observer_.reset( 53 render_frame_lifetime_observer_.reset(
54 new RenderFrameLifetimeObserver(this, render_frame_)); 54 new RenderFrameLifetimeObserver(this, render_frame_));
55 } 55 }
56 56
57 GuestViewContainer::~GuestViewContainer() { 57 GuestViewContainer::~GuestViewContainer() {
58 if (element_instance_id() != guest_view::kInstanceIDNone) 58 if (element_instance_id() != guest_view::kInstanceIDNone)
59 g_guest_view_container_map.Get().erase(element_instance_id()); 59 g_guest_view_container_map.Get().erase(element_instance_id());
60 60
61 if (pending_response_.get()) 61 if (pending_response_.get())
62 pending_response_->ExecuteCallbackIfAvailable(0 /* argc */, nullptr); 62 pending_response_->ExecuteCallbackIfAvailable(0 /* argc */, nullptr);
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 void GuestViewContainer::SetElementInstanceID(int element_instance_id) { 140 void GuestViewContainer::SetElementInstanceID(int element_instance_id) {
141 DCHECK_EQ(element_instance_id_, guest_view::kInstanceIDNone); 141 DCHECK_EQ(element_instance_id_, guest_view::kInstanceIDNone);
142 element_instance_id_ = element_instance_id; 142 element_instance_id_ = element_instance_id;
143 143
144 DCHECK(!g_guest_view_container_map.Get().count(element_instance_id)); 144 DCHECK(!g_guest_view_container_map.Get().count(element_instance_id));
145 g_guest_view_container_map.Get().insert( 145 g_guest_view_container_map.Get().insert(
146 std::make_pair(element_instance_id, this)); 146 std::make_pair(element_instance_id, this));
147 } 147 }
148 148
149 } // namespace guest_view 149 } // namespace guest_view
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698