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

cc/CCDamageTracker.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 "CCDamageTracker.h"
 
@@ skipping 189 matching lines @@
 
 FloatRect CCDamageTracker::trackDamageFromLeftoverRects()
 {
     // After computing damage for all active layers, any leftover items in the current
     // rect history correspond to layers/surfaces that no longer exist. So, these regions
     // are now exposed on the target surface.
 
     FloatRect damageRect = FloatRect();
 
     for (RectMap::iterator it = m_currentRectHistory->begin(); it != m_currentRectHistory->end(); ++it)
+#if WTF_NEW_HASHMAP_ITERATORS_INTERFACE
+        damageRect.unite(it->value);
+#else
         damageRect.unite(it->second);
+#endif
 
     m_currentRectHistory->clear();
 
     return damageRect;
 }
 
 static bool layerNeedsToRedrawOntoItsTargetSurface(CCLayerImpl* layer)
 {
     // If the layer does NOT own a surface but has SurfacePropertyChanged,
     // this means that its target surface is affected and needs to be redrawn.
@@ skipping 115 matching lines @@
     // at or below this layer. We expand the damage from this layer too, as we need to readback those pixels from the surface with only
     // the contents of layers below this one in them. This means we need to redraw any pixels in the surface being used for the blur in
     // this layer this frame.
     if (layer->backgroundFilters().hasFilterThatMovesPixels())
         expandDamageRectInsideRectWithFilters(targetDamageRect, surfaceRectInTargetSpace, layer->backgroundFilters());
 }
 
 } // namespace cc
 
 #endif // USE(ACCELERATED_COMPOSITING)