commit 8b083206aef627b6445a8c6be8bf5bb1d778a7f8
author Doris Liu <tianliu@google.com> Fri Feb 19 21:46:06 2016 +0000
committer Doris Liu <tianliu@google.com> Fri Feb 19 13:52:41 2016 -0800
tree 3c4e5e18fbd6f1f6dd3400567b86e9e793fd2665
parent c4bb185d41cfb960ed9a3178a4f8974c351abdb0

Revert "Revert "Check RenderNode's owning view before attaching animators""

This reverts commit eb40178af3b7c8d925eaf6c1aa0bef739c8ea47e.

Change-Id: I6838ecb35b50847746ee66ac204f14eb5f579b91

libs/hwui/AnimatorManager.h

diff --git a/libs/hwui/AnimatorManager.h b/libs/hwui/AnimatorManager.h
index c24ef47..61f6179 100644
--- a/libs/hwui/AnimatorManager.h
+++ b/libs/hwui/AnimatorManager.h
@@ -39,11 +39,13 @@
     ~AnimatorManager();
 
     void addAnimator(const sp<BaseRenderNodeAnimator>& animator);
+    void removeAnimator(const sp<BaseRenderNodeAnimator>& animator);
 
     void setAnimationHandle(AnimationHandle* handle);
     bool hasAnimationHandle() { return mAnimationHandle; }
 
     void pushStaging();
+    void onAnimatorTargetChanged(BaseRenderNodeAnimator* animator);
 
     // Returns the combined dirty mask of all animators run
     uint32_t animate(TreeInfo& info);
@@ -62,15 +64,10 @@
 private:
     uint32_t animateCommon(TreeInfo& info);
 
-    // This would remove the animator from mAnimators list. It should only be called during
-    // push staging.
-    void removeActiveAnimator(const sp<BaseRenderNodeAnimator>& animator);
-
     RenderNode& mParent;
     AnimationHandle* mAnimationHandle;
 
     // To improve the efficiency of resizing & removing from the vector
-    // use manual ref counting instead of sp<>.
     std::vector< sp<BaseRenderNodeAnimator> > mNewAnimators;
     std::vector< sp<BaseRenderNodeAnimator> > mAnimators;
 };