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

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

Issue 1421483005: Reland: 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 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 2055 matching lines...) Expand 10 before | Expand all | Expand 10 after
2066 static uint64 next_id = 1; 2066 static uint64 next_id = 1;
2067 uint64 key = next_id++; 2067 uint64 key = next_id++;
2068 Send(new FrameMsg_VisualStateRequest(routing_id_, key)); 2068 Send(new FrameMsg_VisualStateRequest(routing_id_, key));
2069 visual_state_callbacks_.insert(std::make_pair(key, callback)); 2069 visual_state_callbacks_.insert(std::make_pair(key, callback));
2070 } 2070 }
2071 2071
2072 bool RenderFrameHostImpl::IsRenderFrameLive() { 2072 bool RenderFrameHostImpl::IsRenderFrameLive() {
2073 bool is_live = GetProcess()->HasConnection() && render_frame_created_; 2073 bool is_live = GetProcess()->HasConnection() && render_frame_created_;
2074 2074
2075 // Sanity check: the RenderView should always be live if the RenderFrame is. 2075 // Sanity check: the RenderView should always be live if the RenderFrame is.
2076 DCHECK_IMPLIES(is_live, render_view_host_->IsRenderViewLive()); 2076 DCHECK(!is_live || render_view_host_->IsRenderViewLive());
2077 2077
2078 return is_live; 2078 return is_live;
2079 } 2079 }
2080 2080
2081 #if defined(OS_WIN) 2081 #if defined(OS_WIN)
2082 2082
2083 void RenderFrameHostImpl::SetParentNativeViewAccessible( 2083 void RenderFrameHostImpl::SetParentNativeViewAccessible(
2084 gfx::NativeViewAccessible accessible_parent) { 2084 gfx::NativeViewAccessible accessible_parent) {
2085 RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>( 2085 RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>(
2086 render_view_host_->GetWidget()->GetView()); 2086 render_view_host_->GetWidget()->GetView());
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
2293 *dst = src; 2293 *dst = src;
2294 2294
2295 if (src.routing_id != -1) 2295 if (src.routing_id != -1)
2296 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); 2296 dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
2297 2297
2298 if (src.parent_routing_id != -1) 2298 if (src.parent_routing_id != -1)
2299 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); 2299 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
2300 } 2300 }
2301 2301
2302 } // namespace content 2302 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_request.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698