A host of micro-optimizations and a refactor of TimeForBoundsToIntersect

cc/tile.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_TILE_H_
 #define CC_TILE_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
@@ skipping 24 matching lines @@
 
   const TilePriority& priority(WhichTree tree) const {
     return priority_[tree];
   }
 
   TilePriority combined_priority() const {
     return TilePriority(priority_[ACTIVE_TREE],
                         priority_[PENDING_TREE]);
   }
 
-  void set_priority(WhichTree tree, const TilePriority& priority);
+  void set_priority(WhichTree tree, const TilePriority& priority) {
+    tile_manager_->WillModifyTilePriority(this, tree, priority);
+    priority_[tree] = priority;
+  }
 
   // Returns 0 if not drawable.
-  ResourceProvider::ResourceId GetResourceId() const;
+  ResourceProvider::ResourceId GetResourceId() const {
+    if (!managed_state_.resource)
+      return 0;
+    if (managed_state_.resource_is_being_initialized)
+      return 0;
+
+    return managed_state_.resource->id();
+  }
 
   const gfx::Rect& opaque_rect() const { return opaque_rect_; }
 
   bool contents_swizzled() const { return managed_state_.contents_swizzled; }
 
   float contents_scale() const { return contents_scale_; }
   gfx::Rect content_rect() const { return content_rect_; }
 
   void set_picture_pile(scoped_refptr<PicturePileImpl> pile) {
    picture_pile_ = pile;
   }
 
  private:
   // Methods called by by tile manager.
   friend class TileManager;
   friend class BinComparator;
   ManagedTileState& managed_state() { return managed_state_; }
   const ManagedTileState& managed_state() const { return managed_state_; }
-  size_t bytes_consumed_if_allocated() const;
+
+  inline size_t bytes_consumed_if_allocated() const {
+    DCHECK(format_ == GL_RGBA);
+    return 4 * tile_size_.width() * tile_size_.height();
+  }
+
 
   // Normal private methods.
   friend class base::RefCounted<Tile>;
   ~Tile();
 
   TileManager* tile_manager_;
   scoped_refptr<PicturePileImpl> picture_pile_;
   gfx::Rect tile_size_;
   GLenum format_;
   gfx::Rect content_rect_;
   float contents_scale_;
   gfx::Rect opaque_rect_;
 
   TilePriority priority_[2];
   ManagedTileState managed_state_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TILE_H_