diff options
| author | Chris Craik <ccraik@google.com> | 2014-12-22 17:16:56 -0800 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2014-12-23 16:53:56 -0800 |
| commit | 51d6a3db97bdd5315f1a17a4b447d10a92217b98 (patch) | |
| tree | 80803f8d2a5507e2d29bd58c7243a23fca343454 /libs/hwui/Animator.cpp | |
| parent | e84a208317e0ed388fcdad1e6743c7849acb51b0 (diff) | |
Cleanup various clang warnings, use unique_ptrs in several places
Change-Id: I347904b25e51fcc7de14b1e72f1acd0f6ba26f3f
Diffstat (limited to 'libs/hwui/Animator.cpp')
| -rw-r--r-- | libs/hwui/Animator.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/libs/hwui/Animator.cpp b/libs/hwui/Animator.cpp index a1bbc06089ff..805f8443c7fb 100644 --- a/libs/hwui/Animator.cpp +++ b/libs/hwui/Animator.cpp @@ -36,7 +36,6 @@ BaseRenderNodeAnimator::BaseRenderNodeAnimator(float finalValue) , mFinalValue(finalValue) , mDeltaValue(0) , mFromValue(0) - , mInterpolator(0) , mStagingPlayState(NOT_STARTED) , mPlayState(NOT_STARTED) , mHasStartValue(false) @@ -47,7 +46,6 @@ BaseRenderNodeAnimator::BaseRenderNodeAnimator(float finalValue) } BaseRenderNodeAnimator::~BaseRenderNodeAnimator() { - delete mInterpolator; } void BaseRenderNodeAnimator::checkMutable() { @@ -58,8 +56,7 @@ void BaseRenderNodeAnimator::checkMutable() { void BaseRenderNodeAnimator::setInterpolator(Interpolator* interpolator) { checkMutable(); - delete mInterpolator; - mInterpolator = interpolator; + mInterpolator.reset(interpolator); } void BaseRenderNodeAnimator::setStartValue(float value) { @@ -119,7 +116,7 @@ void BaseRenderNodeAnimator::transitionToRunning(AnimationContext& context) { } // No interpolator was set, use the default if (!mInterpolator) { - mInterpolator = Interpolator::createDefaultInterpolator(); + mInterpolator.reset(Interpolator::createDefaultInterpolator()); } if (mDuration < 0 || mDuration > 50000) { ALOGW("Your duration is strange and confusing: %" PRId64, mDuration); |