diff options
| author | John Reck <jreck@google.com> | 2014-06-24 08:44:29 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2014-06-24 08:44:29 -0700 |
| commit | cd028f336e36b22dbe8cf623eb5bd2361314495c (patch) | |
| tree | c878aab479fa4b75af024d9169aae04391569700 /libs | |
| parent | 5444f3cd92ac42f72f86ba5bcd554e0d88bc265b (diff) | |
| download | frameworks_base-cd028f336e36b22dbe8cf623eb5bd2361314495c.zip frameworks_base-cd028f336e36b22dbe8cf623eb5bd2361314495c.tar.gz frameworks_base-cd028f336e36b22dbe8cf623eb5bd2361314495c.tar.bz2 | |
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
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 4 | ||||
| -rw-r--r-- | libs/hwui/renderthread/DrawFrameTask.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index fe4edf8..281a8e1 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 96f0add..243cc5d 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, }; /* |