Make cc's use of WTF::HashMap robust to key/value change

cc/CCDirectRenderer.cpp

 // Copyright 2012 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 "CCDirectRenderer.h"
 
 #include "CCMathUtil.h"
 #include <public/WebTransformationMatrix.h>
@@ skipping 80 matching lines @@
 
 void CCDirectRenderer::decideRenderPassAllocationsForFrame(const CCRenderPassList& renderPassesInDrawOrder)
 {
     HashMap<CCRenderPass::Id, const CCRenderPass*> renderPassesInFrame;
     for (size_t i = 0; i < renderPassesInDrawOrder.size(); ++i)
         renderPassesInFrame.set(renderPassesInDrawOrder[i]->id(), renderPassesInDrawOrder[i]);
 
     Vector<CCRenderPass::Id> passesToDelete;
     HashMap<CCRenderPass::Id, OwnPtr<CachedTexture> >::const_iterator passIterator;
     for (passIterator = m_renderPassTextures.begin(); passIterator != m_renderPassTextures.end(); ++passIterator) {
+#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
+        const CCRenderPass* renderPassInFrame = renderPassesInFrame.get(passIterator->key);
+#else
         const CCRenderPass* renderPassInFrame = renderPassesInFrame.get(passIterator->first);
+#endif
         if (!renderPassInFrame) {
+#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
+            passesToDelete.append(passIterator->key);
+#else
             passesToDelete.append(passIterator->first);
+#endif
             continue;
         }
 
         const IntSize& requiredSize = renderPassTextureSize(renderPassInFrame);
         GC3Denum requiredFormat = renderPassTextureFormat(renderPassInFrame);
+#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
+        CachedTexture* texture = passIterator->value.get();
+#else
         CachedTexture* texture = passIterator->second.get();
+#endif
         ASSERT(texture);
 
         if (texture->id() && (texture->size() != requiredSize || texture->format() != requiredFormat))
             texture->free();
     }
 
     // Delete RenderPass textures from the previous frame that will not be used again.
     for (size_t i = 0; i < passesToDelete.size(); ++i)
         m_renderPassTextures.remove(passesToDelete[i]);
 
@@ skipping 83 matching lines @@
     return pass->outputRect().size();
 }
 
 // static
 GC3Denum CCDirectRenderer::renderPassTextureFormat(const CCRenderPass*)
 {
     return GraphicsContext3D::RGBA;
 }
 
 }