| 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 97bc0b92894f742daa3bdbf2dbcdaa9a4a1237e4..2ad069d4f2711016e4b041d95b870d8edaf7cdf9 100644
|
| --- a/cc/blink/web_to_cc_animation_delegate_adapter.cc
|
| +++ b/cc/blink/web_to_cc_animation_delegate_adapter.cc
|
| @@ -14,7 +14,7 @@ WebToCCAnimationDelegateAdapter::WebToCCAnimationDelegateAdapter(
|
|
|
| void WebToCCAnimationDelegateAdapter::NotifyAnimationStarted(
|
| base::TimeTicks monotonic_time,
|
| - cc::Animation::TargetProperty target_property,
|
| + cc::TargetProperty::Type target_property,
|
| int group) {
|
| delegate_->notifyAnimationStarted(
|
| (monotonic_time - base::TimeTicks()).InSecondsF(), group);
|
| @@ -22,7 +22,7 @@ void WebToCCAnimationDelegateAdapter::NotifyAnimationStarted(
|
|
|
| void WebToCCAnimationDelegateAdapter::NotifyAnimationFinished(
|
| base::TimeTicks monotonic_time,
|
| - cc::Animation::TargetProperty target_property,
|
| + cc::TargetProperty::Type target_property,
|
| int group) {
|
| delegate_->notifyAnimationFinished(
|
| (monotonic_time - base::TimeTicks()).InSecondsF(), group);
|
| @@ -30,7 +30,7 @@ void WebToCCAnimationDelegateAdapter::NotifyAnimationFinished(
|
|
|
| void WebToCCAnimationDelegateAdapter::NotifyAnimationAborted(
|
| base::TimeTicks monotonic_time,
|
| - cc::Animation::TargetProperty target_property,
|
| + cc::TargetProperty::Type target_property,
|
| int group) {
|
| delegate_->notifyAnimationAborted(
|
| (monotonic_time - base::TimeTicks()).InSecondsF(), group);
|
|
|