cc: Refactored Tile::GetResourceId

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"
 #include "cc/layer_tree_host_impl.h"
 #include "cc/picture_pile_impl.h"
-#include "cc/resource_provider.h"
+#include "cc/tile_drawing_info.h"
 #include "cc/tile_manager.h"
 #include "cc/tile_priority.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 
 namespace cc {
 
 class Tile;
 
 class CC_EXPORT Tile : public base::RefCounted<Tile> {
@@ skipping 20 matching lines @@
                         priority_[PENDING_TREE]);
   }
 
   void set_priority(WhichTree tree, const TilePriority& priority) {
     tile_manager_->WillModifyTilePriority(this, tree, priority);
     priority_[tree] = priority;
   }
 
   scoped_ptr<base::Value> AsValue() const;
 
-  // Returns 0 if not drawable.
-  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 TileDrawingInfo& drawing_info() const { return drawing_info_; }
+  TileDrawingInfo& drawing_info() { return drawing_info_; }
 
   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_; }
 
   int layer_id() const { return layer_id_; }
 
   void set_picture_pile(scoped_refptr<PicturePileImpl> pile) {
    DCHECK(pile->CanRaster(contents_scale_, content_rect_));
    picture_pile_ = pile;
   }
 
   ManagedTileState& ManagedStateForTesting() { return managed_state_; }
 
  private:
   // Methods called by by tile manager.
   friend class TileManager;
   friend class BinComparator;
+  friend class TileDrawingInfo;
+
   ManagedTileState& managed_state() { return managed_state_; }
   const ManagedTileState& managed_state() const { return managed_state_; }
 
-  inline size_t bytes_consumed_if_allocated() const {
+  inline size_t bytes_consumed_if_texture_allocated() const {

[reveman, 2013/03/07 22:02:14]

I don't think you want to use texture here. texture is a type of resource and
tiles should not be aware of the specific resource type used. maybe it should be
bytes_consumed_if_resource_is_allocated() but not clear to me why this need to
change at all.

     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_[NUM_BIN_PRIORITIES];
   ManagedTileState managed_state_;
   int layer_id_;
+  TileDrawingInfo drawing_info_;

[reveman, 2013/03/07 22:02:14]

The drawing state is maintained by the tile manager so it should probably be
moved to ManagedTileState.

 };
 
 }  // namespace cc
 
 #endif  // CC_TILE_H_