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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.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 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 1952 matching lines...) Expand 10 before | Expand all | Expand 10 after
1963 static uint64 next_id = 1; 1963 static uint64 next_id = 1;
1964 uint64 key = next_id++; 1964 uint64 key = next_id++;
1965 Send(new FrameMsg_VisualStateRequest(routing_id_, key)); 1965 Send(new FrameMsg_VisualStateRequest(routing_id_, key));
1966 visual_state_callbacks_.insert(std::make_pair(key, callback)); 1966 visual_state_callbacks_.insert(std::make_pair(key, callback));
1967 } 1967 }
1968 1968
1969 bool RenderFrameHostImpl::IsRenderFrameLive() { 1969 bool RenderFrameHostImpl::IsRenderFrameLive() {
1970 bool is_live = GetProcess()->HasConnection() && render_frame_created_; 1970 bool is_live = GetProcess()->HasConnection() && render_frame_created_;
1971 1971
1972 // Sanity check: the RenderView should always be live if the RenderFrame is. 1972 // Sanity check: the RenderView should always be live if the RenderFrame is.
1973 DCHECK_IMPLIES(is_live, render_view_host_->IsRenderViewLive()); 1973 DCHECK(!is_live || render_view_host_->IsRenderViewLive());
1974 1974
1975 return is_live; 1975 return is_live;
1976 } 1976 }
1977 1977
1978 #if defined(OS_WIN) 1978 #if defined(OS_WIN)
1979 1979
1980 void RenderFrameHostImpl::SetParentNativeViewAccessible( 1980 void RenderFrameHostImpl::SetParentNativeViewAccessible(
1981 gfx::NativeViewAccessible accessible_parent) { 1981 gfx::NativeViewAccessible accessible_parent) {
1982 RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>( 1982 RenderWidgetHostViewBase* view = static_cast<RenderWidgetHostViewBase*>(
1983 render_view_host_->GetView()); 1983 render_view_host_->GetView());
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
2089 // We may be returning to an existing NavigationEntry that had been granted 2089 // We may be returning to an existing NavigationEntry that had been granted
2090 // file access. If this is a different process, we will need to grant the 2090 // file access. If this is a different process, we will need to grant the
2091 // access again. The files listed in the page state are validated when they 2091 // access again. The files listed in the page state are validated when they
2092 // are received from the renderer to prevent abuse. 2092 // are received from the renderer to prevent abuse.
2093 if (request_params.page_state.IsValid()) { 2093 if (request_params.page_state.IsValid()) {
2094 render_view_host_->GrantFileAccessFromPageState(request_params.page_state); 2094 render_view_host_->GrantFileAccessFromPageState(request_params.page_state);
2095 } 2095 }
2096 } 2096 }
2097 2097
2098 } // namespace content 2098 } // 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