Implement on demand quad rasterization for PicturePiles.

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 66f9ff36af4ddcfa1b7a9b2efe4f709a0e3b5554..3b8fb3ac2a55c52f86f52a46e55f23ef16d3dd06 100644
--- a/cc/picture_layer_impl.cc
+++ b/cc/picture_layer_impl.cc
@@ -11,6 +11,7 @@
 #include "cc/debug_colors.h"
 #include "cc/layer_tree_impl.h"
 #include "cc/math_util.h"
+#include "cc/picture_draw_quad.h"
 #include "cc/quad_sink.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/tile_draw_quad.h"
@@ -119,6 +120,9 @@ void PictureLayerImpl::AppendQuads(QuadSink* quadSink,
             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());
@@ -180,7 +184,8 @@ void PictureLayerImpl::AppendQuads(QuadSink* quadSink,
 
     const ManagedTileState::DrawingInfo& drawing_info = iter->drawing_info();
     switch (drawing_info.mode()) {
-      case ManagedTileState::DrawingInfo::TEXTURE_MODE: {
+      case ManagedTileState::DrawingInfo::TEXTURE_MODE:
+      case ManagedTileState::DrawingInfo::PICTURE_PILE_MODE: {

[vmpstr, 2013/03/13 21:03:08]

I not sure if it's worth combining the two cases, since you only save a few
lines, and then have to do another if/else on this variable again.

[Leandro Graciá Gil, 2013/03/19 17:30:07]

The point is that if we add more code here for TEXTURE_MODE it won't diverge
from the code for PICTURE_PILE_MODE. But I have no strong opinion on this. Let
me know what you prefer and I'll make any required updates.

         if (iter->contents_scale() != ideal_contents_scale_)
           appendQuadsData->hadIncompleteTile = true;
 
@@ -188,15 +193,30 @@ void PictureLayerImpl::AppendQuads(QuadSink* quadSink,
         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,
-                     drawing_info.get_resource_id(),
-                     texture_rect,
-                     iter.texture_size(),
-                     drawing_info.contents_swizzled());
-        quadSink->append(quad.PassAs<DrawQuad>(), appendQuadsData);
+        if (drawing_info.mode() ==
+            ManagedTileState::DrawingInfo::TEXTURE_MODE) {
+          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);
+        } else {
+          scoped_ptr<PictureDrawQuad> quad = PictureDrawQuad::Create();
+          quad->SetNew(sharedQuadState,
+                       geometry_rect,
+                       opaque_rect,
+                       texture_rect,
+                       iter.texture_size(),
+                       drawing_info.contents_swizzled(),
+                       iter->content_rect(),
+                       iter->contents_scale(),
+                       pile_);
+          quadSink->append(quad.PassAs<DrawQuad>(), appendQuadsData);
+        }
         break;
       }
       case ManagedTileState::DrawingInfo::SOLID_COLOR_MODE: {
@@ -209,8 +229,6 @@ void PictureLayerImpl::AppendQuads(QuadSink* quadSink,
       }
       case ManagedTileState::DrawingInfo::TRANSPARENT_MODE:
         break;
-      case ManagedTileState::DrawingInfo::PICTURE_PILE_MODE:
-        // TODO: crbug.com/173011 would fill this part in.
       default:
         NOTREACHED();
     }