| Index: content/browser/frame_host/render_frame_host_impl.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
| index 2f7909aa9f906ebdb243e26e6322a4379a535aad..8b2fce939dafd4cd18e8304a45f8c3a4f4cb524d 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -935,10 +935,8 @@ gfx::AcceleratedWidget
|
| // Only the main frame's current frame host is connected to the native
|
| // widget tree for accessibility, so return null if this is queried on
|
| // any other frame.
|
| - if (frame_tree_node()->parent() ||
|
| - frame_tree_node()->current_frame_host() != this) {
|
| + if (frame_tree_node()->parent() || !IsCurrent())
|
| return gfx::kNullAcceleratedWidget;
|
| - }
|
|
|
| RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>(
|
| render_view_host_->GetWidget()->GetView());
|
| @@ -1152,8 +1150,7 @@ void RenderFrameHostImpl::OnCreateChildFrame(
|
| // child, but by the time we get here, it's possible for the host to have been
|
| // swapped out, or for its process to have disconnected (maybe due to browser
|
| // shutdown). Ignore such messages.
|
| - if (!is_active() || frame_tree_node_->current_frame_host() != this ||
|
| - !render_frame_created_)
|
| + if (!is_active() || !IsCurrent() || !render_frame_created_)
|
| return;
|
|
|
| frame_tree_->AddFrame(frame_tree_node_, GetProcess()->GetID(), new_routing_id,
|
| @@ -2546,7 +2543,7 @@ void RenderFrameHostImpl::CreateNewWindow(
|
|
|
| // Ignore creation when sent from a frame that's not current or created.
|
| bool can_create_window =
|
| - frame_tree_node_->current_frame_host() == this && render_frame_created_ &&
|
| + IsCurrent() && render_frame_created_ &&
|
| GetContentClient()->browser()->CanCreateWindow(
|
| this, last_committed_url(),
|
| frame_tree_node_->frame_tree()->GetMainFrame()->last_committed_url(),
|
| @@ -3038,8 +3035,7 @@ void RenderFrameHostImpl::CommitNavigation(
|
|
|
| // The renderer can exit view source mode when any error or cancellation
|
| // happen. When reusing the same renderer, overwrite to recover the mode.
|
| - if (is_view_source &&
|
| - this == frame_tree_node_->render_manager()->current_frame_host()) {
|
| + if (is_view_source && IsCurrent()) {
|
| DCHECK(!GetParent());
|
| render_view_host()->Send(new FrameMsg_EnableViewSourceMode(routing_id_));
|
| }
|
| @@ -3385,8 +3381,12 @@ bool RenderFrameHostImpl::IsRenderFrameLive() {
|
| return is_live;
|
| }
|
|
|
| +bool RenderFrameHostImpl::IsCurrent() {
|
| + return this == frame_tree_node_->current_frame_host();
|
| +}
|
| +
|
| int RenderFrameHostImpl::GetProxyCount() {
|
| - if (this != frame_tree_node_->current_frame_host())
|
| + if (!IsCurrent())
|
| return 0;
|
| return frame_tree_node_->render_manager()->GetProxyCount();
|
| }
|
|
|