cc: Refactored Tile::GetResourceId

cc/picture_layer_impl.cc

Index: cc/picture_layer_impl.cc
diff --git a/cc/picture_layer_impl.cc b/cc/picture_layer_impl.cc
index f0ce9ad08e8a14dbab093b68dad4f40b06c86af2..352ff9afbc79d305782176c4a88a0c89dd2ee220 100644
--- a/cc/picture_layer_impl.cc
+++ b/cc/picture_layer_impl.cc
@@ -115,7 +115,7 @@ void PictureLayerImpl::appendQuads(QuadSink& quadSink,
          ++iter) {
       SkColor color;
       float width;
-      if (*iter && iter->GetResourceId()) {
+      if (*iter && iter->drawing_info().is_ready_to_draw()) {
         if (iter->priority(ACTIVE_TREE).resolution == HIGH_RESOLUTION) {
           color = DebugColors::HighResTileBorderColor();
           width = DebugColors::HighResTileBorderWidth(layerTreeImpl());
@@ -155,7 +155,7 @@ void PictureLayerImpl::appendQuads(QuadSink& quadSink,
        ++iter) {
     ResourceProvider::ResourceId resource = 0;
     if (*iter)
-      resource = iter->GetResourceId();
+      resource = iter->drawing_info().get_resource_id();

[enne (OOO), 2013/02/27 22:13:57]

I think this isn't safe, given your changed implementation of get_resource_id. 
get_resource_id() should behave like the previous GetResourceId function did,
returning 0 if the tile has no gpu resource or has not been initialized. 
Otherwise, you'll get DCHECKs here.

 
     gfx::Rect geometry_rect = iter.geometry_rect();
 
@@ -473,12 +473,14 @@ ResourceProvider::ResourceId PictureLayerImpl::contentsResourceId() const {
        iter;
        ++iter) {
     // Mask resource not ready yet.
-    if (!*iter || !iter->GetResourceId())
+    if (!*iter ||
+        !iter->drawing_info().mode() != TileDrawingInfo::TEXTURE_MODE ||
+        !iter->drawing_info().is_ready_to_draw())
       return 0;
     // Masks only supported if they fit on exactly one tile.
     if (iter.geometry_rect() != content_rect)
       return 0;
-    return iter->GetResourceId();
+    return iter->drawing_info().get_resource_id();
   }
   return 0;
 }
@@ -522,7 +524,7 @@ bool PictureLayerImpl::areVisibleResourcesReady() const {
          iter;
          ++iter) {
       // A null tile (i.e. no recording) is considered "ready".
-      if (!*iter || iter->GetResourceId())
+      if (!*iter || iter->drawing_info().is_ready_to_draw())
         missing_region.Subtract(iter.geometry_rect());
     }
   }