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

Unified Diff: cc/tiles/image_decode_controller.h

Issue 1615713003: Allow std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: leak_detector fixes and git cl format Created 4 years, 11 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/surfaces/surface_sequence.h ('k') | chrome/browser/devtools/devtools_file_watcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/tiles/image_decode_controller.h
diff --git a/cc/tiles/image_decode_controller.h b/cc/tiles/image_decode_controller.h
index 2c18212167d20fe733fcde61d1a91bb437f475e1..f814d219ac60568e83f1ef506a1319189692e98f 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
« no previous file with comments | « cc/surfaces/surface_sequence.h ('k') | chrome/browser/devtools/devtools_file_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698