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
diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java
index 5c67da9..bfab654 100644
--- a/core/java/android/view/ThreadedRenderer.java
+++ b/core/java/android/view/ThreadedRenderer.java
@@ -64,9 +64,9 @@
// Keep in sync with DrawFrameTask.h SYNC_* flags
// Nothing interesting to report
- private static final int SYNC_OK = 0x0;
+ private static final int SYNC_OK = 0;
// Needs a ViewRoot invalidate
- private static final int SYNC_INVALIDATE_REQUIRED = 0x1;
+ private static final int SYNC_INVALIDATE_REQUIRED = 1 << 0;
private static final String[] VISUALIZERS = {
PROFILE_PROPERTY_VISUALIZE_BARS,
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 @@
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 @@
enum SyncResult {
kSync_OK = 0,
- kSync_UIRedrawRequired = 1 << 1,
+ kSync_UIRedrawRequired = 1 << 0,
};
/*