Add flag for drawing layers to screen with Ganesh

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 <algorithm>
 
 #include "base/time.h"
 #include "cc/base/math_util.h"
@@ skipping 90 matching lines @@
 
 void PictureLayerImpl::AppendQuads(QuadSink* quad_sink,
                                    AppendQuadsData* append_quads_data) {
   gfx::Rect rect(visible_content_rect());
   gfx::Rect content_rect(content_bounds());
 
   SharedQuadState* shared_quad_state =
       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 &&

[danakj, 2013/05/17 23:24:01]

nit: ganesh

[enne (OOO), 2013/05/17 23:52:50]

Done.

+                    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();
     gfx::RectF texture_rect = gfx::RectF(texture_size);
     gfx::Rect quad_content_rect = rect;
     float contents_scale = contents_scale_x();
 
     scoped_ptr<PictureDrawQuad> quad = PictureDrawQuad::Create();
     quad->SetNew(shared_quad_state,
                  geometry_rect,
                  opaque_rect,
                  texture_rect,
                  texture_size,
                  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++;
     return;
   }
 
   bool clipped = false;
   gfx::QuadF target_quad = MathUtil::MapQuad(
       draw_transform(),
       gfx::QuadF(rect),
@@ skipping 113 matching lines @@
 
         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(),
+                     use_ganesh,
                      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,
                      geometry_rect,
                      drawing_info.get_solid_color(),
                      false);
@@ skipping 86 matching lines @@
 }
 
 void PictureLayerImpl::CalculateContentsScale(
     float ideal_contents_scale,
     float device_scale_factor,
     float page_scale_factor,
     bool animating_transform_to_screen,
     float* contents_scale_x,
     float* contents_scale_y,
     gfx::Size* content_bounds) {
-  if (!DrawsContent()) {
-    DCHECK(!tilings_->num_tilings());
+  if (!CanHaveTilings()) {
+    *contents_scale_x = ideal_contents_scale_;

[danakj, 2013/05/17 23:24:01]

the ideal value still needs to be set on the class. you're using and scaling by
0 here, no? won't this mess up AppendQuads?

[enne (OOO), 2013/05/17 23:52:50]

OOPS.  I will set all values here for sanity.

+    *contents_scale_y = ideal_contents_scale_;
+    *content_bounds = gfx::ToCeiledSize(gfx::ScaleSize(bounds(),
+                                                       ideal_contents_scale_,
+                                                       ideal_contents_scale_));
     return;
   }
 
   float min_contents_scale = MinimumContentsScale();
   float min_page_scale = layer_tree_impl()->min_page_scale_factor();
   float min_device_scale = 1.f;
   float min_source_scale =
       min_contents_scale / min_page_scale / min_device_scale;
 
   float ideal_page_scale = page_scale_factor;
@@ skipping 316 matching lines @@
   return ratio1 < ratio2;
 }
 
 }  // namespace
 
 void PictureLayerImpl::ManageTilings(bool animating_transform_to_screen) {
   DCHECK(ideal_contents_scale_);
   DCHECK(ideal_page_scale_);
   DCHECK(ideal_device_scale_);
   DCHECK(ideal_source_scale_);
-
-  if (!CanHaveTilings())
-    return;
+  DCHECK(CanHaveTilings());
 
   bool change_target_tiling =
       raster_page_scale_ == 0.f ||
       raster_device_scale_ == 0.f ||
       raster_source_scale_ == 0.f ||
       raster_contents_scale_ == 0.f ||
       low_res_raster_contents_scale_ == 0.f ||
       ShouldAdjustRasterScale(animating_transform_to_screen);
 
   if (layer_tree_impl()->IsActiveTree()) {
@@ skipping 223 matching lines @@
   raster_source_scale_ = 0.f;
   raster_contents_scale_ = 0.f;
   low_res_raster_contents_scale_ = 0.f;
 }
 
 bool PictureLayerImpl::CanHaveTilings() const {
   if (!DrawsContent())
     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;
 }
 
 bool PictureLayerImpl::CanHaveTilingWithScale(float contents_scale) const {
   if (!CanHaveTilings())
     return false;
   if (contents_scale < MinimumContentsScale())
     return false;
   return true;
 }
@@ skipping 11 matching lines @@
   state->Set("tilings", tilings_->AsValue().release());
   state->Set("pictures", pile_->AsValue().release());
   state->Set("invalidation", invalidation_.AsValue().release());
 }
 
 size_t PictureLayerImpl::GPUMemoryUsageInBytes() const {
   return tilings_->GPUMemoryUsageInBytes();
 }
 
 }  // namespace cc