Rendering context information added to SharedQuadState

cc/trees/occlusion_tracker_unittest.cc

Index: cc/trees/occlusion_tracker_unittest.cc
diff --git a/cc/trees/occlusion_tracker_unittest.cc b/cc/trees/occlusion_tracker_unittest.cc
index 6ce278159cae50fd7e7ce6f256c6721dac9fb484..14c38f95b5fa4c7f74a72170743a579437526692 100644
--- a/cc/trees/occlusion_tracker_unittest.cc
+++ b/cc/trees/occlusion_tracker_unittest.cc
@@ -1905,9 +1905,10 @@ class OcclusionTrackerTestUnsorted3dLayers
                                  gfx::Size(100, 100),
                                  true);
     parent->SetShouldFlattenTransform(false);
-    parent->SetIs3dSorted(true);
-    child1->SetIs3dSorted(true);
-    child2->SetIs3dSorted(true);
+    // Set rendering context ID to 1 for 3D sorting
+    parent->SetRenderingContextId(1);
+    child1->SetRenderingContextId(1);
+    child2->SetRenderingContextId(1);
 
     this->CalcDrawEtc(parent);
 
@@ -1951,8 +1952,9 @@ class OcclusionTrackerTestPerspectiveTransform
                                  gfx::Size(200, 200),
                                  true);
     container->SetShouldFlattenTransform(false);
-    container->SetIs3dSorted(true);
-    layer->SetIs3dSorted(true);
+    // Set rendering context ID to 1 for 3D sorting
+    container->SetRenderingContextId(1);
+    layer->SetRenderingContextId(1);
     layer->SetShouldFlattenTransform(false);
 
     this->CalcDrawEtc(parent);
@@ -1996,9 +1998,10 @@ class OcclusionTrackerTestPerspectiveTransformBehindCamera
     typename Types::ContentLayerType* layer = this->CreateDrawingLayer(
         container, transform, gfx::PointF(), gfx::Size(500, 500), true);
     container->SetShouldFlattenTransform(false);
-    container->SetIs3dSorted(true);
+    // Set rendering context ID to 1 for 3D sorting
+    container->SetRenderingContextId(1);
     layer->SetShouldFlattenTransform(false);
-    layer->SetIs3dSorted(true);
+    layer->SetRenderingContextId(1);
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType> occlusion(
@@ -2039,9 +2042,10 @@ class OcclusionTrackerTestLayerBehindCameraDoesNotOcclude
     typename Types::ContentLayerType* layer = this->CreateDrawingLayer(
         parent, transform, gfx::PointF(), gfx::Size(100, 100), true);
     parent->SetShouldFlattenTransform(false);
-    parent->SetIs3dSorted(true);
+    // Set rendering context ID to 1 for 3D sorting
+    parent->SetRenderingContextId(1);
     layer->SetShouldFlattenTransform(false);
-    layer->SetIs3dSorted(true);
+    layer->SetRenderingContextId(1);
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType> occlusion(
@@ -2080,9 +2084,10 @@ class OcclusionTrackerTestLargePixelsOccludeInsideClipRect
     typename Types::ContentLayerType* layer = this->CreateDrawingLayer(
         parent, transform, gfx::PointF(), gfx::Size(100, 100), true);
     parent->SetShouldFlattenTransform(false);
-    parent->SetIs3dSorted(true);
+    // Set rendering context ID to 1 for 3D sorting
+    parent->SetRenderingContextId(1);
     layer->SetShouldFlattenTransform(false);
-    layer->SetIs3dSorted(true);
+    layer->SetRenderingContextId(1);
     this->CalcDrawEtc(parent);
 
     TestOcclusionTrackerWithClip<typename Types::LayerType> occlusion(