From cd028f336e36b22dbe8cf623eb5bd2361314495c Mon Sep 17 00:00:00 2001 From: John Reck Date: Tue, 24 Jun 2014 08:44:29 -0700 Subject: Fix contants; RT-enable WebView pt2 Bug: 15838537 * Fix kSync_UIRedrawRequired constant value (woops) * Tell CanvasContext that WebView is now rt-safe Change-Id: Idf15cf21115c2ca24b8ccd00025e8502864cd87c --- libs/hwui/renderthread/CanvasContext.cpp | 4 +--- libs/hwui/renderthread/DrawFrameTask.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'libs/hwui') diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index fe4edf839c06..281a8e151a75 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -148,9 +148,7 @@ void CanvasContext::prepareTree(TreeInfo& info) { info.out.canDrawThisFrame = !runningBehind; if (info.out.hasAnimations || !info.out.canDrawThisFrame) { - if (info.out.hasFunctors) { - info.out.requiresUiRedraw = true; - } else if (!info.out.requiresUiRedraw) { + if (!info.out.requiresUiRedraw) { // If animationsNeedsRedraw is set don't bother posting for an RT anim // as we will just end up fighting the UI thread. mRenderThread.postFrameCallback(this); diff --git a/libs/hwui/renderthread/DrawFrameTask.h b/libs/hwui/renderthread/DrawFrameTask.h index 96f0add4c08c..243cc5d1e3cc 100644 --- a/libs/hwui/renderthread/DrawFrameTask.h +++ b/libs/hwui/renderthread/DrawFrameTask.h @@ -41,7 +41,7 @@ class RenderThread; enum SyncResult { kSync_OK = 0, - kSync_UIRedrawRequired = 1 << 1, + kSync_UIRedrawRequired = 1 << 0, }; /* -- cgit v1.2.3-59-g8ed1b