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

Side by Side Diff: extensions/renderer/guest_view/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: address all comments from Nasko and Charlie, minus is_loading 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 "extensions/renderer/guest_view/guest_view_container.h" 5 #include "extensions/renderer/guest_view/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 "content/public/renderer/render_frame.h" 9 #include "content/public/renderer/render_frame.h"
10 #include "content/public/renderer/render_frame_observer.h" 10 #include "content/public/renderer/render_frame_observer.h"
(...skipping 30 matching lines...) Expand all
41 GuestViewContainer* container, 41 GuestViewContainer* container,
42 content::RenderFrame* render_frame) 42 content::RenderFrame* render_frame)
43 : content::RenderFrameObserver(render_frame), 43 : content::RenderFrameObserver(render_frame),
44 container_(container) {} 44 container_(container) {}
45 45
46 void GuestViewContainer::RenderFrameLifetimeObserver::OnDestruct() { 46 void GuestViewContainer::RenderFrameLifetimeObserver::OnDestruct() {
47 container_->RenderFrameDestroyed(); 47 container_->RenderFrameDestroyed();
48 } 48 }
49 49
50 GuestViewContainer::GuestViewContainer(content::RenderFrame* render_frame) 50 GuestViewContainer::GuestViewContainer(content::RenderFrame* render_frame)
51 : element_instance_id_(guest_view::kInstanceIDNone), 51 : ready_(false),
52 render_frame_(render_frame), 52 element_instance_id_(guest_view::kInstanceIDNone),
53 ready_(false) { 53 render_frame_(render_frame) {
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 if (element_instance_id() != guest_view::kInstanceIDNone) 59 if (element_instance_id() != guest_view::kInstanceIDNone)
60 g_guest_view_container_map.Get().erase(element_instance_id()); 60 g_guest_view_container_map.Get().erase(element_instance_id());
61 61
62 if (pending_response_.get()) 62 if (pending_response_.get())
63 pending_response_->ExecuteCallbackIfAvailable(0 /* argc */, nullptr); 63 pending_response_->ExecuteCallbackIfAvailable(0 /* argc */, nullptr);
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 void GuestViewContainer::SetElementInstanceID(int element_instance_id) { 141 void GuestViewContainer::SetElementInstanceID(int element_instance_id) {
142 DCHECK_EQ(element_instance_id_, guest_view::kInstanceIDNone); 142 DCHECK_EQ(element_instance_id_, guest_view::kInstanceIDNone);
143 element_instance_id_ = element_instance_id; 143 element_instance_id_ = element_instance_id;
144 144
145 DCHECK(!g_guest_view_container_map.Get().count(element_instance_id)); 145 DCHECK(!g_guest_view_container_map.Get().count(element_instance_id));
146 g_guest_view_container_map.Get().insert( 146 g_guest_view_container_map.Get().insert(
147 std::make_pair(element_instance_id, this)); 147 std::make_pair(element_instance_id, this));
148 } 148 }
149 149
150 } // namespace extensions 150 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698