diff options
| -rw-r--r-- | core/java/android/view/GLES20Canvas.java | 11 | ||||
| -rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 15 | ||||
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 4 |
3 files changed, 4 insertions, 26 deletions
diff --git a/core/java/android/view/GLES20Canvas.java b/core/java/android/view/GLES20Canvas.java index c274fc418001..f0d8a6167a1e 100644 --- a/core/java/android/view/GLES20Canvas.java +++ b/core/java/android/view/GLES20Canvas.java @@ -378,17 +378,6 @@ class GLES20Canvas extends HardwareCanvas { private static native void nDrawLayer(long renderer, long layer, float x, float y); - void interrupt() { - nInterrupt(mRenderer); - } - - void resume() { - nResume(mRenderer); - } - - private static native void nInterrupt(long renderer); - private static native void nResume(long renderer); - /////////////////////////////////////////////////////////////////////////// // Support /////////////////////////////////////////////////////////////////////////// diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index e72aff95871a..85490043908e 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -893,18 +893,6 @@ static jint android_view_GLES20Canvas_drawDisplayList(JNIEnv* env, // Layers // ---------------------------------------------------------------------------- -static void android_view_GLES20Canvas_interrupt(JNIEnv* env, jobject clazz, - jlong rendererPtr) { - OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr); - renderer->interrupt(); -} - -static void android_view_GLES20Canvas_resume(JNIEnv* env, jobject clazz, - jlong rendererPtr) { - OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr); - renderer->resume(); -} - static void android_view_GLES20Canvas_drawLayer(JNIEnv* env, jobject clazz, jlong rendererPtr, jlong layerPtr, jfloat x, jfloat y) { OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr); @@ -1093,9 +1081,6 @@ static JNINativeMethod gMethods[] = { { "nCreateDisplayListRenderer", "()J", (void*) android_view_GLES20Canvas_createDisplayListRenderer }, - { "nInterrupt", "(J)V", (void*) android_view_GLES20Canvas_interrupt }, - { "nResume", "(J)V", (void*) android_view_GLES20Canvas_resume }, - { "nDrawLayer", "(JJFF)V", (void*) android_view_GLES20Canvas_drawLayer }, { "nCopyLayer", "(JJ)Z", (void*) android_view_GLES20Canvas_copyLayer }, { "nClearLayerUpdates", "(J)V", (void*) android_view_GLES20Canvas_clearLayerUpdates }, diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index 16baf7714bf5..4ed73c3f20b5 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -445,6 +445,10 @@ void CanvasContext::invokeFunctor(Functor* functor) { DrawGlInfo dummyInfo; memset(&dummyInfo, 0, sizeof(DrawGlInfo)); (*functor)(mode, &dummyInfo); + + if (mCanvas) { + mCanvas->resume(); + } } bool CanvasContext::copyLayerInto(DeferredLayerUpdater* layer, SkBitmap* bitmap) { |