cc: Fix draw transform computation for non-drawn layers

cc/test/layer_tree_host_common_test.cc

 // Copyright 2014 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/test/layer_tree_host_common_test.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/trees/draw_property_utils.h"
@@ skipping 135 matching lines @@
   gfx::Transform identity_matrix;
   gfx::Size device_viewport_size =
       gfx::Size(root_layer->bounds().width() * device_scale_factor,
                 root_layer->bounds().height() * device_scale_factor);
 
   render_surface_layer_list_impl_.reset(new LayerImplList);
 
   // We are probably not testing what is intended if the root_layer bounds are
   // empty.
   DCHECK(!root_layer->bounds().IsEmpty());
+  root_layer->layer_tree_impl()->IncrementRenderSurfaceListIdForTesting();
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
-      root_layer, device_viewport_size, render_surface_layer_list_impl_.get());
+      root_layer, device_viewport_size, render_surface_layer_list_impl_.get(),
+      root_layer->layer_tree_impl()->current_render_surface_list_id());
   inputs.device_scale_factor = device_scale_factor;
   inputs.page_scale_factor = page_scale_factor;
   inputs.page_scale_layer = page_scale_layer;
   inputs.can_use_lcd_text = can_use_lcd_text;
   inputs.layers_always_allowed_lcd_text = layers_always_allowed_lcd_text;
   inputs.can_adjust_raster_scales = true;
 
-  ++render_surface_layer_list_count_;
-  inputs.current_render_surface_layer_list_id =
-      render_surface_layer_list_count_;
+  render_surface_layer_list_count_ =
+      inputs.current_render_surface_layer_list_id;
 
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 }
 
 void LayerTreeHostCommonTestBase::
     ExecuteCalculateDrawPropertiesWithoutSeparateSurfaces(
         LayerImpl* root_layer) {
   gfx::Transform identity_matrix;
   gfx::Size device_viewport_size =
       gfx::Size(root_layer->bounds().width(), root_layer->bounds().height());
   render_surface_layer_list_impl_.reset(new LayerImplList);
 
   DCHECK(!root_layer->bounds().IsEmpty());
+  root_layer->layer_tree_impl()->IncrementRenderSurfaceListIdForTesting();
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
-      root_layer, device_viewport_size, render_surface_layer_list_impl_.get());
+      root_layer, device_viewport_size, render_surface_layer_list_impl_.get(),
+      root_layer->layer_tree_impl()->current_render_surface_list_id());
   inputs.can_adjust_raster_scales = true;
   inputs.can_render_to_separate_surface = false;
 
-  ++render_surface_layer_list_count_;
-  inputs.current_render_surface_layer_list_id =
-      render_surface_layer_list_count_;
+  render_surface_layer_list_count_ =
+      inputs.current_render_surface_layer_list_id;
 
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 }
 
 bool LayerTreeHostCommonTestBase::UpdateLayerListContains(int id) const {
   for (size_t i = 0; i < update_layer_list_.size(); ++i) {
     if (update_layer_list_[i]->id() == id)
       return true;
   }
   return false;
 }
 
 LayerTreeHostCommonTest::LayerTreeHostCommonTest()
     : LayerTreeHostCommonTestBase(LayerTreeSettings()) {
 }
 
 LayerTreeHostCommonTest::LayerTreeHostCommonTest(
     const LayerTreeSettings& settings)
     : LayerTreeHostCommonTestBase(settings) {
 }
 
 }  // namespace cc