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

Unified Diff: cc/resources/tile.cc

Issue 1130123003: cc: Separate the priority from the tile and put in new PrioritizedTile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 7 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/resources/tile.h ('k') | cc/resources/tile_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/tile.cc
diff --git a/cc/resources/tile.cc b/cc/resources/tile.cc
index 94e42ec11e1a68ccd4cb59d8dabb4a71a0623c9b..2faa6e48b2e4c2c4d4be306394b1c89170dcd1d7 100644
--- a/cc/resources/tile.cc
+++ b/cc/resources/tile.cc
@@ -56,16 +56,6 @@ void Tile::AsValueWithPriorityInto(const TilePriority& priority,
res->SetInteger("layer_id", layer_id_);
- // TODO(vmpstr): Remove active and pending priority once tracing is using
- // combined priority or at least can support both.
- res->BeginDictionary("active_priority");
- priority_.AsValueInto(res);
- res->EndDictionary();
-
- res->BeginDictionary("pending_priority");
- priority_.AsValueInto(res);
- res->EndDictionary();
-
res->BeginDictionary("combined_priority");
priority.AsValueInto(res);
res->EndDictionary();
@@ -76,7 +66,7 @@ void Tile::AsValueWithPriorityInto(const TilePriority& priority,
res->SetBoolean("has_resource", HasResource());
res->SetBoolean("is_using_gpu_memory", HasResource() || HasRasterTask());
- res->SetString("resolution", TileResolutionToString(priority_.resolution));
+ res->SetString("resolution", TileResolutionToString(priority.resolution));
res->SetInteger("scheduled_priority", scheduled_priority_);
« no previous file with comments | « cc/resources/tile.h ('k') | cc/resources/tile_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698