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

Unified Diff: cc/blink/web_to_cc_animation_delegate_adapter.cc

Issue 1616653002: CC Animation: Move files from cc_blink to Source/platform/animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ScrollAnimatorCompositorCoordinator for MSVC. Created 4 years, 11 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
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(

Powered by Google App Engine
This is Rietveld 408576698