cc: Fix draw transform computation for non-drawn layers

cc/test/layer_test_common.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/test/layer_test_common.h"
 
 #include "cc/base/math_util.h"
 #include "cc/base/region.h"
 #include "cc/layers/append_quads_data.h"
 #include "cc/quads/draw_quad.h"
@@ skipping 111 matching lines @@
   root_layer_impl_->SetHasRenderSurface(true);
   host_->host_impl()->SetVisible(true);
   host_->host_impl()->InitializeRenderer(output_surface_.get());
 }
 
 LayerTestCommon::LayerImplTest::~LayerImplTest() {}
 
 void LayerTestCommon::LayerImplTest::CalcDrawProps(
     const gfx::Size& viewport_size) {
   LayerImplList layer_list;
+  host_->host_impl()->active_tree()->IncrementRenderSurfaceListIdForTesting();
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
-      root_layer_impl_.get(), viewport_size, &layer_list);
+      root_layer_impl_.get(), viewport_size, &layer_list,
+      host_->host_impl()->active_tree()->current_render_surface_list_id());
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 }
 
 void LayerTestCommon::LayerImplTest::AppendQuadsWithOcclusion(
     LayerImpl* layer_impl,
     const gfx::Rect& occluded) {
   AppendQuadsData data;
 
   render_pass_->quad_list.clear();
   render_pass_->shared_quad_state_list.clear();
 
-  Occlusion occlusion(layer_impl->draw_transform(),
-                      SimpleEnclosedRegion(occluded),
-                      SimpleEnclosedRegion());
+  Occlusion occlusion(layer_impl->DrawTransform(),
+                      SimpleEnclosedRegion(occluded), SimpleEnclosedRegion());
   layer_impl->draw_properties().occlusion_in_content_space = occlusion;
 
   layer_impl->WillDraw(DRAW_MODE_HARDWARE, resource_provider());
   layer_impl->AppendQuads(render_pass_.get(), &data);
   layer_impl->DidDraw(resource_provider());
 }
 
 void LayerTestCommon::LayerImplTest::AppendQuadsForPassWithOcclusion(
     LayerImpl* layer_impl,
     RenderPass* given_render_pass,
     const gfx::Rect& occluded) {
   AppendQuadsData data;
 
   given_render_pass->quad_list.clear();
   given_render_pass->shared_quad_state_list.clear();
 
-  Occlusion occlusion(layer_impl->draw_transform(),
-                      SimpleEnclosedRegion(occluded),
-                      SimpleEnclosedRegion());
+  Occlusion occlusion(layer_impl->DrawTransform(),
+                      SimpleEnclosedRegion(occluded), SimpleEnclosedRegion());
   layer_impl->draw_properties().occlusion_in_content_space = occlusion;
 
   layer_impl->WillDraw(DRAW_MODE_HARDWARE, resource_provider());
   layer_impl->AppendQuads(given_render_pass, &data);
   layer_impl->DidDraw(resource_provider());
 }
 
 void LayerTestCommon::LayerImplTest::AppendSurfaceQuadsWithOcclusion(
     RenderSurfaceImpl* surface_impl,
     const gfx::Rect& occluded) {
   AppendQuadsData data;
 
   render_pass_->quad_list.clear();
   render_pass_->shared_quad_state_list.clear();
 
   surface_impl->AppendQuads(
       render_pass_.get(), gfx::Transform(),
       Occlusion(gfx::Transform(), SimpleEnclosedRegion(occluded),
                 SimpleEnclosedRegion()),
       SK_ColorBLACK, 1.f, nullptr, &data, RenderPassId(1, 1));
 }
 
 }  // namespace cc