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 840cd4ff9d893c098937380821f2a415bbaabe0e..fcec11fd92ea436984dac1144949579e0f6eb0f2 100644 |
--- a/cc/blink/web_to_cc_animation_delegate_adapter.cc |
+++ b/cc/blink/web_to_cc_animation_delegate_adapter.cc |
@@ -14,20 +14,30 @@ WebToCCAnimationDelegateAdapter::WebToCCAnimationDelegateAdapter( |
void WebToCCAnimationDelegateAdapter::NotifyAnimationStarted( |
base::TimeTicks monotonic_time, |
- cc::Animation::TargetProperty target_property) { |
+ cc::Animation::TargetProperty target_property, |
+ int group) { |
delegate_->notifyAnimationStarted( |
(monotonic_time - base::TimeTicks()).InSecondsF(), |
+#if WEB_COMPOSITOR_ANIMATION_DELEGATE_TAKES_GROUP |
+ group); |
+#else |
static_cast<blink::WebCompositorAnimation::TargetProperty>( |
target_property)); |
+#endif |
} |
void WebToCCAnimationDelegateAdapter::NotifyAnimationFinished( |
base::TimeTicks monotonic_time, |
- cc::Animation::TargetProperty target_property) { |
+ 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 |
} |
} // namespace cc_blink |