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

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

Issue 1417903005: Revert of Remove DCHECK_IMPLIES/CHECK_IMPLIES. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 "content/browser/frame_host/render_frame_proxy_host.h" 5 #include "content/browser/frame_host/render_frame_proxy_host.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "content/browser/bad_message.h" 8 #include "content/browser/bad_message.h"
9 #include "content/browser/frame_host/cross_process_frame_connector.h" 9 #include "content/browser/frame_host/cross_process_frame_connector.h"
10 #include "content/browser/frame_host/frame_tree.h" 10 #include "content/browser/frame_host/frame_tree.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 site_instance_(site_instance), 50 site_instance_(site_instance),
51 process_(site_instance->GetProcess()), 51 process_(site_instance->GetProcess()),
52 frame_tree_node_(frame_tree_node), 52 frame_tree_node_(frame_tree_node),
53 render_frame_proxy_created_(false), 53 render_frame_proxy_created_(false),
54 render_view_host_(render_view_host) { 54 render_view_host_(render_view_host) {
55 GetProcess()->AddRoute(routing_id_, this); 55 GetProcess()->AddRoute(routing_id_, this);
56 CHECK(g_routing_id_frame_proxy_map.Get().insert( 56 CHECK(g_routing_id_frame_proxy_map.Get().insert(
57 std::make_pair( 57 std::make_pair(
58 RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_), 58 RenderFrameProxyHostID(GetProcess()->GetID(), routing_id_),
59 this)).second); 59 this)).second);
60 CHECK(render_view_host || 60 CHECK_IMPLIES(!render_view_host,
61 (frame_tree_node_->render_manager()->ForInnerDelegate() && 61 frame_tree_node_->render_manager()->ForInnerDelegate() &&
62 frame_tree_node_->IsMainFrame())); 62 frame_tree_node_->IsMainFrame());
63 if (render_view_host) 63 if (render_view_host)
64 frame_tree_node_->frame_tree()->AddRenderViewHostRef(render_view_host_); 64 frame_tree_node_->frame_tree()->AddRenderViewHostRef(render_view_host_);
65 65
66 bool is_proxy_to_parent = !frame_tree_node_->IsMainFrame() && 66 bool is_proxy_to_parent = !frame_tree_node_->IsMainFrame() &&
67 frame_tree_node_->parent() 67 frame_tree_node_->parent()
68 ->render_manager() 68 ->render_manager()
69 ->current_frame_host() 69 ->current_frame_host()
70 ->GetSiteInstance() == site_instance; 70 ->GetSiteInstance() == site_instance;
71 bool is_proxy_to_outer_delegate = 71 bool is_proxy_to_outer_delegate =
72 frame_tree_node_->IsMainFrame() && 72 frame_tree_node_->IsMainFrame() &&
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params)); 315 new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params));
316 } 316 }
317 } 317 }
318 318
319 void RenderFrameProxyHost::OnDidChangeOpener(int32 opener_routing_id) { 319 void RenderFrameProxyHost::OnDidChangeOpener(int32 opener_routing_id) {
320 frame_tree_node_->render_manager()->DidChangeOpener(opener_routing_id, 320 frame_tree_node_->render_manager()->DidChangeOpener(opener_routing_id,
321 GetSiteInstance()); 321 GetSiteInstance());
322 } 322 }
323 323
324 } // namespace content 324 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/renderer_host/compositor_impl_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698