cc: Fix draw transform computation for non-drawn layers

cc/trees/layer_tree_impl.cc

 // Copyright 2011 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_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <set>
 
@@ skipping 703 matching lines @@
       // tile raster code does not know how to look for the replica and would
       // consider it occluded even though the replica is visible.
       // Since occlusion is only used for browser compositor (i.e.
       // use_occlusion_for_tile_prioritization) and it won't use replicas,
       // this should matter not.
 
       if (it.represents_itself()) {
         Occlusion occlusion =
             inside_replica ? Occlusion()
                            : occlusion_tracker.GetCurrentOcclusionForLayer(
-                                 it->draw_transform());
+                                 it->DrawTransform());
         it->draw_properties().occlusion_in_content_space = occlusion;
       }
 
       if (it.represents_contributing_render_surface()) {
         // Surfaces aren't used by the tile raster code, so they can have
         // occlusion regardless of replicas.
         Occlusion occlusion =
             occlusion_tracker.GetCurrentOcclusionForContributingSurface(
                 it->render_surface()->draw_transform());
         it->render_surface()->set_occlusion_in_content_space(occlusion);
         // Masks are used to draw the contributing surface, so should have
         // the same occlusion as the surface (nothing inside the surface
         // occludes them).
         if (LayerImpl* mask = it->mask_layer()) {
           Occlusion mask_occlusion =
               inside_replica
                   ? Occlusion()
                   : occlusion_tracker.GetCurrentOcclusionForContributingSurface(
                         it->render_surface()->draw_transform() *
-                        it->draw_transform());
+                        it->DrawTransform());
           mask->draw_properties().occlusion_in_content_space = mask_occlusion;
         }
         if (LayerImpl* replica = it->replica_layer()) {
           if (LayerImpl* mask = replica->mask_layer())
             mask->draw_properties().occlusion_in_content_space = Occlusion();
         }
       }
 
       occlusion_tracker.LeaveLayer(it);
     }
@@ skipping 50 matching lines @@
 
 void LayerTreeImpl::BuildPropertyTreesForTesting() {
   LayerTreeHostCommon::PreCalculateMetaInformationForTesting(root_layer_.get());
   PropertyTreeBuilder::BuildPropertyTrees(
       root_layer_.get(), PageScaleLayer(), InnerViewportScrollLayer(),
       OuterViewportScrollLayer(), current_page_scale_factor(),
       device_scale_factor(), gfx::Rect(DrawViewportSize()),
       layer_tree_host_impl_->DrawTransform(), &property_trees_);
 }
 
+void LayerTreeImpl::IncrementRenderSurfaceListIdForTesting() {
+  render_surface_layer_list_id_++;
+}
+
 const LayerImplList& LayerTreeImpl::RenderSurfaceLayerList() const {
   // If this assert triggers, then the list is dirty.
   DCHECK(!needs_update_draw_properties_);
   return render_surface_layer_list_;
 }
 
 const Region& LayerTreeImpl::UnoccludedScreenSpaceRegion() const {
   // If this assert triggers, then the render_surface_layer_list_ is dirty, so
   // the unoccluded_screen_space_region_ is not valid anymore.
   DCHECK(!needs_update_draw_properties_);
@@ skipping 1106 matching lines @@
                                                    const gfx::BoxF& box,
                                                    gfx::BoxF* bounds) const {
   *bounds = gfx::BoxF();
   return layer_tree_host_impl_->animation_host()
              ? layer_tree_host_impl_->animation_host()
                    ->TransformAnimationBoundsForBox(layer->id(), box, bounds)
              : true;
 }
 
 }  // namespace cc