cc: Fix draw transform computation for non-drawn layers

cc/trees/layer_tree_host_common_perftest.cc

 // Copyright 2013 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/trees/layer_tree_host_common.h"
 
 #include <deque>
 #include <sstream>
 
 #include "base/files/file_path.h"
@@ skipping 91 matching lines @@
   }
 
   void DoCalcDrawPropertiesImpl(bool can_render_to_separate_surface,
                                 int max_texture_size,
                                 LayerTreeImpl* active_tree,
                                 LayerTreeHostImpl* host_impl) {
     LayerImplList update_list;
     PropertyTrees property_trees;
     bool verify_property_trees = false;
     bool use_property_trees = false;
+    active_tree->IncrementRenderSurfaceListIdForTesting();
     LayerTreeHostCommon::CalcDrawPropsImplInputs inputs(
         active_tree->root_layer(), active_tree->DrawViewportSize(),
         host_impl->DrawTransform(), active_tree->device_scale_factor(),
         active_tree->current_page_scale_factor(),
         active_tree->InnerViewportContainerLayer(),
         active_tree->InnerViewportScrollLayer(),
         active_tree->OuterViewportScrollLayer(),
         active_tree->elastic_overscroll()->Current(active_tree->IsActiveTree()),
         active_tree->OverscrollElasticityLayer(), max_texture_size,
         host_impl->settings().can_use_lcd_text,
         host_impl->settings().layers_always_allowed_lcd_text,
         can_render_to_separate_surface,
         host_impl->settings().layer_transforms_should_scale_layer_contents,
-        verify_property_trees, use_property_trees, &update_list, 0,
-        &property_trees);
+        verify_property_trees, use_property_trees, &update_list,
+        active_tree->current_render_surface_list_id(), &property_trees);
     LayerTreeHostCommon::CalculateDrawProperties(&inputs);
   }
 };
 
 class BspTreePerfTest : public CalcDrawPropsTest {
  public:
   BspTreePerfTest() : num_duplicates_(1) {}
   void RunSortLayers() { RunTest(false, false); }
 
   void SetNumberOfDuplicates(int num_duplicates) {
@@ skipping 13 matching lines @@
                              active_tree,
                              host_impl);
 
     LayerImplList base_list;
     BuildLayerImplList(active_tree->root_layer(), &base_list);
 
     int polygon_counter = 0;
     std::vector<scoped_ptr<DrawPolygon>> polygon_list;
     for (LayerImplList::iterator it = base_list.begin(); it != base_list.end();
          ++it) {
-      DrawPolygon* draw_polygon =
-          new DrawPolygon(NULL, gfx::RectF(gfx::SizeF((*it)->bounds())),
-                          (*it)->draw_transform(), polygon_counter++);
+      DrawPolygon* draw_polygon = new DrawPolygon(
+          NULL, gfx::RectF(gfx::SizeF((*it)->bounds())),
+          (*it)->draw_properties().target_space_transform, polygon_counter++);
       polygon_list.push_back(scoped_ptr<DrawPolygon>(draw_polygon));
     }
 
     timer_.Reset();
     do {
       std::deque<scoped_ptr<DrawPolygon>> test_list;
       for (int i = 0; i < num_duplicates_; i++) {
         for (size_t i = 0; i < polygon_list.size(); i++) {
           test_list.push_back(polygon_list[i]->CreateCopy());
         }
@@ skipping 89 matching lines @@
 
 TEST_F(BspTreePerfTest, BspTreeCubes_4) {
   SetTestName("bsp_tree_cubes_4");
   SetNumberOfDuplicates(4);
   ReadTestFile("layer_sort_cubes");
   RunSortLayers();
 }
 
 }  // namespace
 }  // namespace cc