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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 241223002: Start using RenderFrameProxyHost objects. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moar fixes. Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 main_frame_routing_id_(main_frame_routing_id), 198 main_frame_routing_id_(main_frame_routing_id),
199 run_modal_reply_msg_(NULL), 199 run_modal_reply_msg_(NULL),
200 run_modal_opener_id_(MSG_ROUTING_NONE), 200 run_modal_opener_id_(MSG_ROUTING_NONE),
201 is_waiting_for_beforeunload_ack_(false), 201 is_waiting_for_beforeunload_ack_(false),
202 unload_ack_is_for_cross_site_transition_(false), 202 unload_ack_is_for_cross_site_transition_(false),
203 sudden_termination_allowed_(false), 203 sudden_termination_allowed_(false),
204 render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING), 204 render_view_termination_status_(base::TERMINATION_STATUS_STILL_RUNNING),
205 virtual_keyboard_requested_(false), 205 virtual_keyboard_requested_(false),
206 weak_factory_(this), 206 weak_factory_(this),
207 is_focused_element_editable_(false) { 207 is_focused_element_editable_(false) {
208 LOG(ERROR) << "RVH::RVH[" << this << "]:"
209 << instance->GetProcess()->GetID() << ":" << routing_id
210 << ":" << main_frame_routing_id << ", swapped_out: " << swapped_out;
211
208 DCHECK(instance_.get()); 212 DCHECK(instance_.get());
209 CHECK(delegate_); // http://crbug.com/82827 213 CHECK(delegate_); // http://crbug.com/82827
210 214
211 GetProcess()->EnableSendQueue(); 215 GetProcess()->EnableSendQueue();
212 216
213 if (swapped_out) { 217 if (swapped_out) {
214 rvh_state_ = STATE_SWAPPED_OUT; 218 rvh_state_ = STATE_SWAPPED_OUT;
215 } else { 219 } else {
216 rvh_state_ = STATE_DEFAULT; 220 rvh_state_ = STATE_DEFAULT;
217 instance_->increment_active_view_count(); 221 instance_->increment_active_view_count();
(...skipping 27 matching lines...) Expand all
245 delegate_->RenderViewDeleted(this); 249 delegate_->RenderViewDeleted(this);
246 250
247 // Be sure to clean up any leftover state from cross-site requests. 251 // Be sure to clean up any leftover state from cross-site requests.
248 CrossSiteRequestManager::GetInstance()->SetHasPendingCrossSiteRequest( 252 CrossSiteRequestManager::GetInstance()->SetHasPendingCrossSiteRequest(
249 GetProcess()->GetID(), GetRoutingID(), false); 253 GetProcess()->GetID(), GetRoutingID(), false);
250 254
251 // If this was swapped out, it already decremented the active view 255 // If this was swapped out, it already decremented the active view
252 // count of the SiteInstance it belongs to. 256 // count of the SiteInstance it belongs to.
253 if (IsRVHStateActive(rvh_state_)) 257 if (IsRVHStateActive(rvh_state_))
254 instance_->decrement_active_view_count(); 258 instance_->decrement_active_view_count();
259 LOG(ERROR) << "RVH::~RVH[" << this << "]:";
255 } 260 }
256 261
257 RenderViewHostDelegate* RenderViewHostImpl::GetDelegate() const { 262 RenderViewHostDelegate* RenderViewHostImpl::GetDelegate() const {
258 return delegate_; 263 return delegate_;
259 } 264 }
260 265
261 SiteInstance* RenderViewHostImpl::GetSiteInstance() const { 266 SiteInstance* RenderViewHostImpl::GetSiteInstance() const {
262 return instance_.get(); 267 return instance_.get();
263 } 268 }
264 269
(...skipping 1416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1681 FrameTree* frame_tree = delegate_->GetFrameTree(); 1686 FrameTree* frame_tree = delegate_->GetFrameTree();
1682 1687
1683 frame_tree->ResetForMainFrameSwap(); 1688 frame_tree->ResetForMainFrameSwap();
1684 } 1689 }
1685 1690
1686 void RenderViewHostImpl::SelectWordAroundCaret() { 1691 void RenderViewHostImpl::SelectWordAroundCaret() {
1687 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID())); 1692 Send(new ViewMsg_SelectWordAroundCaret(GetRoutingID()));
1688 } 1693 }
1689 1694
1690 } // namespace content 1695 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_widget_host_view_child_frame.cc ('k') | content/browser/site_instance_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698