Rendering context information added to SharedQuadState

cc/trees/layer_tree_host_common_unittest.cc

Index: cc/trees/layer_tree_host_common_unittest.cc
diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index 1c850810bb8f2612cd4b224020d8648fa5cadede..3c8efbce4ac7568f5c2921ec5f242c757c747fa8 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -3954,8 +3954,9 @@ TEST_F(LayerTreeHostCommonTest,
                                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(
@@ -6930,8 +6931,9 @@ TEST_F(LayerTreeHostCommonTest, CanRenderToSeparateSurface) {
                                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());
@@ -6991,7 +6993,8 @@ TEST_F(LayerTreeHostCommonTest, DoNotIncludeBackfaceInvisibleSurfaces) {
                                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);
 
@@ -7619,7 +7622,8 @@ TEST_F(LayerTreeHostCommonTest, DoNotClobberSorting) {
                                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());