| Index: cc/tiles/image_decode_controller.h
|
| diff --git a/cc/tiles/image_decode_controller.h b/cc/tiles/image_decode_controller.h
|
| index f814d219ac60568e83f1ef506a1319189692e98f..2c18212167d20fe733fcde61d1a91bb437f475e1 100644
|
| --- a/cc/tiles/image_decode_controller.h
|
| +++ b/cc/tiles/image_decode_controller.h
|
| @@ -8,7 +8,6 @@
|
| #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"
|
| @@ -80,16 +79,16 @@
|
| // 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::HashInts(static_cast<uint64_t>(base::HashInts(
|
| + base::HashPair(static_cast<uint64_t>(base::HashPair(
|
| key.src_rect().x(), key.src_rect().y())),
|
| - static_cast<uint64_t>(base::HashInts(
|
| + static_cast<uint64_t>(base::HashPair(
|
| key.src_rect().width(), key.src_rect().height())));
|
|
|
| uint64_t target_size_hash =
|
| - base::HashInts(key.target_size().width(), key.target_size().height());
|
| -
|
| - return base::HashInts(base::HashInts(src_rect_hash, target_size_hash),
|
| - base::HashInts(key.image_id(), key.filter_quality()));
|
| + base::HashPair(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()));
|
| }
|
| };
|
| } // namespace BASE_HASH_NAMESPACE
|
|
|