summaryrefslogtreecommitdiffstats
path: root/chromium/cc/animation/animation_events.cc
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-08 14:30:41 +0200
committerJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-08-12 13:49:54 +0200
commitab0a50979b9eb4dfa3320eff7e187e41efedf7a9 (patch)
tree498dfb8a97ff3361a9f7486863a52bb4e26bb898 /chromium/cc/animation/animation_events.cc
parent4ce69f7403811819800e7c5ae1318b2647e778d1 (diff)
Update Chromium to beta version 37.0.2062.68
Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'chromium/cc/animation/animation_events.cc')
-rw-r--r--chromium/cc/animation/animation_events.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chromium/cc/animation/animation_events.cc b/chromium/cc/animation/animation_events.cc
index 95b0e071a21..40a9031e7c6 100644
--- a/chromium/cc/animation/animation_events.cc
+++ b/chromium/cc/animation/animation_events.cc
@@ -10,7 +10,7 @@ AnimationEvent::AnimationEvent(AnimationEvent::Type type,
int layer_id,
int group_id,
Animation::TargetProperty target_property,
- double monotonic_time)
+ base::TimeTicks monotonic_time)
: type(type),
layer_id(layer_id),
group_id(group_id),