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

Unified Diff: cc/animation/scroll_offset_animations_impl.cc

Issue 2377223002: CC Animations: Rewrite unit tests to work with AnimationPlayer. (Closed)
Patch Set: Reparent. Created 4 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/animation/element_animations_unittest.cc ('k') | cc/test/animation_test_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/scroll_offset_animations_impl.cc
diff --git a/cc/animation/scroll_offset_animations_impl.cc b/cc/animation/scroll_offset_animations_impl.cc
index 5d52678d06d10d7b31a0d551135426f8f5d0f936..ab3dfe32dbfa24b4f896715f349b7bda2f26d711 100644
--- a/cc/animation/scroll_offset_animations_impl.cc
+++ b/cc/animation/scroll_offset_animations_impl.cc
@@ -70,9 +70,8 @@ bool ScrollOffsetAnimationsImpl::ScrollAnimationUpdateTarget(
DCHECK_EQ(element_id, scroll_offset_animation_player_->element_id());
- Animation* animation =
- scroll_offset_animation_player_->element_animations()->GetAnimation(
- TargetProperty::SCROLL_OFFSET);
+ Animation* animation = scroll_offset_animation_player_->GetAnimation(
+ TargetProperty::SCROLL_OFFSET);
if (!animation) {
scroll_offset_animation_player_->DetachElement();
return false;
@@ -115,9 +114,8 @@ void ScrollOffsetAnimationsImpl::ScrollAnimationApplyAdjustment(
if (!scroll_offset_animation_player_->element_animations())
return;
- Animation* animation =
- scroll_offset_animation_player_->element_animations()->GetAnimation(
- TargetProperty::SCROLL_OFFSET);
+ Animation* animation = scroll_offset_animation_player_->GetAnimation(
+ TargetProperty::SCROLL_OFFSET);
if (!animation)
return;
« no previous file with comments | « cc/animation/element_animations_unittest.cc ('k') | cc/test/animation_test_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698