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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.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 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 2047 matching lines...) Expand 10 before | Expand all | Expand 10 after
2058 static uint64 next_id = 1; 2058 static uint64 next_id = 1;
2059 uint64 key = next_id++; 2059 uint64 key = next_id++;
2060 Send(new FrameMsg_VisualStateRequest(routing_id_, key)); 2060 Send(new FrameMsg_VisualStateRequest(routing_id_, key));
2061 visual_state_callbacks_.insert(std::make_pair(key, callback)); 2061 visual_state_callbacks_.insert(std::make_pair(key, callback));
2062 } 2062 }
2063 2063
2064 bool RenderFrameHostImpl::IsRenderFrameLive() { 2064 bool RenderFrameHostImpl::IsRenderFrameLive() {
2065 bool is_live = GetProcess()->HasConnection() && render_frame_created_; 2065 bool is_live = GetProcess()->HasConnection() && render_frame_created_;
2066 2066
2067 // Sanity check: the RenderView should always be live if the RenderFrame is. 2067 // Sanity check: the RenderView should always be live if the RenderFrame is.
2068 DCHECK(!is_live || render_view_host_->IsRenderViewLive()); 2068 DCHECK_IMPLIES(is_live, render_view_host_->IsRenderViewLive());
2069 2069
2070 return is_live; 2070 return is_live;
2071 } 2071 }
2072 2072
2073 #if defined(OS_WIN) 2073 #if defined(OS_WIN)
2074 2074
2075 void RenderFrameHostImpl::SetParentNativeViewAccessible( 2075 void RenderFrameHostImpl::SetParentNativeViewAccessible(
2076 gfx::NativeViewAccessible accessible_parent) { 2076 gfx::NativeViewAccessible accessible_parent) {
2077 RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>( 2077 RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>(
2078 render_view_host_->GetWidget()->GetView()); 2078 render_view_host_->GetWidget()->GetView());
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
2285 *dst = src; 2285 *dst = src;
2286 2286
2287 if (src.routing_id != -1) 2287 if (src.routing_id != -1)
2288 dst->tree_id = RoutingIDToAXTreeID(src.routing_id); 2288 dst->tree_id = RoutingIDToAXTreeID(src.routing_id);
2289 2289
2290 if (src.parent_routing_id != -1) 2290 if (src.parent_routing_id != -1)
2291 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id); 2291 dst->parent_tree_id = RoutingIDToAXTreeID(src.parent_routing_id);
2292 } 2292 }
2293 2293
2294 } // namespace content 2294 } // 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