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

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

Issue 1213193003: Remove DCHECK_IMPLIES and CHECK_IMPLIES (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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 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_IMPLIES(!render_view_host, 60 CHECK(render_view_host ||
61 frame_tree_node_->render_manager()->ForInnerDelegate()); 61 frame_tree_node_->render_manager()->ForInnerDelegate());
62 if (render_view_host) 62 if (render_view_host)
63 frame_tree_node_->frame_tree()->AddRenderViewHostRef(render_view_host_); 63 frame_tree_node_->frame_tree()->AddRenderViewHostRef(render_view_host_);
64 64
65 bool is_proxy_to_parent = !frame_tree_node_->IsMainFrame() && 65 bool is_proxy_to_parent = !frame_tree_node_->IsMainFrame() &&
66 frame_tree_node_->parent() 66 frame_tree_node_->parent()
67 ->render_manager() 67 ->render_manager()
68 ->current_frame_host() 68 ->current_frame_host()
69 ->GetSiteInstance() == site_instance; 69 ->GetSiteInstance() == site_instance;
70 70
71 // If this is a proxy to parent frame or this proxy is for the inner 71 // If this is a proxy to parent frame or this proxy is for the inner
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 base::Bind(&MessagePortMessageFilter::RouteMessageEventWithMessagePorts, 287 base::Bind(&MessagePortMessageFilter::RouteMessageEventWithMessagePorts,
288 message_port_message_filter, target_rfh->GetRoutingID(), 288 message_port_message_filter, target_rfh->GetRoutingID(),
289 new_params)); 289 new_params));
290 } else { 290 } else {
291 target_rfh->Send( 291 target_rfh->Send(
292 new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params)); 292 new FrameMsg_PostMessageEvent(target_rfh->GetRoutingID(), new_params));
293 } 293 }
294 } 294 }
295 295
296 } // namespace content 296 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/render_frame_host_manager.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698