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/managed_tile_state.h"
 #include "cc/picture_pile_impl.h"
-#include "cc/resource_provider.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 TileManager;
 
 class CC_EXPORT Tile : public base::RefCounted<Tile> {
  public:
   Tile(TileManager* tile_manager,
        PicturePileImpl* picture_pile,
        gfx::Size tile_size,
        GLenum format,
        gfx::Rect content_rect,
        gfx::Rect opaque_rect,
        float contents_scale,
        int layer_id);
 
   PicturePileImpl* picture_pile() {
     return picture_pile_.get();
   }
 
   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) {

[reveman, 2013/03/12 22:47:02]

I think this should be named SetPriority and implementation moved to tile.cc.
Surprised this builds without tile_manager.h being included. I guess another
header pulls this in. Maybe it doesn't have to?

     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 ManagedTileState::DrawingInfo& drawing_info() const {
+    return managed_state_.drawing_info;
   }
-
-  bool IsReadyToDraw() const;
-
-  bool is_solid_color() const {
-    return managed_state_.picture_pile_analysis.is_solid_color;
-  }
-
-  bool is_transparent() const {
-    return managed_state_.picture_pile_analysis.is_transparent;
-  }
-
-  SkColor solid_color() const {
-    DCHECK(managed_state_.picture_pile_analysis.is_solid_color);
-    return managed_state_.picture_pile_analysis.solid_color;
+  ManagedTileState::DrawingInfo& drawing_info() {
+    return managed_state_.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;
   ManagedTileState& managed_state() { return managed_state_; }
   const ManagedTileState& managed_state() const { return managed_state_; }
 
   inline size_t bytes_consumed_if_allocated() const {
     DCHECK(format_ == GL_RGBA);
     return 4 * tile_size_.width() * tile_size_.height();
@@ skipping 13 matching lines @@
   gfx::Rect opaque_rect_;
 
   TilePriority priority_[NUM_BIN_PRIORITIES];
   ManagedTileState managed_state_;
   int layer_id_;
 };
 
 }  // namespace cc
 
 #endif  // CC_TILE_H_