diff options
| author | John Reck <jreck@google.com> | 2015-05-08 21:19:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-08 21:19:54 +0000 |
| commit | 9aa7b45e796fea9e308fb2fc1fe5363390f1e7ba (patch) | |
| tree | 088ba6cec51a28c992eb8b22fbc1a3bae979f137 /libs/hwui/renderthread | |
| parent | e48f44f55b5cdb9c4c3fa6ae6eae56768c6b12af (diff) | |
| parent | aef9dc8d186bd5f78068ab2d5240b5e9c8ab44b6 (diff) | |
| download | frameworks_base-9aa7b45e796fea9e308fb2fc1fe5363390f1e7ba.zip frameworks_base-9aa7b45e796fea9e308fb2fc1fe5363390f1e7ba.tar.gz frameworks_base-9aa7b45e796fea9e308fb2fc1fe5363390f1e7ba.tar.bz2 | |
Merge "Fix kSkippedFrame setting" into mnc-dev
Diffstat (limited to 'libs/hwui/renderthread')
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 436946f..733e5e0 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -171,6 +171,7 @@ void CanvasContext::prepareTree(TreeInfo& info, int64_t* uiFrameInfo) { } if (CC_UNLIKELY(!mNativeWindow.get())) { + mCurrentFrameInfo->addFlag(FrameInfoFlags::kSkippedFrame); info.out.canDrawThisFrame = false; return; } @@ -183,6 +184,10 @@ void CanvasContext::prepareTree(TreeInfo& info, int64_t* uiFrameInfo) { NATIVE_WINDOW_CONSUMER_RUNNING_BEHIND, &runningBehind); info.out.canDrawThisFrame = !runningBehind; + if (!info.out.canDrawThisFrame) { + mCurrentFrameInfo->addFlag(FrameInfoFlags::kSkippedFrame); + } + if (info.out.hasAnimations || !info.out.canDrawThisFrame) { if (!info.out.requiresUiRedraw) { // If animationsNeedsRedraw is set don't bother posting for an RT anim @@ -284,8 +289,6 @@ void CanvasContext::doFrame() { prepareTree(info, frameInfo); if (info.out.canDrawThisFrame) { draw(); - } else { - mCurrentFrameInfo->addFlag(FrameInfoFlags::kSkippedFrame); } } |