Skip drawing unsupported layers in forced software mode

cc/layers/tiled_layer_impl_unittest.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/tiled_layer_impl.h"
 
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/tile_draw_quad.h"
 #include "cc/resources/layer_tiling_data.h"
 #include "cc/test/fake_impl_proxy.h"
@@ skipping 79 matching lines @@
   int num_tiles_y = 4;
   gfx::Size layer_size(tile_size.width() * num_tiles_x,
                        tile_size.height() * num_tiles_y);
 
   // Verify default layer does creates quads
   {
     scoped_ptr<TiledLayerImpl> layer =
         CreateLayer(tile_size, layer_size, LayerTilingData::NO_BORDER_TEXELS);
     MockQuadCuller quad_culler;
     AppendQuadsData data;
+    EXPECT_TRUE(layer->WillDraw(DRAW_MODE_HARDWARE, NULL));
     layer->AppendQuads(&quad_culler, &data);
+    layer->DidDraw(NULL);
     unsigned num_tiles = num_tiles_x * num_tiles_y;
     EXPECT_EQ(quad_culler.quad_list().size(), num_tiles);
   }
 
   // Layer with empty visible layer rect produces no quads
   {
     scoped_ptr<TiledLayerImpl> layer =
         CreateLayer(tile_size, layer_size, LayerTilingData::NO_BORDER_TEXELS);
     layer->draw_properties().visible_content_rect = gfx::Rect();
 
     MockQuadCuller quad_culler;
-    AppendQuadsData data;
-    layer->AppendQuads(&quad_culler, &data);
-    EXPECT_EQ(quad_culler.quad_list().size(), 0u);
+    EXPECT_FALSE(layer->WillDraw(DRAW_MODE_HARDWARE, NULL));
   }
 
   // Layer with non-intersecting visible layer rect produces no quads
   {
     scoped_ptr<TiledLayerImpl> layer =
         CreateLayer(tile_size, layer_size, LayerTilingData::NO_BORDER_TEXELS);
 
     gfx::Rect outside_bounds(-100, -100, 50, 50);
     layer->draw_properties().visible_content_rect = outside_bounds;
 
     MockQuadCuller quad_culler;
     AppendQuadsData data;
+    EXPECT_TRUE(layer->WillDraw(DRAW_MODE_HARDWARE, NULL));
     layer->AppendQuads(&quad_culler, &data);
+    layer->DidDraw(NULL);
     EXPECT_EQ(quad_culler.quad_list().size(), 0u);
   }
 
   // Layer with skips draw produces no quads
   {
     scoped_ptr<TiledLayerImpl> layer =
         CreateLayer(tile_size, layer_size, LayerTilingData::NO_BORDER_TEXELS);
     layer->set_skips_draw(true);
 
     MockQuadCuller quad_culler;
@@ skipping 155 matching lines @@
   ResourceProvider::ResourceId empty_resource(0);
   layer->PushTileProperties(0, 1, empty_resource, gfx::Rect(0, 0, 1, 1), false);
   layer->PushTileProperties(2, 3, empty_resource, gfx::Rect(0, 0, 1, 1), false);
   layer->PushTileProperties(2, 0, empty_resource, gfx::Rect(0, 0, 1, 1), false);
 
   EXPECT_EQ(layer->GPUMemoryUsageInBytes(), 0u);
 }
 
 }  // namespace
 }  // namespace cc