Merge "Allow RT animation of new renderer"

2015-12-16 18:25:35 +00:00
parent 1e2839188f adfeec9456
commit 47a9fb3b5d
1 changed files with 5 additions and 3 deletions
--- a/libs/hwui/renderthread/CanvasContext.cpp
+++ b/libs/hwui/renderthread/CanvasContext.cpp
@@ -513,9 +513,11 @@ void CanvasContext::draw() {

 // Called by choreographer to do an RT-driven animation
 void CanvasContext::doFrame() {
-    if (CC_UNLIKELY(!mCanvas || mEglSurface == EGL_NO_SURFACE)) {
-        return;
-    }
+#if HWUI_NEW_OPS
+    if (CC_UNLIKELY(mEglSurface == EGL_NO_SURFACE)) return;
+#else
+    if (CC_UNLIKELY(!mCanvas || mEglSurface == EGL_NO_SURFACE)) return;
+#endif
    prepareAndDraw(nullptr);
 }