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

Unified Diff: cc/resources/tile.cc

Issue 1051993002: cc: Remove tile sharing from tilings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 5 years, 8 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 45b4a30816e1958d2065eaffaa4e306d4a75486a..671c69a9b5a05f5d2110dd5886063b98df472529 100644
--- a/cc/resources/tile.cc
+++ b/cc/resources/tile.cc
@@ -16,7 +16,7 @@ namespace cc {
Tile::Id Tile::s_next_id_ = 0;
Tile::Tile(TileManager* tile_manager,
- RasterSource* raster_source,
+ scoped_refptr<RasterSource>* raster_source,
const gfx::Size& desired_texture_size,
const gfx::Rect& content_rect,
float contents_scale,
@@ -32,14 +32,11 @@ Tile::Tile(TileManager* tile_manager,
flags_(flags),
tiling_i_index_(-1),
tiling_j_index_(-1),
- is_shared_(false),
required_for_activation_(false),
required_for_draw_(false),
id_(s_next_id_++),
scheduled_priority_(0) {
set_raster_source(raster_source);
- for (int i = 0; i <= LAST_TREE; i++)
- is_occluded_[i] = false;
}
Tile::~Tile() {
@@ -52,7 +49,7 @@ void Tile::AsValueWithPriorityInto(const TilePriority& priority,
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(raster_source_->get(), res, "picture_pile");
res->SetDouble("contents_scale", contents_scale_);
MathUtil::AddToTracedValue("content_rect", content_rect_, res);
@@ -62,11 +59,11 @@ void Tile::AsValueWithPriorityInto(const TilePriority& priority,
// TODO(vmpstr): Remove active and pending priority once tracing is using
// combined priority or at least can support both.
res->BeginDictionary("active_priority");
- priority_[ACTIVE_TREE].AsValueInto(res);
+ priority_.AsValueInto(res);
res->EndDictionary();
res->BeginDictionary("pending_priority");
- priority_[PENDING_TREE].AsValueInto(res);
+ priority_.AsValueInto(res);
res->EndDictionary();
res->BeginDictionary("combined_priority");
@@ -79,8 +76,7 @@ void Tile::AsValueWithPriorityInto(const TilePriority& priority,
res->SetBoolean("has_resource", HasResource());
res->SetBoolean("is_using_gpu_memory", HasResource() || HasRasterTask());
- res->SetString("resolution",
- TileResolutionToString(combined_priority().resolution));
+ res->SetString("resolution", TileResolutionToString(priority_.resolution));
res->SetInteger("scheduled_priority", scheduled_priority_);

Powered by Google App Engine
This is Rietveld 408576698