Update cc snapshot to r127918

cc/CCRenderSurface.cpp

Index: cc/CCRenderSurface.cpp
diff --git a/cc/CCRenderSurface.cpp b/cc/CCRenderSurface.cpp
index f00b5ef284b6425d4cff711ab34beec765e3762f..7ddfa126c84f12734575fdcd007e3dc40729e87c 100644
--- a/cc/CCRenderSurface.cpp
+++ b/cc/CCRenderSurface.cpp
@@ -160,16 +160,24 @@ static inline IntRect computeClippedRectInTarget(const CCLayerImpl* owningLayer)
     return clippedRectInTarget;
 }
 
+CCRenderPass::Id CCRenderSurface::renderPassId()
+{
+    int layerId = m_owningLayer->id();
+    int subId = 0;
+    ASSERT(layerId > 0);
+    return CCRenderPass::Id(layerId, subId);
+}
+
 void CCRenderSurface::appendRenderPasses(CCRenderPassSink& passSink)
 {
-    OwnPtr<CCRenderPass> pass = CCRenderPass::create(m_owningLayer->id(), m_contentRect, m_screenSpaceTransform);
+    OwnPtr<CCRenderPass> pass = CCRenderPass::create(renderPassId(), m_contentRect, m_screenSpaceTransform);
     pass->setDamageRect(m_damageTracker->currentDamageRect());
     pass->setFilters(m_owningLayer->filters());
     pass->setBackgroundFilters(m_owningLayer->backgroundFilters());
     passSink.appendRenderPass(pass.release());
 }
 
-void CCRenderSurface::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData, bool forReplica, int renderPassId)
+void CCRenderSurface::appendQuads(CCQuadSink& quadSink, CCAppendQuadsData& appendQuadsData, bool forReplica, CCRenderPass::Id renderPassId)
 {
     ASSERT(!forReplica || m_owningLayer->hasReplica());