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

Unified Diff: cc/animation/animation_host.cc

Issue 1887593003: CC Animation: Make layer_animation_controller a private member of ElementAnimations. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « no previous file | cc/animation/animation_player.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/animation/animation_host.cc
diff --git a/cc/animation/animation_host.cc b/cc/animation/animation_host.cc
index 6acf62e98e1b1e238375236b6019a26bc447d483..824f8a69e5bf7061410a22dee116052e25421abc 100644
--- a/cc/animation/animation_host.cc
+++ b/cc/animation/animation_host.cc
@@ -79,7 +79,6 @@ class AnimationHost::ScrollOffsetAnimations : public AnimationDelegate {
DCHECK_EQ(layer_id, scroll_offset_animation_player_->layer_id());
Animation* animation = scroll_offset_animation_player_->element_animations()
- ->layer_animation_controller()
->GetAnimation(TargetProperty::SCROLL_OFFSET);
if (!animation) {
scroll_offset_animation_player_->DetachLayer();
@@ -337,7 +336,7 @@ LayerAnimationController* AnimationHost::GetControllerForLayerId(
if (!element_animations)
return nullptr;
- return element_animations->layer_animation_controller();
+ return element_animations->layer_animation_controller_.get();
}
ElementAnimations* AnimationHost::GetElementAnimationsForLayerId(
« no previous file with comments | « no previous file | cc/animation/animation_player.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698