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

cc/TiledLayerChromium.cpp

Index: cc/TiledLayerChromium.cpp
diff --git a/cc/TiledLayerChromium.cpp b/cc/TiledLayerChromium.cpp
index 914e211c640e772e552e18ce3ff01550cb971e38..75bd57d9b6f960ef46ba3c3e29123e8516b29b55 100644
--- a/cc/TiledLayerChromium.cpp
+++ b/cc/TiledLayerChromium.cpp
@@ -203,9 +203,15 @@ void TiledLayerChromium::pushPropertiesTo(CCLayerImpl* layer)
     Vector<UpdatableTile*> invalidTiles;
 
     for (CCLayerTilingData::TileMap::const_iterator iter = m_tiler->tiles().begin(); iter != m_tiler->tiles().end(); ++iter) {
+#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
+        int i = iter->key.first;
+        int j = iter->key.second;
+        UpdatableTile* tile = static_cast<UpdatableTile*>(iter->value.get());
+#else
         int i = iter->first.first;
         int j = iter->first.second;
         UpdatableTile* tile = static_cast<UpdatableTile*>(iter->second.get());
+#endif
         // FIXME: This should not ever be null.
         if (!tile)
             continue;
@@ -235,7 +241,11 @@ void TiledLayerChromium::setLayerTreeHost(CCLayerTreeHost* host)
 {
     if (host && host != layerTreeHost()) {
         for (CCLayerTilingData::TileMap::const_iterator iter = m_tiler->tiles().begin(); iter != m_tiler->tiles().end(); ++iter) {
+#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
+            UpdatableTile* tile = static_cast<UpdatableTile*>(iter->value.get());
+#else
             UpdatableTile* tile = static_cast<UpdatableTile*>(iter->second.get());
+#endif
             // FIXME: This should not ever be null.
             if (!tile)
                 continue;
@@ -303,7 +313,11 @@ void TiledLayerChromium::invalidateContentRect(const IntRect& contentRect)
         return;
 
     for (CCLayerTilingData::TileMap::const_iterator iter = m_tiler->tiles().begin(); iter != m_tiler->tiles().end(); ++iter) {
+#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
+        UpdatableTile* tile = static_cast<UpdatableTile*>(iter->value.get());
+#else
         UpdatableTile* tile = static_cast<UpdatableTile*>(iter->second.get());
+#endif
         ASSERT(tile);
         // FIXME: This should not ever be null.
         if (!tile)
@@ -632,7 +646,11 @@ void TiledLayerChromium::setTexturePriorities(const CCPriorityCalculator& priori
 
     // Now update priorities on all tiles we have in the layer, no matter where they are.
     for (CCLayerTilingData::TileMap::const_iterator iter = m_tiler->tiles().begin(); iter != m_tiler->tiles().end(); ++iter) {
+#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
+        UpdatableTile* tile = static_cast<UpdatableTile*>(iter->value.get());
+#else
         UpdatableTile* tile = static_cast<UpdatableTile*>(iter->second.get());
+#endif
         // FIXME: This should not ever be null.
         if (!tile)
             continue;
@@ -657,7 +675,11 @@ void TiledLayerChromium::resetUpdateState()
 
     CCLayerTilingData::TileMap::const_iterator end = m_tiler->tiles().end();
     for (CCLayerTilingData::TileMap::const_iterator iter = m_tiler->tiles().begin(); iter != end; ++iter) {
+#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
+        UpdatableTile* tile = static_cast<UpdatableTile*>(iter->value.get());
+#else
         UpdatableTile* tile = static_cast<UpdatableTile*>(iter->second.get());
+#endif
         // FIXME: This should not ever be null.
         if (!tile)
             continue;