cc: Refactored Tile::GetResourceId

cc/tile.h

Index: cc/tile.h
diff --git a/cc/tile.h b/cc/tile.h
index 1c988c2dc998e95910cb4de1493e23b793876bd8..8665f5b68c749c98a3407ac9d8af1251e858513f 100644
--- a/cc/tile.h
+++ b/cc/tile.h
@@ -10,7 +10,6 @@
 #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_manager.h"
 #include "cc/tile_priority.h"
 #include "ui/gfx/rect.h"
@@ -51,20 +50,15 @@ class CC_EXPORT Tile : public base::RefCounted<Tile> {
 
   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 managed_state_.drawing_info;
+  }
+  TileDrawingInfo& 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_; }