Update cc snapshot to r127918

cc/CCRenderSurfaceTest.cpp

 // 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 "config.h"
 
 #include "CCRenderSurface.h"
 
 #include "CCAppendQuadsData.h"
 #include "CCLayerImpl.h"
@@ skipping 86 matching lines @@
     renderSurface->setContentRect(contentRect);
     renderSurface->setClipRect(clipRect);
     renderSurface->setDrawOpacity(1);
 
     CCQuadList quadList;
     CCSharedQuadStateList sharedStateList;
     MockCCQuadCuller mockQuadCuller(quadList, sharedStateList);
     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();
 
     EXPECT_EQ(30, sharedQuadState->quadTransform.m41());
     EXPECT_EQ(40, sharedQuadState->quadTransform.m42());
     EXPECT_EQ(contentRect, IntRect(sharedQuadState->visibleContentRect));
     EXPECT_EQ(1, sharedQuadState->opacity);
     EXPECT_FALSE(sharedQuadState->opaque);
 }
@@ skipping 31 matching lines @@
     renderSurface->setScreenSpaceTransform(origin);
     renderSurface->setContentRect(contentRect);
 
     TestCCRenderPassSink passSink;
 
     renderSurface->appendRenderPasses(passSink);
 
     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());
 }
 
 } // namespace