Chromium Code Reviews| Index: cc/blink/web_to_cc_animation_delegate_adapter.cc |
| diff --git a/cc/blink/web_to_cc_animation_delegate_adapter.cc b/cc/blink/web_to_cc_animation_delegate_adapter.cc |
| index 3bdf0d47f8536293931c763450f165ce3fdbf318..97bc0b92894f742daa3bdbf2dbcdaa9a4a1237e4 100644 |
| --- a/cc/blink/web_to_cc_animation_delegate_adapter.cc |
| +++ b/cc/blink/web_to_cc_animation_delegate_adapter.cc |
| @@ -17,13 +17,7 @@ void WebToCCAnimationDelegateAdapter::NotifyAnimationStarted( |
| cc::Animation::TargetProperty target_property, |
| int group) { |
| delegate_->notifyAnimationStarted( |
| - (monotonic_time - base::TimeTicks()).InSecondsF(), |
| -#if WEB_COMPOSITOR_ANIMATION_DELEGATE_TAKES_GROUP |
|
esprehn
2016/01/28 03:40:39
woah crazy ifdefs, what is this?
loyso (OOO)
2016/01/28 07:10:08
Leftovers from old 3-side patches.
|
| - group); |
| -#else |
| - static_cast<blink::WebCompositorAnimation::TargetProperty>( |
| - target_property)); |
| -#endif |
| + (monotonic_time - base::TimeTicks()).InSecondsF(), group); |
| } |
| void WebToCCAnimationDelegateAdapter::NotifyAnimationFinished( |
| @@ -31,13 +25,7 @@ void WebToCCAnimationDelegateAdapter::NotifyAnimationFinished( |
| cc::Animation::TargetProperty target_property, |
| int group) { |
| delegate_->notifyAnimationFinished( |
| - (monotonic_time - base::TimeTicks()).InSecondsF(), |
| -#if WEB_COMPOSITOR_ANIMATION_DELEGATE_TAKES_GROUP |
| - group); |
| -#else |
| - static_cast<blink::WebCompositorAnimation::TargetProperty>( |
| - target_property)); |
| -#endif |
| + (monotonic_time - base::TimeTicks()).InSecondsF(), group); |
| } |
| void WebToCCAnimationDelegateAdapter::NotifyAnimationAborted( |