commit 0f077a5f3e29d65a06794f44c31703421e1099b5
author jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Sep 08 01:45:24 2012
committer jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Sep 08 01:45:24 2012
tree e03e164915723038aae056b913078d5ece62679b
parent 495972babd62847cc623537adfadefe95bb728f7

Update cc snapshot to r127918

TBR=nduca@chromium.org
BUG=

Review URL: https://chromiumcodereview.appspot.com/10917153

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155554 0039d316-1c4b-4281-b951-d872f2087c98

cc/CCRenderSurface.cpp

diff --git a/cc/CCRenderSurface.cpp b/cc/CCRenderSurface.cpp
index f00b5ef..7ddfa12 100644
--- a/cc/CCRenderSurface.cpp
+++ b/cc/CCRenderSurface.cpp
@@ -160,16 +160,24 @@
     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());