Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: cc/surfaces/surface_id.h

Issue 681713002: Update from chromium https://crrev.com/301315 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/quads/render_pass.h ('k') | cc/test/fake_picture_pile_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/surfaces/surface_id.h
diff --git a/cc/surfaces/surface_id.h b/cc/surfaces/surface_id.h
index fa17286abc33de3826bec634ebaeaf31ac3a330c..070265a84955d3dee6b1ec29cea952268868e01c 100644
--- a/cc/surfaces/surface_id.h
+++ b/cc/surfaces/surface_id.h
@@ -5,7 +5,6 @@
#ifndef CC_SURFACES_SURFACE_ID_H_
#define CC_SURFACES_SURFACE_ID_H_
-#include "base/compiler_specific.h"
#include "base/containers/hash_tables.h"
namespace cc {
@@ -34,20 +33,12 @@ inline bool operator<(const SurfaceId& a, const SurfaceId& b) {
} // namespace cc
namespace BASE_HASH_NAMESPACE {
-#if defined(COMPILER_MSVC)
-inline size_t hash_value(const cc::SurfaceId& key) {
- return hash_value(key.id);
-}
-#elif defined(COMPILER_GCC)
template <>
struct hash<cc::SurfaceId> {
size_t operator()(cc::SurfaceId key) const {
return hash<uint64_t>()(key.id);
}
};
-#else
-#error define a hash function for your compiler
-#endif // COMPILER
} // namespace BASE_HASH_NAMESPACE
#endif // CC_SURFACES_SURFACE_ID_H_
« no previous file with comments | « cc/quads/render_pass.h ('k') | cc/test/fake_picture_pile_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698