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

Unified Diff: cc/tiles/tile_manager.cc

Issue 1379783002: Allow one-copy task tile worker pool to use compressed textures. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Replace memory_efficient_format* with preferred_tile_format Created 5 years 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
Index: cc/tiles/tile_manager.cc
diff --git a/cc/tiles/tile_manager.cc b/cc/tiles/tile_manager.cc
index 477025f3f80f9da5f0eb9304eafe787d7c398c64..76bba03fd5c43acdb3785e7f74ebc428f80d886a 100644
--- a/cc/tiles/tile_manager.cc
+++ b/cc/tiles/tile_manager.cc
@@ -671,8 +671,10 @@ scoped_refptr<RasterTask> TileManager::CreateRasterTask(
if (resource) {
resource_content_id = tile->invalidated_id();
DCHECK_EQ(DetermineResourceFormat(tile), resource->format());
- DCHECK_EQ(tile->desired_texture_size().ToString(),
- resource->size().ToString());
+ if (!IsResourceFormatCompressed(resource->format())) {
reveman 2015/12/02 18:27:18 nit: is this conditional still needed? In that cas
christiank 2015/12/03 12:57:59 No longer need, removed.
+ DCHECK_EQ(tile->desired_texture_size().ToString(),
+ resource->size().ToString());
+ }
} else {
resource = resource_pool_->AcquireResource(tile->desired_texture_size(),
DetermineResourceFormat(tile));

Powered by Google App Engine
This is Rietveld 408576698