Rendering context information added to SharedQuadState

cc/trees/layer_tree_host_common_unittest.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_host_common.h"
 
 #include <set>
 
 #include "cc/animation/layer_animation_controller.h"
 #include "cc/animation/transform_operations.h"
@@ skipping 3936 matching lines @@
                                true,
                                false);
   SetLayerPropertiesForTesting(child2.get(),
                                identity_matrix,
                                gfx::Point3F(),
                                gfx::PointF(),
                                gfx::Size(100, 100),
                                true,
                                false);
 
-  front_facing_surface->SetIs3dSorted(true);
-  back_facing_surface->SetIs3dSorted(true);
+  // Set rendering context ID to 1 for 3D sorting

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

comment nit: stick a period on the end, comments should be complete sentences

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

Removed the comment instead, since the method name is now more descriptive.

+  front_facing_surface->SetRenderingContextId(1);
+  back_facing_surface->SetRenderingContextId(1);
 
   RenderSurfaceLayerList render_surface_layer_list;
   LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
       parent.get(), parent->bounds(), &render_surface_layer_list);
   inputs.can_adjust_raster_scales = true;
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 
   // Verify which render surfaces were created.
   EXPECT_TRUE(front_facing_surface->render_surface());
   EXPECT_FALSE(
@@ skipping 2954 matching lines @@
   child2->SetDrawsContent(true);
   SetLayerPropertiesForTesting(child3.get(),
                                identity_matrix,
                                transform_origin,
                                position,
                                bounds,
                                true,
                                false);
   child3->SetDrawsContent(true);
 
-  child2->SetIs3dSorted(true);
-  child3->SetIs3dSorted(true);
+  // Set rendering context ID to 1 for 3D sorting
+  child2->SetRenderingContextId(1);
+  child3->SetRenderingContextId(1);
 
   child2->AddChild(child3.Pass());
   child1->AddChild(child2.Pass());
   root->AddChild(child1.Pass());
 
   {
     LayerImplList render_surface_layer_list;
     LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
         root.get(), root->bounds(), &render_surface_layer_list);
     inputs.can_render_to_separate_surface = true;
@@ skipping 39 matching lines @@
                                true);
   SetLayerPropertiesForTesting(child.get(),
                                identity_transform,
                                gfx::Point3F(),
                                gfx::PointF(),
                                gfx::Size(20, 20),
                                true,
                                false);
 
   root->SetShouldFlattenTransform(false);
-  root->SetIs3dSorted(true);
+  // Set rendering context ID to 1 for 3D sorting
+  root->SetRenderingContextId(1);
   render_surface->SetDoubleSided(false);
   render_surface->SetForceRenderSurface(true);
 
   scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create();
   host->SetRootLayer(root);
 
   ExecuteCalculateDrawProperties(root.get());
 
   EXPECT_EQ(2u, render_surface_layer_list()->size());
   EXPECT_EQ(1u,
@@ skipping 607 matching lines @@
                                true);
   SetLayerPropertiesForTesting(bottom_content.get(),
                                bottom_transform,
                                gfx::Point3F(),
                                gfx::PointF(),
                                gfx::Size(50, 50),
                                false,
                                true);
 
   scroll_child->SetShouldFlattenTransform(false);
-  scroll_child->SetIs3dSorted(true);
+  // Set rendering context ID to 1 for 3D sorting
+  scroll_child->SetRenderingContextId(1);
 
   scroll_child->AddChild(top_content.Pass());
   scroll_child->AddChild(bottom_content.Pass());
   root->AddChild(scroll_child.Pass());
 
   scroll_parent_clip->AddChild(scroll_parent.Pass());
   scroll_parent_border->AddChild(scroll_parent_clip.Pass());
   root->AddChild(scroll_parent_border.Pass());
 
   LayerImplList render_surface_layer_list;
@@ skipping 674 matching lines @@
   expected.insert(child_raw);
   expected.insert(grand_child1_raw);
   expected.insert(grand_child2_raw);
 
   actual.clear();
   GatherDrawnLayers(render_surface_layer_list_impl(), &actual);
   EXPECT_EQ(expected, actual);
 }
 }  // namespace
 }  // namespace cc