cc: Refactored Tile::GetResourceId

cc/picture_layer_impl.cc

 // 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.
 
 #include "cc/picture_layer_impl.h"
 
 #include "base/time.h"
 #include "cc/append_quads_data.h"
 #include "cc/checkerboard_draw_quad.h"
 #include "cc/debug_border_draw_quad.h"
@@ skipping 96 matching lines @@
   if (showDebugBorders()) {
     for (PictureLayerTilingSet::Iterator iter(tilings_.get(),
                                               contentsScaleX(),
                                               rect,
                                               ideal_contents_scale_,
                                               layerDeviceAlignment);
          iter;
          ++iter) {
       SkColor color;
       float width;
-      if (*iter && iter->GetResourceId()) {
+      if (*iter && iter->drawing_info().IsReadyToDraw()) {
         if (iter->priority(ACTIVE_TREE).resolution == HIGH_RESOLUTION) {
           color = DebugColors::HighResTileBorderColor();
           width = DebugColors::HighResTileBorderWidth(layerTreeImpl());
         } else if (iter->priority(ACTIVE_TREE).resolution == LOW_RESOLUTION) {
           color = DebugColors::LowResTileBorderColor();
           width = DebugColors::LowResTileBorderWidth(layerTreeImpl());
         } else if (iter->contents_scale() > contentsScaleX()) {
           color = DebugColors::ExtraHighResTileBorderColor();
           width = DebugColors::ExtraHighResTileBorderWidth(layerTreeImpl());
         } else {
@@ skipping 17 matching lines @@
   // unused can be considered for removal.
   std::vector<PictureLayerTiling*> seen_tilings;
 
   for (PictureLayerTilingSet::Iterator iter(tilings_.get(),
                                             contentsScaleX(),
                                             rect,
                                             ideal_contents_scale_,
                                             layerDeviceAlignment);
        iter;
        ++iter) {
-    ResourceProvider::ResourceId resource = 0;
-    if (*iter)
-      resource = iter->GetResourceId();
 
     gfx::Rect geometry_rect = iter.geometry_rect();
-
-    if (!resource) {
+    if (!*iter || !iter->drawing_info().IsReadyToDraw()) {

[nduca, 2013/03/12 19:44:34]

i'm concerned about you moving the !*iter below the iter.geometry_rect... if
iter is null, iter.geometry_rect() is maybe not safe?

[enne (OOO), 2013/03/12 19:48:04]

This is safe.  All iterators have a geometry rect, they just might not have a
tile to fill it.

       if (drawCheckerboardForMissingTiles()) {
         // TODO(enne): Figure out how to show debug "invalidated checker" color
         scoped_ptr<CheckerboardDrawQuad> quad = CheckerboardDrawQuad::Create();
         SkColor color = DebugColors::DefaultCheckerboardColor();
         quad->SetNew(sharedQuadState, geometry_rect, color);
         if (quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData))
             appendQuadsData.numMissingTiles++;
       } else {
         scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create();
         quad->SetNew(sharedQuadState, geometry_rect, backgroundColor());
         if (quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData))
             appendQuadsData.numMissingTiles++;
       }
 
       appendQuadsData.hadIncompleteTile = true;
       continue;
     }
 
-    if (iter->contents_scale() != ideal_contents_scale_)
-      appendQuadsData.hadIncompleteTile = true;
+    const TileDrawingInfo& drawing_info = iter->drawing_info();
+    switch (drawing_info.mode()) {
+      case TileDrawingInfo::TEXTURE_MODE: {
+        if (iter->contents_scale() != ideal_contents_scale_)
+          appendQuadsData.hadIncompleteTile = true;
 
-    gfx::RectF texture_rect = iter.texture_rect();
-    gfx::Rect opaque_rect = iter->opaque_rect();
-    opaque_rect.Intersect(content_rect);
+        gfx::RectF texture_rect = iter.texture_rect();
+        gfx::Rect opaque_rect = iter->opaque_rect();
+        opaque_rect.Intersect(content_rect);
 
-    scoped_ptr<TileDrawQuad> quad = TileDrawQuad::Create();
-    quad->SetNew(sharedQuadState,
-                 geometry_rect,
-                 opaque_rect,
-                 resource,
-                 texture_rect,
-                 iter.texture_size(),
-                 iter->contents_swizzled());
-    quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
+        scoped_ptr<TileDrawQuad> quad = TileDrawQuad::Create();
+        quad->SetNew(sharedQuadState,
+                     geometry_rect,
+                     opaque_rect,
+                     drawing_info.get_resource_id(),
+                     texture_rect,
+                     iter.texture_size(),
+                     drawing_info.contents_swizzled());
+        quadSink.append(quad.PassAs<DrawQuad>(), appendQuadsData);
+        break;
+      }
+      case TileDrawingInfo::SOLID_COLOR_MODE: {
+        scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create();
+        quad->SetNew(sharedQuadState,
+                     geometry_rect,
+                     drawing_info.get_solid_color());
+        break;
+      }
+      case TileDrawingInfo::TRANSPARENT_MODE:
+        break;
+      case TileDrawingInfo::PICTURE_PILE_MODE:
+        // TODO: crbug.com/173011 would fill this part in.
+      default:
+        NOTREACHED();
+    }
 
     if (!seen_tilings.size() || seen_tilings.back() != iter.CurrentTiling())
       seen_tilings.push_back(iter.CurrentTiling());
   }
 
   // Aggressively remove any tilings that are not seen to save memory. Note
   // that this is at the expense of doing cause more frequent re-painting. A
   // better scheme would be to maintain a tighter visibleContentRect for the
   // finer tilings.
   CleanUpTilingsOnActiveLayer(seen_tilings);
@@ skipping 247 matching lines @@
   gfx::Rect content_rect(gfx::Point(), contentBounds());
   float scale = contentsScaleX();
   for (PictureLayerTilingSet::Iterator iter(tilings_.get(),
                                             scale,
                                             content_rect,
                                             ideal_contents_scale_,
                                             PictureLayerTiling::LayerDeviceAlignmentUnknown);
        iter;
        ++iter) {
     // Mask resource not ready yet.
-    if (!*iter || !iter->GetResourceId())
+    if (!*iter ||
+        iter->drawing_info().mode() != TileDrawingInfo::TEXTURE_MODE ||
+        !iter->drawing_info().IsReadyToDraw())
       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;
 }
 
 bool PictureLayerImpl::areVisibleResourcesReady() const {
   DCHECK(layerTreeImpl()->IsPendingTree());
   DCHECK(ideal_contents_scale_);
 
   const gfx::Rect& rect = visibleContentRect();
 
@@ skipping 23 matching lines @@
     if (tiling->contents_scale() < min_acceptable_scale)
       continue;
 
     for (PictureLayerTiling::Iterator iter(tiling,
                                            contentsScaleX(),
                                            rect,
                                            PictureLayerTiling::LayerDeviceAlignmentUnknown);
          iter;
          ++iter) {
       // A null tile (i.e. no recording) is considered "ready".
-      if (!*iter || iter->GetResourceId())
+      if (!*iter || iter->drawing_info().IsReadyToDraw())
         missing_region.Subtract(iter.geometry_rect());
     }
   }
 
   return missing_region.IsEmpty();
 }
 
 PictureLayerTiling* PictureLayerImpl::AddTiling(float contents_scale) {
   DCHECK(contents_scale >= MinimumContentsScale());
 
@@ skipping 257 matching lines @@
 scoped_ptr<base::Value> PictureLayerImpl::AsValue() const {
   scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue());
   LayerImpl::AsValueInto(state.get());
 
   state->SetDouble("ideal_contents_scale", ideal_contents_scale_);
   state->Set("tilings", tilings_->AsValue().release());
   return state.PassAs<base::Value>();
 }
 
 }  // namespace cc