Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

1 files changed, 6 insertions, 12 deletions

diff --git a/chromium/cc/resources/tile.h b/chromium/cc/resources/tile.h
index be9b19a4f1b..3caa407ae9c 100644
--- a/chromium/cc/resources/tile.h
+++ b/chromium/cc/resources/tile.h
@@ -53,13 +53,9 @@ class CC_EXPORT Tile : public base::RefCounted<Tile> {
                         priority_[PENDING_TREE]);
   }
 
-  void SetPriority(WhichTree tree, const TilePriority& priority) {
-    priority_[tree] = priority;
-  }
+  void SetPriority(WhichTree tree, const TilePriority& priority);
 
-  void mark_required_for_activation() {
-    priority_[PENDING_TREE].required_for_activation = true;
-  }
+  void MarkRequiredForActivation();
 
   bool required_for_activation() const {
     return priority_[PENDING_TREE].required_for_activation;
@@ -75,7 +71,7 @@ class CC_EXPORT Tile : public base::RefCounted<Tile> {
 
   scoped_ptr<base::Value> AsValue() const;
 
-  bool IsReadyToDraw() const {
+  inline bool IsReadyToDraw() const {
     for (int mode = 0; mode < NUM_RASTER_MODES; ++mode) {
       if (managed_state_.tile_versions[mode].IsReadyToDraw())
         return true;
@@ -117,6 +113,8 @@ class CC_EXPORT Tile : public base::RefCounted<Tile> {
     return managed_state_.tile_versions[mode];
   }
 
+  gfx::Size size() const { return tile_size_.size(); }
+
  private:
   // Methods called by by tile manager.
   friend class TileManager;
@@ -126,10 +124,6 @@ class CC_EXPORT Tile : public base::RefCounted<Tile> {
   ManagedTileState& managed_state() { return managed_state_; }
   const ManagedTileState& managed_state() const { return managed_state_; }
 
-  inline size_t bytes_consumed_if_allocated() const {
-    return 4 * tile_size_.width() * tile_size_.height();
-  }
-
   // Normal private methods.
   friend class base::RefCounted<Tile>;
   ~Tile();
@@ -141,7 +135,7 @@ class CC_EXPORT Tile : public base::RefCounted<Tile> {
   float contents_scale_;
   gfx::Rect opaque_rect_;
 
-  TilePriority priority_[NUM_BIN_PRIORITIES];
+  TilePriority priority_[NUM_TREES];
   ManagedTileState managed_state_;
   int layer_id_;
   int source_frame_number_;