cc: Fix draw transform computation for non-drawn layers

cc/trees/occlusion_tracker_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/trees/occlusion_tracker.h"
 
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 42 matching lines @@
 };
 
 class TestOcclusionTrackerWithClip : public TestOcclusionTracker {
  public:
   explicit TestOcclusionTrackerWithClip(const gfx::Rect& viewport_rect)
       : TestOcclusionTracker(viewport_rect) {}
 
   bool OccludedLayer(const LayerImpl* layer,
                      const gfx::Rect& content_rect) const {
     DCHECK(layer->visible_layer_rect().Contains(content_rect));
-    return this->GetCurrentOcclusionForLayer(layer->draw_transform())
+    return this->GetCurrentOcclusionForLayer(layer->DrawTransform())
         .IsOccluded(content_rect);
   }
 
   // Gives an unoccluded sub-rect of |content_rect| in the content space of the
   // layer. Simple wrapper around GetUnoccludedContentRect.
   gfx::Rect UnoccludedLayerContentRect(const LayerImpl* layer,
                                        const gfx::Rect& content_rect) const {
     DCHECK(layer->visible_layer_rect().Contains(content_rect));
-    return this->GetCurrentOcclusionForLayer(layer->draw_transform())
+    return this->GetCurrentOcclusionForLayer(layer->DrawTransform())
         .GetUnoccludedContentRect(content_rect);
   }
 
   gfx::Rect UnoccludedSurfaceContentRect(const LayerImpl* layer,
                                          const gfx::Rect& content_rect) const {
     RenderSurfaceImpl* surface = layer->render_surface();
     return this->GetCurrentOcclusionForContributingSurface(
                      surface->draw_transform())
         .GetUnoccludedContentRect(content_rect);
   }
@@ skipping 136 matching lines @@
 
   void CalcDrawEtc(TestContentLayerImpl* root) {
     DCHECK(root == root_.get());
 
     // These occlusion tests attach and detach layers in multiple
     // iterations, so rebuild property trees every time.
     root->layer_tree_impl()->property_trees()->needs_rebuild = true;
 
     FakeLayerTreeHostImpl::RecursiveUpdateNumChildren(root);
 
+    root->layer_tree_impl()->IncrementRenderSurfaceListIdForTesting();
     LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
-        root, root->bounds(), &render_surface_layer_list_impl_);
+        root, root->bounds(), &render_surface_layer_list_impl_,
+        root->layer_tree_impl()->current_render_surface_list_id());
     inputs.can_adjust_raster_scales = true;
     LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 
     layer_iterator_ = layer_iterator_begin_ =
         LayerIterator::Begin(&render_surface_layer_list_impl_);
   }
 
   void EnterLayer(LayerImpl* layer, OcclusionTracker* occlusion) {
     ASSERT_EQ(*layer_iterator_, layer);
     ASSERT_TRUE(layer_iterator_.represents_itself());
@@ skipping 2269 matching lines @@
     EXPECT_EQ(gfx::Rect(),
               occlusion.UnoccludedSurfaceContentRect(
                   surface, gfx::Rect(80, 70, 50, 50)));
   }
 };
 
 ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestUnoccludedSurfaceQuery)
 
 }  // namespace
 }  // namespace cc