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

cc/CCLayerTilingData.cpp

 // Copyright 2011 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"
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "CCLayerTilingData.h"
@@ skipping 114 matching lines @@
     if (size.isEmpty()) {
         m_tiles.clear();
         return;
     }
 
     // Any tiles completely outside our new bounds are invalid and should be dropped.
     int left, top, right, bottom;
     contentRectToTileIndices(IntRect(IntPoint(), size), left, top, right, bottom);
     Vector<TileMapKey> invalidTileKeys;
     for (TileMap::const_iterator it = m_tiles.begin(); it != m_tiles.end(); ++it) {
+#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
+        if (it->key.first > right || it->key.second > bottom)
+            invalidTileKeys.append(it->key);
+#else
         if (it->first.first > right || it->first.second > bottom)
             invalidTileKeys.append(it->first);
+#endif
     }
     for (size_t i = 0; i < invalidTileKeys.size(); ++i)
         m_tiles.remove(invalidTileKeys[i]);
 }
 
 IntSize CCLayerTilingData::bounds() const
 {
     return m_tilingData.totalSize();
 }
 
 } // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)