Add flag for drawing layers to screen with Ganesh

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 eaad533592c59e7151afc67699096c0a975a86ab..10ce9b7e042428db441051267db32e6154e1ddc6 100644
--- a/cc/layers/picture_layer_impl.cc
+++ b/cc/layers/picture_layer_impl.cc
@@ -108,7 +108,10 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
       quad_sink->UseSharedQuadState(CreateSharedQuadState());
   AppendDebugBorderQuad(quad_sink, shared_quad_state, append_quads_data);
 
-  if (!append_quads_data->allow_tile_draw_quads) {
+  bool use_ganesh = draw_properties().can_draw_directly_to_backbuffer &&
+                    layer_tree_impl()->settings().force_direct_layer_drawing;
+
+  if (use_ganesh || !append_quads_data->allow_tile_draw_quads) {
     gfx::Rect geometry_rect = rect;
     gfx::Rect opaque_rect = contents_opaque() ? geometry_rect : gfx::Rect();
     gfx::Size texture_size = rect.size();
@@ -125,6 +128,7 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
                  false,
                  quad_content_rect,
                  contents_scale,
+                 use_ganesh,
                  pile_);
     if (quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data))
       append_quads_data->num_missing_tiles++;
@@ -258,6 +262,7 @@ void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
                      drawing_info.contents_swizzled(),
                      iter->content_rect(),
                      iter->contents_scale(),
+                     use_ganesh,
                      pile_);
         quad_sink->Append(quad.PassAs<DrawQuad>(), append_quads_data);
         break;
@@ -388,6 +393,16 @@ void PictureLayerImpl::CalculateContentsScale(
   ideal_device_scale_ = ideal_device_scale;
   ideal_source_scale_ = std::max(ideal_source_scale, min_source_scale);
 
+  if (draw_properties().can_draw_directly_to_backbuffer &&

[danakj, 2013/05/16 15:17:55]

There's this check here, and there's a DrawsContent() check up above, which are
now 2 of the 3 CanHaveTilings() checks.

How about doing if (!CanHaveTilings()) here, and DCHECK(!num_tilings), and drop
the DrawsContent() check up above?

Then manage tilings would not need to do a CanHaveTilings() early out, and could
just DCHECK it instead.

[enne (OOO), 2013/05/16 20:34:11]

Done.

+      layer_tree_impl()->settings().force_direct_layer_drawing) {
+    *contents_scale_x = ideal_contents_scale_;
+    *contents_scale_y = ideal_contents_scale_;
+    *content_bounds = gfx::ToCeiledSize(gfx::ScaleSize(bounds(),
+                                                       ideal_contents_scale_,
+                                                       ideal_contents_scale_));
+    return;
+  }
+
   ManageTilings(animating_transform_to_screen);
 
   // The content scale and bounds for a PictureLayerImpl is somewhat fictitious.
@@ -951,6 +966,9 @@ bool PictureLayerImpl::CanHaveTilings() const {
     return false;
   if (pile_->recorded_region().IsEmpty())
     return false;
+  if (draw_properties().can_draw_directly_to_backbuffer &&
+      layer_tree_impl()->settings().force_direct_layer_drawing)
+    return false;
   return true;
 }