summaryrefslogtreecommitdiffstats
path: root/content/renderer/input
diff options
context:
space:
mode:
authorccameron <ccameron@chromium.org>2014-12-09 11:56:32 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-09 19:56:58 +0000
commit98be9ac05260466ebd0da0373edebb0b20ef54b2 (patch)
tree160c79e4c5cdbbb9a0ebc5c4aa83725a014b7507 /content/renderer/input
parent984a84a3d1a99a1accf55b4db46dfdc7df29e6d6 (diff)
downloadchromium_src-98be9ac05260466ebd0da0373edebb0b20ef54b2.zip
chromium_src-98be9ac05260466ebd0da0373edebb0b20ef54b2.tar.gz
chromium_src-98be9ac05260466ebd0da0373edebb0b20ef54b2.tar.bz2
Add argument to pass elastic overscroll delta to Blink (Chrome side)
Blink will need to use this argument to translate input events during overscroll. R=enne TBR=jam BUG=133097 Review URL: https://codereview.chromium.org/783373002 Cr-Commit-Position: refs/heads/master@{#307525}
Diffstat (limited to 'content/renderer/input')
-rw-r--r--content/renderer/input/input_scroll_elasticity_controller.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/renderer/input/input_scroll_elasticity_controller.cc b/content/renderer/input/input_scroll_elasticity_controller.cc
index ca0258e..9babcd7 100644
--- a/content/renderer/input/input_scroll_elasticity_controller.cc
+++ b/content/renderer/input/input_scroll_elasticity_controller.cc
@@ -41,7 +41,7 @@ namespace {
// deltas against the event timestamps, which are in seconds since epoch. Find
// out which is right. Also, avoid querying time, and use frame time instead.
double SystemUptime() {
- return base::Time::Now().ToDoubleT();
+ return base::TimeTicks::Now().ToInternalValue() / 1.0e6;
}
const float kScrollVelocityZeroingTimeout = 0.10f;