Index: cc/trees/layer_tree_host.cc |
diff --git a/cc/trees/layer_tree_host.cc b/cc/trees/layer_tree_host.cc |
index 5972a9f8303986a65849be5b35357767753d8066..c5748c7a6534425a770f9eedbe35ed61f3a3108b 100644 |
--- a/cc/trees/layer_tree_host.cc |
+++ b/cc/trees/layer_tree_host.cc |
@@ -39,6 +39,7 @@ |
#include "cc/trees/single_thread_proxy.h" |
#include "cc/trees/thread_proxy.h" |
#include "cc/trees/tree_synchronizer.h" |
+#include "ui/gfx/frame_time.h" |
#include "ui/gfx/size_conversions.h" |
namespace { |
@@ -563,7 +564,7 @@ void LayerTreeHost::SetNextCommitForcesRedraw() { |
} |
void LayerTreeHost::SetAnimationEvents(scoped_ptr<AnimationEventsVector> events, |
- base::Time wall_clock_time) { |
+ base::TimeTicks clock_time) { |
DCHECK(proxy_->IsMainThread()); |
for (size_t event_index = 0; event_index < events->size(); ++event_index) { |
int event_layer_id = (*events)[event_index].layer_id; |
@@ -578,12 +579,12 @@ void LayerTreeHost::SetAnimationEvents(scoped_ptr<AnimationEventsVector> events, |
switch ((*events)[event_index].type) { |
case AnimationEvent::Started: |
(*iter).second->NotifyAnimationStarted((*events)[event_index], |
- wall_clock_time.ToDoubleT()); |
+ clock_time.ToWebKit()); |
ajuma
2014/02/28 02:32:03
This seems incorrect, since the callee is expectin
|
break; |
case AnimationEvent::Finished: |
(*iter).second->NotifyAnimationFinished((*events)[event_index], |
- wall_clock_time.ToDoubleT()); |
+ clock_time.ToWebKit()); |
break; |
case AnimationEvent::Aborted: |