Merge 241994 "Revert "cc: Added tile bundles""

cc/resources/tile.cc

Index: cc/resources/tile.cc
===================================================================
--- cc/resources/tile.cc	(revision 243316)
+++ cc/resources/tile.cc	(working copy)
@@ -31,8 +31,6 @@
     layer_id_(layer_id),
     source_frame_number_(source_frame_number),
     flags_(flags),
-    required_for_activation_(false),
-    is_visible_(false),
     id_(s_next_id_++) {
   set_picture_pile(picture_pile);
 }
@@ -43,11 +41,19 @@
       "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 (required_for_activation_)
+  if (priority_[PENDING_TREE].required_for_activation)
     return;
 
-  required_for_activation_ = true;
+  priority_[PENDING_TREE].required_for_activation = true;
   tile_manager_->DidChangeTilePriority(this);
 }
 
@@ -60,10 +66,11 @@
   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("use_gpu_rasterization", use_gpu_rasterization());
-  res->SetBoolean("required_for_activation", required_for_activation_);
   return res.PassAs<base::Value>();
 }