summaryrefslogtreecommitdiff
path: root/libs/hwui/AnimatorManager.h
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2016-02-11 17:02:33 +0000
committerJohn Reck <jreck@google.com>2016-02-11 17:02:33 +0000
commite03ef25a3e44ef5d495e366c30b9b5b69fc58194 (patch)
tree4db5a1124bf667a84b48d98289233b8cca0098ed /libs/hwui/AnimatorManager.h
parent18bdf443e371e9f293439b4ff92cc79abaa422e5 (diff)
Revert "VectorDrawable native rendering - Step 5 of MANY"
Bug: 27136799 This reverts commit 18bdf443e371e9f293439b4ff92cc79abaa422e5. Change-Id: I825b061eec2a591f2d18119ba64494624b9ad4f2
Diffstat (limited to 'libs/hwui/AnimatorManager.h')
-rw-r--r--libs/hwui/AnimatorManager.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/libs/hwui/AnimatorManager.h b/libs/hwui/AnimatorManager.h
index c24ef47a4644..fb75eb8599b4 100644
--- a/libs/hwui/AnimatorManager.h
+++ b/libs/hwui/AnimatorManager.h
@@ -62,17 +62,13 @@ 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< sp<BaseRenderNodeAnimator> > mNewAnimators;
- std::vector< sp<BaseRenderNodeAnimator> > mAnimators;
+ std::vector<BaseRenderNodeAnimator*> mNewAnimators;
+ std::vector<BaseRenderNodeAnimator*> mAnimators;
};
} /* namespace uirenderer */