Update cc snapshot to r127918

cc/CCRenderSurfaceTest.cpp

Index: cc/CCRenderSurfaceTest.cpp
diff --git a/cc/CCRenderSurfaceTest.cpp b/cc/CCRenderSurfaceTest.cpp
index de9a8ccfd8cd4ffdde54b9b113098101930f0c92..7fc26bad40b727272342e0a9dd9e58629c6ab33b 100644
--- a/cc/CCRenderSurfaceTest.cpp
+++ b/cc/CCRenderSurfaceTest.cpp
@@ -104,7 +104,7 @@ TEST(CCRenderSurfaceTest, sanityCheckSurfaceCreatesCorrectSharedQuadState)
     CCAppendQuadsData appendQuadsData;
 
     bool forReplica = false;
-    renderSurface->appendQuads(mockQuadCuller, appendQuadsData, forReplica, 2);
+    renderSurface->appendQuads(mockQuadCuller, appendQuadsData, forReplica, CCRenderPass::Id(2, 0));
 
     ASSERT_EQ(1u, sharedStateList.size());
     CCSharedQuadState* sharedQuadState = sharedStateList[0].get();
@@ -156,7 +156,7 @@ TEST(CCRenderSurfaceTest, sanityCheckSurfaceCreatesCorrectRenderPass)
     ASSERT_EQ(1u, passSink.renderPasses().size());
     CCRenderPass* pass = passSink.renderPasses()[0].get();
 
-    EXPECT_EQ(2, pass->id());
+    EXPECT_EQ(CCRenderPass::Id(2, 0), pass->id());
     EXPECT_EQ(contentRect, pass->outputRect());
     EXPECT_EQ(origin, pass->transformToRootTarget());
 }