Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4581)

Unified Diff: cc/blink/web_to_cc_animation_delegate_adapter.cc

Issue 653563003: cc: Plumb group id through animation creation and start/finish notifications (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/blink/web_to_cc_animation_delegate_adapter.h ('k') | cc/layers/layer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « cc/blink/web_to_cc_animation_delegate_adapter.h ('k') | cc/layers/layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698