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

Unified Diff: cc/tiles/picture_layer_tiling.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, 2 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 | « cc/test/fake_display_list_raster_source.cc ('k') | cc/tiles/picture_layer_tiling_set.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiles/picture_layer_tiling.cc
diff --git a/cc/tiles/picture_layer_tiling.cc b/cc/tiles/picture_layer_tiling.cc
index 62e7da80f8efc29c7a6b3a37291ba76a6b89ced1..50a478f1b125f117887040fb93b9522c8259d845 100644
--- a/cc/tiles/picture_layer_tiling.cc
+++ b/cc/tiles/picture_layer_tiling.cc
@@ -284,8 +284,7 @@ void PictureLayerTiling::SetRasterSourceAndResize(
}
void PictureLayerTiling::Invalidate(const Region& layer_invalidation) {
- DCHECK_IMPLIES(tree_ == ACTIVE_TREE,
- !client_->GetPendingOrActiveTwinTiling(this));
+ DCHECK(tree_ != ACTIVE_TREE || !client_->GetPendingOrActiveTwinTiling(this));
RemoveTilesInRegion(layer_invalidation, true /* recreate tiles */);
}
@@ -686,8 +685,8 @@ bool PictureLayerTiling::ComputeTilePriorityRects(
eventually_rect =
tiling_data_.ExpandRectIgnoringBordersToTileBounds(eventually_rect);
- DCHECK_IMPLIES(!eventually_rect.IsEmpty(),
- gfx::Rect(tiling_size()).Contains(eventually_rect))
+ DCHECK(eventually_rect.IsEmpty() ||
+ gfx::Rect(tiling_size()).Contains(eventually_rect))
<< "tiling_size: " << tiling_size().ToString()
<< " eventually_rect: " << eventually_rect.ToString();
« no previous file with comments | « cc/test/fake_display_list_raster_source.cc ('k') | cc/tiles/picture_layer_tiling_set.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698