diff options
| author | Doris Liu <tianliu@google.com> | 2016-02-19 21:39:21 +0000 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2016-02-19 13:51:31 -0800 |
| commit | c4bb185d41cfb960ed9a3178a4f8974c351abdb0 (patch) | |
| tree | 8fce2eab0422581acb8342def694abe23ed2c824 /libs/hwui/AnimatorManager.h | |
| parent | 53503069895918a59a305addaac84ea11937edcf (diff) | |
VectorDrawable native rendering - Step 5 of MANY
This is reverting the revert of what reverts the revert of the original
implementation. Fourth revert is a charm!
This reverts commit df7fdb1e0bdb5c289bbc08047e5c710185503309.
Change-Id: I6fc3a5accfd8b79c3da31bbc101ad9e9b4d6e7dd
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 */ |