diff options
| author | davidben <davidben@chromium.org> | 2016-01-27 16:29:51 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-28 00:35:15 +0000 |
| commit | 5877ffe39d049730251b7f49f890c820e26643fa (patch) | |
| tree | 85afd4d3b8c30b36e911027329262a44a8ea9bc2 /cc/quads | |
| parent | a4861dc20689e685d8d91c436c9b0a02fc248b4e (diff) | |
| download | chromium_src-5877ffe39d049730251b7f49f890c820e26643fa.zip chromium_src-5877ffe39d049730251b7f49f890c820e26643fa.tar.gz chromium_src-5877ffe39d049730251b7f49f890c820e26643fa.tar.bz2 | |
Switch cc to std::unordered_*.
This removes all uses of base::hash_*, BASE_HASH_NAMESPACE, and
base::ScopedPtrHashMap in favor of the C++11 versions.
BUG=576864, 579229
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1587283002
Cr-Commit-Position: refs/heads/master@{#371937}
Diffstat (limited to 'cc/quads')
| -rw-r--r-- | cc/quads/render_pass.h | 18 | ||||
| -rw-r--r-- | cc/quads/render_pass_id.h | 7 |
2 files changed, 11 insertions, 14 deletions
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h index 552643d..3f7775d 100644 --- a/cc/quads/render_pass.h +++ b/cc/quads/render_pass.h @@ -7,11 +7,11 @@ #include <stddef.h> +#include <unordered_map> #include <utility> #include <vector> #include "base/callback.h" -#include "base/containers/hash_tables.h" #include "base/hash.h" #include "base/macros.h" #include "cc/base/cc_export.h" @@ -134,20 +134,10 @@ class CC_EXPORT RenderPass { DISALLOW_COPY_AND_ASSIGN(RenderPass); }; -} // namespace cc +using RenderPassList = std::vector<scoped_ptr<RenderPass>>; +using RenderPassIdHashMap = + std::unordered_map<RenderPassId, RenderPass*, RenderPassIdHash>; -namespace BASE_HASH_NAMESPACE { -template <> -struct hash<cc::RenderPassId> { - size_t operator()(cc::RenderPassId key) const { - return base::HashInts(key.layer_id, static_cast<int>(key.index)); - } -}; -} // namespace BASE_HASH_NAMESPACE - -namespace cc { -typedef std::vector<scoped_ptr<RenderPass>> RenderPassList; -typedef base::hash_map<RenderPassId, RenderPass*> RenderPassIdHashMap; } // namespace cc #endif // CC_QUADS_RENDER_PASS_H_ diff --git a/cc/quads/render_pass_id.h b/cc/quads/render_pass_id.h index 5dff1e1..a0d48ea 100644 --- a/cc/quads/render_pass_id.h +++ b/cc/quads/render_pass_id.h @@ -9,6 +9,7 @@ #include <tuple> +#include "base/hash.h" #include "cc/base/cc_export.h" namespace cc { @@ -33,6 +34,12 @@ class CC_EXPORT RenderPassId { } }; +struct RenderPassIdHash { + size_t operator()(RenderPassId key) const { + return base::HashInts(key.layer_id, static_cast<int>(key.index)); + } +}; + } // namespace cc #endif // CC_QUADS_RENDER_PASS_ID_H_ |