diff options
| author | davidben <davidben@chromium.org> | 2016-01-20 17:40:42 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-21 01:41:32 +0000 |
| commit | 021a2b496a7eb7222c0c7f4d8cd01d697c3f2dda (patch) | |
| tree | d1af96a93a7e2f4defa4c680bc50a3170f06561a /cc/quads/render_pass.h | |
| parent | 38b5efd43f39caec997e343801e3ae712d4c67ad (diff) | |
| download | chromium_src-021a2b496a7eb7222c0c7f4d8cd01d697c3f2dda.zip chromium_src-021a2b496a7eb7222c0c7f4d8cd01d697c3f2dda.tar.gz chromium_src-021a2b496a7eb7222c0c7f4d8cd01d697c3f2dda.tar.bz2 | |
Revert of Allow std::unordered_*. (patchset #15 id:280001 of https://codereview.chromium.org/1502373009/ )
Reason for revert:
MSan build failure.
https://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20Linux%20ChromeOS%20MSan%20Builder/builds/12498
Original issue's description:
> Allow std::unordered_*.
>
> base::hash_* is, as a transition step, implemented in terms of
> std::unordered_*. Later commits will convert existing uses.
>
> Also fix a host of IWYU problems that arose from this CL.
>
> (NOPRESUBMIT because the wstring presubmit check is overzealous
> and complains about the reference to wstring in the comment.)
>
> NOPRESUBMIT=true
> BUG=576864
> TBR=derat@chromium.org,blundell@chromium.org,jbauman@chromium.org,dalecurtis@chromium.org
> CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
>
> Committed: https://crrev.com/3f37f7f1459e7b5a452c0e433493e0a6e9649ca7
> Cr-Commit-Position: refs/heads/master@{#370553}
TBR=danakj@chromium.org,thakis@chromium.org,derat@chromium.org,blundell@chromium.org,dalecurtis@chromium.org,jbauman@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=576864
Review URL: https://codereview.chromium.org/1610023003
Cr-Commit-Position: refs/heads/master@{#370559}
Diffstat (limited to 'cc/quads/render_pass.h')
| -rw-r--r-- | cc/quads/render_pass.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cc/quads/render_pass.h b/cc/quads/render_pass.h index 552643d..9ba727e 100644 --- a/cc/quads/render_pass.h +++ b/cc/quads/render_pass.h @@ -12,7 +12,6 @@ #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" @@ -140,7 +139,7 @@ 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)); + return base::HashPair(key.layer_id, static_cast<int>(key.index)); } }; } // namespace BASE_HASH_NAMESPACE |