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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 1151973005: Bring RFH/RVH unit tests closer to reality of how RF/RV are initialized (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix IsRenderFrameLive to be independent of RenderViewHost. Created 5 years, 7 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
638 // The renderer now has a RenderFrame for this RenderFrameHost. Note that 638 // The renderer now has a RenderFrame for this RenderFrameHost. Note that
639 // this path is only used for out-of-process iframes. Main frame RenderFrames 639 // this path is only used for out-of-process iframes. Main frame RenderFrames
640 // are created with their RenderView, and same-site iframes are created at the 640 // are created with their RenderView, and same-site iframes are created at the
641 // time of OnCreateChildFrame. 641 // time of OnCreateChildFrame.
642 SetRenderFrameCreated(true); 642 SetRenderFrameCreated(true);
643 643
644 return true; 644 return true;
645 } 645 }
646 646
647 bool RenderFrameHostImpl::IsRenderFrameLive() { 647 bool RenderFrameHostImpl::IsRenderFrameLive() {
648 // RenderFrames are created for main frames at the same time as RenderViews, 648 bool is_live = GetProcess()->HasConnection() && render_frame_created_;
649 // so we rely on IsRenderViewLive. For subframes, we keep track of each
650 // RenderFrame individually with render_frame_created_.
651 bool is_live = !GetParent() ?
652 render_view_host_->IsRenderViewLive() :
653 GetProcess()->HasConnection() && render_frame_created_;
654 649
655 // Sanity check: the RenderView should always be live if the RenderFrame is. 650 // Sanity check: the RenderView should always be live if the RenderFrame is.
656 DCHECK(!is_live || render_view_host_->IsRenderViewLive()); 651 DCHECK(!is_live || render_view_host_->IsRenderViewLive());
657 652
658 return is_live; 653 return is_live;
659 } 654 }
660 655
661 void RenderFrameHostImpl::SetRenderFrameCreated(bool created) { 656 void RenderFrameHostImpl::SetRenderFrameCreated(bool created) {
662 bool was_created = render_frame_created_; 657 bool was_created = render_frame_created_;
663 render_frame_created_ = created; 658 render_frame_created_ = created;
(...skipping 1404 matching lines...) Expand 10 before | Expand all | Expand 10 after
2068 // We may be returning to an existing NavigationEntry that had been granted 2063 // We may be returning to an existing NavigationEntry that had been granted
2069 // file access. If this is a different process, we will need to grant the 2064 // file access. If this is a different process, we will need to grant the
2070 // access again. The files listed in the page state are validated when they 2065 // access again. The files listed in the page state are validated when they
2071 // are received from the renderer to prevent abuse. 2066 // are received from the renderer to prevent abuse.
2072 if (request_params.page_state.IsValid()) { 2067 if (request_params.page_state.IsValid()) {
2073 render_view_host_->GrantFileAccessFromPageState(request_params.page_state); 2068 render_view_host_->GrantFileAccessFromPageState(request_params.page_state);
2074 } 2069 }
2075 } 2070 }
2076 2071
2077 } // namespace content 2072 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698