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

Unified Diff: content/browser/frame_host/render_frame_proxy_host.cc

Issue 782093002: Ensure that before creating proxy of site A, RVH of site A is initialized. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync again Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/frame_host/render_frame_proxy_host.cc
diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
index 7366da77beb358cc97472ff475d8e803c40a07d2..7cf078f26b2f80a7191f929717884f5521d1430d 100644
--- a/content/browser/frame_host/render_frame_proxy_host.cc
+++ b/content/browser/frame_host/render_frame_proxy_host.cc
@@ -44,7 +44,8 @@ RenderFrameProxyHost::RenderFrameProxyHost(SiteInstance* site_instance,
FrameTreeNode* frame_tree_node)
: routing_id_(site_instance->GetProcess()->GetNextRoutingID()),
site_instance_(site_instance),
- frame_tree_node_(frame_tree_node) {
+ frame_tree_node_(frame_tree_node),
+ render_frame_proxy_created_(false) {
GetProcess()->AddRoute(routing_id_, this);
CHECK(g_routing_id_frame_proxy_map.Get().insert(
std::make_pair(
@@ -120,7 +121,12 @@ bool RenderFrameProxyHost::OnMessageReceived(const IPC::Message& msg) {
return handled;
}
+bool RenderFrameProxyHost::IsRenderFrameProxyLive() {
nasko 2015/01/20 23:51:23 If this is just an accessor, it needs to be hacker
lazyboy 2015/01/21 18:52:14 Done.
+ return render_frame_proxy_created_;
+}
+
bool RenderFrameProxyHost::InitRenderFrameProxy() {
+ DCHECK(!render_frame_proxy_created_);
// The process may (if we're sharing a process with another host that already
// initialized it) or may not (we have our own process or the old process
// crashed) have been initialized. Calling Init multiple times will be
@@ -146,6 +152,7 @@ bool RenderFrameProxyHost::InitRenderFrameProxy() {
frame_tree_node_
->current_replication_state()));
+ render_frame_proxy_created_ = true;
return true;
}

Powered by Google App Engine
This is Rietveld 408576698