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

Unified Diff: cc/resources/tile.cc

Issue 62283012: cc: Added tile bundles (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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/resources/tile.cc
diff --git a/cc/resources/tile.cc b/cc/resources/tile.cc
index b4cce563dfc6909517ae57c1d5ab97177f2cc548..33124640a1927f0b4755ad92807275938224c42d 100644
--- a/cc/resources/tile.cc
+++ b/cc/resources/tile.cc
@@ -31,6 +31,8 @@ Tile::Tile(TileManager* tile_manager,
layer_id_(layer_id),
source_frame_number_(source_frame_number),
can_use_lcd_text_(can_use_lcd_text),
+ required_for_activation_(false),
+ is_visible_(false),
id_(s_next_id_++) {
set_picture_pile(picture_pile);
}
@@ -41,19 +43,11 @@ Tile::~Tile() {
"cc::Tile", this);
}
-void Tile::SetPriority(WhichTree tree, const TilePriority& priority) {
- if (priority == priority_[tree])
- return;
-
- priority_[tree] = priority;
- tile_manager_->DidChangeTilePriority(this);
-}
-
void Tile::MarkRequiredForActivation() {
- if (priority_[PENDING_TREE].required_for_activation)
+ if (required_for_activation_)
return;
- priority_[PENDING_TREE].required_for_activation = true;
+ required_for_activation_ = true;
tile_manager_->DidChangeTilePriority(this);
}
@@ -66,10 +60,9 @@ scoped_ptr<base::Value> Tile::AsValue() const {
res->SetDouble("contents_scale", contents_scale_);
res->Set("content_rect", MathUtil::AsValue(content_rect_).release());
res->SetInteger("layer_id", layer_id_);
- res->Set("active_priority", priority_[ACTIVE_TREE].AsValue().release());
- res->Set("pending_priority", priority_[PENDING_TREE].AsValue().release());
res->Set("managed_state", managed_state_.AsValue().release());
res->SetBoolean("can_use_lcd_text", can_use_lcd_text_);
+ res->SetBoolean("required_for_activation", required_for_activation_);
return res.PassAs<base::Value>();
}

Powered by Google App Engine
This is Rietveld 408576698