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

Unified Diff: cc/tiles/tile_manager.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/tiles/picture_layer_tiling_set.cc ('k') | cc/tiles/tile_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiles/tile_manager.cc
diff --git a/cc/tiles/tile_manager.cc b/cc/tiles/tile_manager.cc
index 56e6971a8b746abed8966fadd810f73c9b59a854..eccf3f0bf17a551d53a9a5ccf37cb2478da23596 100644
--- a/cc/tiles/tile_manager.cc
+++ b/cc/tiles/tile_manager.cc
@@ -521,8 +521,8 @@ void TileManager::AssignGpuMemoryToTiles(
tile->scheduled_priority_ = schedule_priority++;
- DCHECK_IMPLIES(tile->draw_info().mode() != TileDrawInfo::OOM_MODE,
- !tile->draw_info().IsReadyToDraw());
+ DCHECK(tile->draw_info().mode() == TileDrawInfo::OOM_MODE ||
+ !tile->draw_info().IsReadyToDraw());
// If the tile already has a raster_task, then the memory used by it is
// already accounted for in memory_usage. Otherwise, we'll have to acquire
@@ -795,8 +795,8 @@ bool TileManager::AreRequiredTilesReadyToDraw(
client_->BuildRasterQueue(global_state_.tree_priority, type));
for (; !all_queue->IsEmpty(); all_queue->Pop()) {
Tile* tile = all_queue->Top().tile();
- DCHECK_IMPLIES(tile->required_for_activation(),
- tile->draw_info().IsReadyToDraw());
+ DCHECK(!tile->required_for_activation() ||
+ tile->draw_info().IsReadyToDraw());
}
#endif
return true;
« no previous file with comments | « cc/tiles/picture_layer_tiling_set.cc ('k') | cc/tiles/tile_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698