| Index: webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc
|
| diff --git a/webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc b/webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc
|
| index 3e25b882fb38a7684332b3ee1194888f2d304648..f5894d3bd1adc00d2dd6d1e49203d414195773fb 100644
|
| --- a/webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc
|
| +++ b/webkit/renderer/compositor_bindings/web_to_cc_animation_delegate_adapter.cc
|
| @@ -12,12 +12,32 @@ WebToCCAnimationDelegateAdapter::WebToCCAnimationDelegateAdapter(
|
| blink::WebAnimationDelegate* delegate)
|
| : delegate_(delegate) {}
|
|
|
| -void WebToCCAnimationDelegateAdapter::NotifyAnimationStarted(double time) {
|
| - delegate_->notifyAnimationStarted(time);
|
| +void WebToCCAnimationDelegateAdapter::NotifyAnimationStarted(
|
| + double wall_clock_time,
|
| + base::TimeTicks monotonic_time,
|
| + cc::Animation::TargetProperty target_property) {
|
| +#if WEB_ANIMATION_DELEGATE_TAKES_MONOTONIC_TIME
|
| + delegate_->notifyAnimationStarted(
|
| + wall_clock_time,
|
| + (monotonic_time - base::TimeTicks()).InSecondsF(),
|
| + static_cast<blink::WebAnimation::TargetProperty>(target_property));
|
| +#else
|
| + delegate_->notifyAnimationStarted(wall_clock_time);
|
| +#endif
|
| }
|
|
|
| -void WebToCCAnimationDelegateAdapter::NotifyAnimationFinished(double time) {
|
| - delegate_->notifyAnimationFinished(time);
|
| +void WebToCCAnimationDelegateAdapter::NotifyAnimationFinished(
|
| + double wall_clock_time,
|
| + base::TimeTicks monotonic_time,
|
| + cc::Animation::TargetProperty target_property) {
|
| +#if WEB_ANIMATION_DELEGATE_TAKES_MONOTONIC_TIME
|
| + delegate_->notifyAnimationFinished(
|
| + wall_clock_time,
|
| + (monotonic_time - base::TimeTicks()).InSecondsF(),
|
| + static_cast<blink::WebAnimation::TargetProperty>(target_property));
|
| +#else
|
| + delegate_->notifyAnimationFinished(wall_clock_time);
|
| +#endif
|
| }
|
|
|
| } // namespace webkit
|
|
|