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

Unified Diff: cc/resources/tile.cc

Issue 1132443003: cc: Move raster_source from Tile to PrioritizedTile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: cc/resources/tile.cc
diff --git a/cc/resources/tile.cc b/cc/resources/tile.cc
index 2faa6e48b2e4c2c4d4be306394b1c89170dcd1d7..e3588250479835c931ca848f66302d27c0506b0a 100644
--- a/cc/resources/tile.cc
+++ b/cc/resources/tile.cc
@@ -36,7 +36,6 @@ Tile::Tile(TileManager* tile_manager,
required_for_draw_(false),
id_(s_next_id_++),
scheduled_priority_(0) {
- set_raster_source(raster_source);
}
Tile::~Tile() {
@@ -45,11 +44,11 @@ Tile::~Tile() {
"cc::Tile", this);
}
-void Tile::AsValueWithPriorityInto(const TilePriority& priority,
+void Tile::AsValueWithPriorityInto(const PrioritizedTile& prioritized_tile,
base::trace_event::TracedValue* res) const {
TracedValue::MakeDictIntoImplicitSnapshotWithCategory(
TRACE_DISABLED_BY_DEFAULT("cc.debug"), res, "cc::Tile", this);
- TracedValue::SetIDRef(raster_source_.get(), res, "picture_pile");
+ TracedValue::SetIDRef(prioritized_tile.raster_source(), res, "picture_pile");
res->SetDouble("contents_scale", contents_scale_);
MathUtil::AddToTracedValue("content_rect", content_rect_, res);
@@ -57,7 +56,7 @@ void Tile::AsValueWithPriorityInto(const TilePriority& priority,
res->SetInteger("layer_id", layer_id_);
res->BeginDictionary("combined_priority");
- priority.AsValueInto(res);
+ prioritized_tile.priority().AsValueInto(res);
res->EndDictionary();
res->BeginDictionary("draw_info");
@@ -66,7 +65,8 @@ 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(
+ prioritized_tile.priority().resolution));
res->SetInteger("scheduled_priority", scheduled_priority_);

Powered by Google App Engine
This is Rietveld 408576698