diff options
author | John Reck <jreck@google.com> | 2017-11-03 10:12:19 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2017-11-03 10:57:44 -0700 |
commit | 1bcacfdcab0eaa0cee92bd7f5a1b5e271dd68e52 (patch) | |
tree | 4a1366cf2d1cf50b5ec4ed1a8cf0f437053cd0d7 /libs/hwui/AnimationContext.h | |
parent | 30ec71c0fe194a551d2e4abaff2159e0730488e0 (diff) |
Format the world (or just HWUI)
Test: No code changes, just ran through clang-format
Change-Id: Id23aa4ec7eebc0446fe3a30260f33e7fd455bb8c
Diffstat (limited to 'libs/hwui/AnimationContext.h')
-rw-r--r-- | libs/hwui/AnimationContext.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/hwui/AnimationContext.h b/libs/hwui/AnimationContext.h index 71ee8602a29f..74d5e79c0b77 100644 --- a/libs/hwui/AnimationContext.h +++ b/libs/hwui/AnimationContext.h @@ -43,6 +43,7 @@ class RenderNode; */ class AnimationHandle { PREVENT_COPY_AND_ASSIGN(AnimationHandle); + public: AnimationContext& context() { return mContext; } @@ -74,14 +75,14 @@ private: class AnimationContext { PREVENT_COPY_AND_ASSIGN(AnimationContext); + public: ANDROID_API explicit AnimationContext(renderthread::TimeLord& clock); ANDROID_API virtual ~AnimationContext(); nsecs_t frameTimeMs() { return mFrameTimeMs; } bool hasAnimations() { - return mCurrentFrameAnimations.mNextHandle - || mNextFrameAnimations.mNextHandle; + return mCurrentFrameAnimations.mNextHandle || mNextFrameAnimations.mNextHandle; } // Will always add to the next frame list, which is swapped when @@ -96,7 +97,8 @@ public: // as part of the standard RenderNode:prepareTree pass. ANDROID_API virtual void runRemainingAnimations(TreeInfo& info); - ANDROID_API virtual void callOnFinished(BaseRenderNodeAnimator* animator, AnimationListener* listener); + ANDROID_API virtual void callOnFinished(BaseRenderNodeAnimator* animator, + AnimationListener* listener); ANDROID_API virtual void destroy(); |