| Index: cc/surfaces/surface_factory.h
|
| diff --git a/cc/surfaces/surface_factory.h b/cc/surfaces/surface_factory.h
|
| index fdfad179059d3eb1ea4e55b36d588a2f025b9994..09dbe1a0b72ba22fcae353af700ccfd7500ef25b 100644
|
| --- a/cc/surfaces/surface_factory.h
|
| +++ b/cc/surfaces/surface_factory.h
|
| @@ -6,9 +6,9 @@
|
| #define CC_SURFACES_SURFACE_FACTORY_H_
|
|
|
| #include <set>
|
| +#include <unordered_map>
|
|
|
| #include "base/callback_forward.h"
|
| -#include "base/containers/scoped_ptr_hash_map.h"
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -85,7 +85,7 @@ class CC_SURFACES_EXPORT SurfaceFactory
|
|
|
| bool needs_sync_points_;
|
|
|
| - typedef base::ScopedPtrHashMap<SurfaceId, scoped_ptr<Surface>>
|
| + typedef std::unordered_map<SurfaceId, scoped_ptr<Surface>, SurfaceIdHash>
|
| OwningSurfaceMap;
|
| OwningSurfaceMap surface_map_;
|
|
|
|
|