Rendering context information added to SharedQuadState

cc/trees/layer_tree_impl_unittest.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/trees/layer_tree_impl.h"
 
 #include "cc/layers/heads_up_display_layer_impl.h"
 #include "cc/layers/layer.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
@@ skipping 965 matching lines @@
   gfx::Size bounds(100, 100);
   SetLayerPropertiesForTesting(root.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
                                false);
   root->SetDrawsContent(true);
   root->SetShouldFlattenTransform(false);
-  root->SetIs3dSorted(true);
+  root->SetRenderingContextId(1);  // For 3D sorting

[danakj, 2014/06/15 18:15:36]

If every call of this method needs a comment explaining it is for 3d sorting,
maybe we should improve the method name. How about Set3dSortingContextId()?

I know this matches the WebLayerImpl name, but it seems like we should improve
that name too then.

[troyhildebrandt, 2014/06/17 00:29:43]

Changed to Set3dSortingContextId for Layer/LayerImpl, but changing it in
WebLayerImpl requires making changes to WebLayer.h, GraphicsLayer.cpp/h, and
CompositedLayerMapping.cpp and I'm not sure if we want to change these at this
point.

   {
     // child 1 and child2 are initialized to overlap between x=50 and x=60.
     // grand_child is set to overlap both child1 and child2 between y=50 and
     // y=60.  The expected stacking order is: (front) child2, (second)
     // grand_child, (third) child1, and (back) the root layer behind all other
     // layers.
 
     scoped_ptr<LayerImpl> child1 =
         LayerImpl::Create(host_impl().active_tree(), 2);
     scoped_ptr<LayerImpl> child2 =
         LayerImpl::Create(host_impl().active_tree(), 3);
     scoped_ptr<LayerImpl> grand_child1 =
         LayerImpl::Create(host_impl().active_tree(), 4);
 
     position = gfx::PointF(10.f, 10.f);
     bounds = gfx::Size(50, 50);
     SetLayerPropertiesForTesting(child1.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
                                  false);
     child1->SetDrawsContent(true);
     child1->SetShouldFlattenTransform(false);
-    child1->SetIs3dSorted(true);
+    child1->SetRenderingContextId(1);  // For 3D sorting
 
     position = gfx::PointF(50.f, 10.f);
     bounds = gfx::Size(50, 50);
     gfx::Transform translate_z;
     translate_z.Translate3d(0, 0, -10.f);
     SetLayerPropertiesForTesting(child2.get(),
                                  translate_z,
                                  transform_origin,
                                  position,
                                  bounds,
                                  true,
                                  false);
     child2->SetDrawsContent(true);
     child2->SetShouldFlattenTransform(false);
-    child2->SetIs3dSorted(true);
+    child2->SetRenderingContextId(1);  // For 3D sorting;
 
     // Remember that grand_child is positioned with respect to its parent (i.e.
     // child1).  In screen space, the intended position is (10, 50), with size
     // 100 x 50.
     position = gfx::PointF(0.f, 40.f);
     bounds = gfx::Size(100, 50);
     SetLayerPropertiesForTesting(grand_child1.get(),
                                  identity_matrix,
                                  transform_origin,
                                  position,
@@ skipping 889 matching lines @@
 
   test_point = gfx::Point(35, 65);
   result_layer =
       host_impl().active_tree()->FindLayerThatIsHitByPointInTouchHandlerRegion(
           test_point);
   EXPECT_FALSE(result_layer);
 }
 
 }  // namespace
 }  // namespace cc