Implement on demand quad rasterization for PicturePiles.

cc/layers/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/layers/picture_layer_impl.h"
 
 #include "base/time.h"
 #include "cc/base/math_util.h"
 #include "cc/base/util.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/layers/append_quads_data.h"
 #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"
 #include "ui/gfx/quad_f.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size_conversions.h"
 
 namespace {
 const float kMaxScaleRatioDuringPinch = 2.0f;
 }
@@ skipping 79 matching lines @@
          iter;
          ++iter) {
       SkColor color;
       float width;
       if (*iter && iter->drawing_info().IsReadyToDraw()) {
         ManagedTileState::DrawingInfo::Mode mode = iter->drawing_info().mode();
         if (mode == ManagedTileState::DrawingInfo::SOLID_COLOR_MODE ||
             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());
         } else if (iter->priority(ACTIVE_TREE).resolution == LOW_RESOLUTION) {
           color = DebugColors::LowResTileBorderColor();
           width = DebugColors::LowResTileBorderWidth(layer_tree_impl());
         } else if (iter->contents_scale() > contents_scale_x()) {
           color = DebugColors::ExtraHighResTileBorderColor();
           width = DebugColors::ExtraHighResTileBorderWidth(layer_tree_impl());
         } else {
@@ skipping 38 matching lines @@
         quad->SetNew(sharedQuadState, geometry_rect, background_color());
         if (quadSink->Append(quad.PassAs<DrawQuad>(), appendQuadsData))
           appendQuadsData->numMissingTiles++;
       }
 
       appendQuadsData->hadIncompleteTile = true;
       continue;
     }
 
     const ManagedTileState::DrawingInfo& drawing_info = iter->drawing_info();
-    switch (drawing_info.mode()) {
+    const ManagedTileState::DrawingInfo::Mode mode = drawing_info.mode();

[danakj, 2013/03/22 18:02:41]

don't use const for non-pointer/reference local variables.

it would have to be named kMode if you did want to use const, but it's really
not a "constant" just a local cache.

[Leandro Graciá Gil, 2013/03/22 20:40:58]

Done.

+    if (mode == ManagedTileState::DrawingInfo::TEXTURE_MODE ||
+        mode == ManagedTileState::DrawingInfo::PICTURE_PILE_MODE) {
+      if (iter->contents_scale() != ideal_contents_scale_)
+        appendQuadsData->hadIncompleteTile = true;
+    }
+
+    switch (mode) {
       case ManagedTileState::DrawingInfo::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);
 
         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;
       }
+

[danakj, 2013/03/22 18:02:41]

nit: no blank lines between cases

[Leandro Graciá Gil, 2013/03/22 20:40:58]

Done.

+      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(sharedQuadState,
+                     geometry_rect,
+                     opaque_rect,
+                     texture_rect,
+                     iter.texture_size(),
+                     drawing_info.contents_swizzled(),

[vmpstr, 2013/03/22 18:29:32]

I think contents_swizzled might not be set for picture_pile_mode tile. It's set
later on in tile_manager run (after rasterizing)... However, you should be able
to set that at any point in time

[Leandro Graciá Gil, 2013/03/22 20:40:58]

Good catch! Fixed.

+                     iter->content_rect(),
+                     iter->contents_scale(),
+                     pile_);
+        quadSink->Append(quad.PassAs<DrawQuad>(), appendQuadsData);
+        break;
+      }
+

[danakj, 2013/03/22 18:02:41]

nit: and here

[Leandro Graciá Gil, 2013/03/22 20:40:58]

Done.

       case ManagedTileState::DrawingInfo::SOLID_COLOR_MODE: {
         scoped_ptr<SolidColorDrawQuad> quad = SolidColorDrawQuad::Create();
         quad->SetNew(sharedQuadState,
                      geometry_rect,
                      drawing_info.get_solid_color());
         quadSink->Append(quad.PassAs<DrawQuad>(), appendQuadsData);
         break;
       }
       case ManagedTileState::DrawingInfo::TRANSPARENT_MODE:
         break;
-      case ManagedTileState::DrawingInfo::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
@@ skipping 587 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