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

Unified Diff: content/renderer/render_frame_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, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/gpu/mailbox_output_surface.cc ('k') | gpu/command_buffer/service/mailbox_manager_sync.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 2e7d77a987884907027c9592b092779f2be946ff..3d81f0c7a8069fefceebb8c33953b2ec3db1db7f 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -585,7 +585,7 @@ void RenderFrameImpl::CreateFrame(
replicated_state.sandbox_flags);
}
render_frame->SetWebFrame(web_frame);
- CHECK_IMPLIES(parent_routing_id == MSG_ROUTING_NONE, !web_frame->parent());
+ CHECK(parent_routing_id != MSG_ROUTING_NONE || !web_frame->parent());
if (widget_params.routing_id != MSG_ROUTING_NONE) {
CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -1126,7 +1126,7 @@ void RenderFrameImpl::OnSwapOut(
bool is_main_frame = !frame_->parent();
// This codepath should only be hit for subframes when in --site-per-process.
- CHECK_IMPLIES(!is_main_frame, is_site_per_process);
+ CHECK(is_main_frame || is_site_per_process);
// Only run unload if we're not swapped out yet, but send the ack either way.
if (!is_swapped_out_) {
@@ -2661,9 +2661,8 @@ void RenderFrameImpl::didCommitProvisionalLoad(
// UpdateSessionHistory and update page_id_ even in this case, so that
// the current entry gets a state update and so that we don't send a
// state update to the wrong entry when we swap back in.
- DCHECK_IMPLIES(
- navigation_state->start_params().should_replace_current_entry,
- render_view_->history_list_length_ > 0);
+ DCHECK(!navigation_state->start_params().should_replace_current_entry ||
+ render_view_->history_list_length_ > 0);
if (GetLoadingUrl() != GURL(kSwappedOutURL) &&
!navigation_state->start_params().should_replace_current_entry) {
// Advance our offset in session history, applying the length limit.
« no previous file with comments | « content/renderer/gpu/mailbox_output_surface.cc ('k') | gpu/command_buffer/service/mailbox_manager_sync.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698