diff options
| author | avi <avi@chromium.org> | 2015-12-20 22:14:36 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-21 06:15:26 +0000 |
| commit | 02a4d17f5a95ceea4049ccf1036f051d6630dfb1 (patch) | |
| tree | edcdd42d563dfab9f6f8c6629ea0588dc70e2148 /cc/trees/latency_info_swap_promise_monitor.cc | |
| parent | a0b6d530f224b4ac0b0bd0c4d47a96ea7353bfe4 (diff) | |
| download | chromium_src-02a4d17f5a95ceea4049ccf1036f051d6630dfb1.zip chromium_src-02a4d17f5a95ceea4049ccf1036f051d6630dfb1.tar.gz chromium_src-02a4d17f5a95ceea4049ccf1036f051d6630dfb1.tar.bz2 | |
Switch to standard integer types in cc/.
BUG=138542
TBR=danakj@chromium.org
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1539203002
Cr-Commit-Position: refs/heads/master@{#366333}
Diffstat (limited to 'cc/trees/latency_info_swap_promise_monitor.cc')
| -rw-r--r-- | cc/trees/latency_info_swap_promise_monitor.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cc/trees/latency_info_swap_promise_monitor.cc b/cc/trees/latency_info_swap_promise_monitor.cc index 9f2bc82..23635cd 100644 --- a/cc/trees/latency_info_swap_promise_monitor.cc +++ b/cc/trees/latency_info_swap_promise_monitor.cc @@ -4,6 +4,8 @@ #include "cc/trees/latency_info_swap_promise_monitor.h" +#include <stdint.h> + #include "base/threading/platform_thread.h" #include "cc/output/latency_info_swap_promise.h" #include "cc/trees/layer_tree_host.h" @@ -70,14 +72,14 @@ void LatencyInfoSwapPromiseMonitor::OnSetNeedsRedrawOnImpl() { void LatencyInfoSwapPromiseMonitor::OnForwardScrollUpdateToMainThreadOnImpl() { if (AddForwardingScrollUpdateToMainComponent(latency_)) { - int64 new_sequence_number = 0; + int64_t new_sequence_number = 0; for (ui::LatencyInfo::LatencyMap::const_iterator it = latency_->latency_components().begin(); it != latency_->latency_components().end(); ++it) { if (it->first.first == ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT) { new_sequence_number = - ((static_cast<int64>(base::PlatformThread::CurrentId()) << 32) ^ - (reinterpret_cast<uint64>(this) << 32)) | + ((static_cast<int64_t>(base::PlatformThread::CurrentId()) << 32) ^ + (reinterpret_cast<uint64_t>(this) << 32)) | (it->second.sequence_number & 0xffffffff); if (new_sequence_number == it->second.sequence_number) return; |