diff options
| author | Doris Liu <tianliu@google.com> | 2016-02-11 20:30:48 +0000 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2016-02-12 19:49:29 -0800 |
| commit | 0d20a275a5baf8579c8b9111cf2ce6615874a6b6 (patch) | |
| tree | 4391aee82c9128353237465ef6ca9d1e0071d0f8 /libs/hwui/AnimatorManager.h | |
| parent | 477243b058bbc303bea6ba3aab445fd82a9f9155 (diff) | |
Revert "Revert "VectorDrawable native rendering - Step 5 of MANY""
This reverts commit e03ef25a3e44ef5d495e366c30b9b5b69fc58194.
Change-Id: I9c2e1c891667451a3ee668e414bf337ad67279ab
Diffstat (limited to 'libs/hwui/AnimatorManager.h')
| -rw-r--r-- | libs/hwui/AnimatorManager.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libs/hwui/AnimatorManager.h b/libs/hwui/AnimatorManager.h index fb75eb8599b4..c24ef47a4644 100644 --- a/libs/hwui/AnimatorManager.h +++ b/libs/hwui/AnimatorManager.h @@ -62,13 +62,17 @@ public: 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<BaseRenderNodeAnimator*> mNewAnimators; - std::vector<BaseRenderNodeAnimator*> mAnimators; + std::vector< sp<BaseRenderNodeAnimator> > mNewAnimators; + std::vector< sp<BaseRenderNodeAnimator> > mAnimators; }; } /* namespace uirenderer */ |