8 files changed, 15 insertions, 28 deletions
diff --git a/cc/debug/picture_debug_util.cc b/cc/debug/picture_debug_util.cc
index b1879af..50ae60b 100644
--- a/cc/debug/picture_debug_util.cc
+++ b/cc/debug/picture_debug_util.cc
@@ -6,6 +6,7 @@
 
 #include <stddef.h>
 
+#include <limits>
 #include <vector>
 
 #include "base/base64.h"
diff --git a/cc/layers/delegated_renderer_layer_impl.cc b/cc/layers/delegated_renderer_layer_impl.cc
index 5d51116..8158edcf 100644
--- a/cc/layers/delegated_renderer_layer_impl.cc
+++ b/cc/layers/delegated_renderer_layer_impl.cc
@@ -109,16 +109,7 @@ void DelegatedRendererLayerImpl::SetFrameData(
   bool invalid_frame = false;
   ResourceProvider::ResourceIdSet resources_in_frame;
   size_t reserve_size = frame_data->resource_list.size();
-#if defined(COMPILER_MSVC)
   resources_in_frame.reserve(reserve_size);
-#elif defined(COMPILER_GCC)
-  // Pre-standard hash-tables only implement resize, which behaves similarly
-  // to reserve for these keys. Resizing to 0 may also be broken (particularly
-  // on stlport).
-  // TODO(jbauman): Replace with reserve when C++11 is supported everywhere.
-  if (reserve_size)
-    resources_in_frame.resize(reserve_size);
-#endif
   for (const auto& pass : render_pass_list) {
     for (const auto& quad : pass->quad_list) {
       for (ResourceId& resource_id : quad->resources) {
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h
index 9ba727e..552643d 100644
--- a/cc/quads/render_pass.h
+++ b/cc/quads/render_pass.h
@@ -12,6 +12,7 @@
 
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
+#include "base/hash.h"
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/base/list_container.h"
@@ -139,7 +140,7 @@ namespace BASE_HASH_NAMESPACE {
 template <>
 struct hash<cc::RenderPassId> {
   size_t operator()(cc::RenderPassId key) const {
-    return base::HashPair(key.layer_id, static_cast<int>(key.index));
+    return base::HashInts(key.layer_id, static_cast<int>(key.index));
   }
 };
 }  // namespace BASE_HASH_NAMESPACE
diff --git a/cc/quads/render_pass_id.cc b/cc/quads/render_pass_id.cc
index 0f53e81..742c191 100644
--- a/cc/quads/render_pass_id.cc
+++ b/cc/quads/render_pass_id.cc
@@ -2,9 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "cc/quads/render_pass_id.h"
+
 #include <stddef.h>
 
-#include "cc/quads/render_pass_id.h"
+#include "base/hash.h"
 
 namespace cc {
 
@@ -12,7 +14,7 @@ void* RenderPassId::AsTracingId() const {
   static_assert(sizeof(size_t) <= sizeof(void*),  // NOLINT
                 "size of size_t should not be greater than that of a pointer");
   return reinterpret_cast<void*>(
-      base::HashPair(layer_id, static_cast<int>(index)));
+      base::HashInts(layer_id, static_cast<int>(index)));
 }
 
 }  // namespace cc
diff --git a/cc/quads/render_pass_id.h b/cc/quads/render_pass_id.h
index 11cb777..5dff1e1 100644
--- a/cc/quads/render_pass_id.h
+++ b/cc/quads/render_pass_id.h
@@ -9,7 +9,6 @@
 
 #include <tuple>
 
-#include "base/containers/hash_tables.h"
 #include "cc/base/cc_export.h"
 
 namespace cc {
diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc
index 9901d00..d60a217 100644
--- a/cc/surfaces/surface_aggregator.cc
+++ b/cc/surfaces/surface_aggregator.cc
@@ -526,16 +526,7 @@ gfx::Rect SurfaceAggregator::PrewalkTree(SurfaceId surface_id,
 
   ResourceProvider::ResourceIdSet referenced_resources;
   size_t reserve_size = frame_data->resource_list.size();
-#if defined(COMPILER_MSVC)
   referenced_resources.reserve(reserve_size);
-#elif defined(COMPILER_GCC)
-  // Pre-standard hash-tables only implement resize, which behaves similarly
-  // to reserve for these keys. Resizing to 0 may also be broken (particularly
-  // on stlport).
-  // TODO(jbauman): Replace with reserve when C++11 is supported everywhere.
-  if (reserve_size)
-    referenced_resources.resize(reserve_size);
-#endif
 
   bool invalid_frame = false;
   ResourceProvider::ResourceIdMap empty_map;
diff --git a/cc/surfaces/surface_sequence.h b/cc/surfaces/surface_sequence.h
index 21decf6..b4ab8ef 100644
--- a/cc/surfaces/surface_sequence.h
+++ b/cc/surfaces/surface_sequence.h
@@ -11,6 +11,7 @@
 #include <tuple>
 
 #include "base/containers/hash_tables.h"
+#include "base/hash.h"
 
 namespace cc {
 
@@ -46,7 +47,7 @@ namespace BASE_HASH_NAMESPACE {
 template <>
 struct hash<cc::SurfaceSequence> {
   size_t operator()(cc::SurfaceSequence key) const {
-    return base::HashPair(key.id_namespace, key.sequence);
+    return base::HashInts(key.id_namespace, key.sequence);
   }
 };
 }  // namespace BASE_HASH_NAMESPACE
diff --git a/cc/tiles/image_decode_controller.h b/cc/tiles/image_decode_controller.h
index 2c18212..f814d21 100644
--- a/cc/tiles/image_decode_controller.h
+++ b/cc/tiles/image_decode_controller.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include "base/containers/hash_tables.h"
+#include "base/hash.h"
 #include "base/memory/discardable_memory_allocator.h"
 #include "base/memory/ref_counted.h"
 #include "base/numerics/safe_math.h"
@@ -79,16 +80,16 @@ struct hash<cc::ImageDecodeControllerKey> {
     // TODO(vmpstr): This is a mess. Maybe it's faster to just search the vector
     // always (forwards or backwards to account for LRU).
     uint64_t src_rect_hash =
-        base::HashPair(static_cast<uint64_t>(base::HashPair(
+        base::HashInts(static_cast<uint64_t>(base::HashInts(
                            key.src_rect().x(), key.src_rect().y())),
-                       static_cast<uint64_t>(base::HashPair(
+                       static_cast<uint64_t>(base::HashInts(
                            key.src_rect().width(), key.src_rect().height())));
 
     uint64_t target_size_hash =
-        base::HashPair(key.target_size().width(), key.target_size().height());
+        base::HashInts(key.target_size().width(), key.target_size().height());
 
-    return base::HashPair(base::HashPair(src_rect_hash, target_size_hash),
-                          base::HashPair(key.image_id(), key.filter_quality()));
+    return base::HashInts(base::HashInts(src_rect_hash, target_size_hash),
+                          base::HashInts(key.image_id(), key.filter_quality()));
   }
 };
 }  // namespace BASE_HASH_NAMESPACE