Update cc snapshot to r127918

cc/CCDirectRenderer.cpp

Index: cc/CCDirectRenderer.cpp
diff --git a/cc/CCDirectRenderer.cpp b/cc/CCDirectRenderer.cpp
index f4b973130f62269d6561d279d5ce25ddc63437ad..e958f25ce9b4420f45b87996fad83e6b448bebd5 100644
--- a/cc/CCDirectRenderer.cpp
+++ b/cc/CCDirectRenderer.cpp
@@ -91,12 +91,12 @@ IntRect CCDirectRenderer::moveScissorToWindowSpace(const DrawingFrame& frame, Fl
 
 void CCDirectRenderer::decideRenderPassAllocationsForFrame(const CCRenderPassList& renderPassesInDrawOrder)
 {
-    HashMap<int, const CCRenderPass*> renderPassesInFrame;
+    HashMap<CCRenderPass::Id, const CCRenderPass*> renderPassesInFrame;
     for (size_t i = 0; i < renderPassesInDrawOrder.size(); ++i)
         renderPassesInFrame.set(renderPassesInDrawOrder[i]->id(), renderPassesInDrawOrder[i]);
 
-    Vector<int> passesToDelete;
-    HashMap<int, OwnPtr<CachedTexture> >::const_iterator passIterator;
+    Vector<CCRenderPass::Id> passesToDelete;
+    HashMap<CCRenderPass::Id, OwnPtr<CachedTexture> >::const_iterator passIterator;
     for (passIterator = m_renderPassTextures.begin(); passIterator != m_renderPassTextures.end(); ++passIterator) {
         const CCRenderPass* renderPassInFrame = renderPassesInFrame.get(passIterator->first);
         if (!renderPassInFrame) {
@@ -191,7 +191,7 @@ bool CCDirectRenderer::useRenderPass(DrawingFrame& frame, const CCRenderPass* re
     return bindFramebufferToTexture(frame, texture, renderPass->outputRect());
 }
 
-bool CCDirectRenderer::haveCachedResourcesForRenderPassId(int id) const
+bool CCDirectRenderer::haveCachedResourcesForRenderPassId(CCRenderPass::Id id) const
 {
     CachedTexture* texture = m_renderPassTextures.get(id);
     return texture && texture->id() && texture->isComplete();