Implement on demand quad rasterization for PicturePiles.

cc/layers/picture_layer_impl.cc

Index: cc/layers/picture_layer_impl.cc
diff --git a/cc/layers/picture_layer_impl.cc b/cc/layers/picture_layer_impl.cc
index 8e0d06ff8b0ad080cbcd0e4b6787693e85e3c883..7324c3f7d9718693631f5818430293a013dd894a 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -12,6 +12,7 @@
 #include "cc/layers/quad_sink.h"
 #include "cc/quads/checkerboard_draw_quad.h"
 #include "cc/quads/debug_border_draw_quad.h"
+#include "cc/quads/picture_draw_quad.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/trees/layer_tree_impl.h"
@@ -117,6 +118,9 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
             mode == ManagedTileState::DrawingInfo::TRANSPARENT_MODE) {
           color = DebugColors::SolidColorTileBorderColor();
           width = DebugColors::SolidColorTileBorderWidth(layer_tree_impl());
+        } else if (mode == ManagedTileState::DrawingInfo::PICTURE_PILE_MODE) {
+          color = DebugColors::PictureTileBorderColor();
+          width = DebugColors::PictureTileBorderWidth(layer_tree_impl());
         } else if (iter->priority(ACTIVE_TREE).resolution == HIGH_RESOLUTION) {
           color = DebugColors::HighResTileBorderColor();
           width = DebugColors::HighResTileBorderWidth(layer_tree_impl());
@@ -176,11 +180,15 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
     }
 
     const ManagedTileState::DrawingInfo& drawing_info = iter->drawing_info();
-    switch (drawing_info.mode()) {
-      case ManagedTileState::DrawingInfo::TEXTURE_MODE: {
-        if (iter->contents_scale() != ideal_contents_scale_)
-          append_quads_data->had_incomplete_tile = true;
+    ManagedTileState::DrawingInfo::Mode mode = drawing_info.mode();
+    if (mode == ManagedTileState::DrawingInfo::RESOURCE_MODE ||
+        mode == ManagedTileState::DrawingInfo::PICTURE_PILE_MODE) {

[enne (OOO), 2013/03/26 18:39:23]

I'm not sure I agree with setting had_incomplete_tile here.  Arguably the tile
is "complete" and whatever it draws on screen is at the ideal resolution.

"had incomplete tile" implies that we need to keep vsync ticking because we're
waiting on something to finish rastering.  Resources that are using picture pile
mode will never "finish" because there's no work to be done.

[Leandro Graciá Gil, 2013/03/26 18:50:12]

I see your point. I'm moving this out of the PICTURE_PILE_MODE case.

+      if (iter->contents_scale() != ideal_contents_scale_)
+        append_quads_data->had_incomplete_tile = true;
+    }
 
+    switch (mode) {
+      case ManagedTileState::DrawingInfo::RESOURCE_MODE: {
         gfx::RectF texture_rect = iter.texture_rect();
         gfx::Rect opaque_rect = iter->opaque_rect();
         opaque_rect.Intersect(content_rect);
@@ -196,6 +204,24 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
         quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
         break;
       }
+      case ManagedTileState::DrawingInfo::PICTURE_PILE_MODE: {
+        gfx::RectF texture_rect = iter.texture_rect();
+        gfx::Rect opaque_rect = iter->opaque_rect();
+        opaque_rect.Intersect(content_rect);
+
+        scoped_ptr<PictureDrawQuad> quad = PictureDrawQuad::Create();
+        quad->SetNew(shared_quad_state,
+                     geometry_rect,
+                     opaque_rect,
+                     texture_rect,
+                     iter.texture_size(),
+                     drawing_info.contents_swizzled(),
+                     iter->content_rect(),
+                     iter->contents_scale(),
+                     pile_);
+        quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
+        break;
+      }
       case ManagedTileState::DrawingInfo::SOLID_COLOR_MODE: {
         scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create();
         quad->SetNew(shared_quad_state,
@@ -206,8 +232,6 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
       }
       case ManagedTileState::DrawingInfo::TRANSPARENT_MODE:
         break;
-      case ManagedTileState::DrawingInfo::PICTURE_PILE_MODE:
-        // TODO: crbug.com/173011 would fill this part in.
       default:
         NOTREACHED();
     }
@@ -485,7 +509,7 @@ ResourceProvider::ResourceId PictureLayerImpl::ContentsResourceId() const {
     // Mask resource not ready yet.
     if (!*iter ||
         iter->drawing_info().mode() !=
-            ManagedTileState::DrawingInfo::TEXTURE_MODE ||
+            ManagedTileState::DrawingInfo::RESOURCE_MODE ||
         !iter->drawing_info().IsReadyToDraw())
       return 0;
     // Masks only supported if they fit on exactly one tile.