diff options
| author | Romain Guy <romainguy@google.com> | 2013-06-17 20:39:45 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-06-17 20:39:45 +0000 |
| commit | fb5c9050978afad2c1df570a13a6747f438c27f7 (patch) | |
| tree | 5ad303b8842436dccb104e46d19aea14d5617cfb /core/jni | |
| parent | 61e1ca68fa82e5228b5bfcdad8deecd9383fb183 (diff) | |
| parent | e93482f5eac3df581d57e64c2a771a96aa868585 (diff) | |
| download | frameworks_base-fb5c9050978afad2c1df570a13a6747f438c27f7.zip frameworks_base-fb5c9050978afad2c1df570a13a6747f438c27f7.tar.gz frameworks_base-fb5c9050978afad2c1df570a13a6747f438c27f7.tar.bz2 | |
Merge "Cancel layer update when a layer is about to be destroyed Bug #9310706"
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index f3592a3..a2f7dbe 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -911,6 +911,11 @@ static void android_view_GLES20Canvas_pushLayerUpdate(JNIEnv* env, jobject clazz renderer->pushLayerUpdate(layer); } +static void android_view_GLES20Canvas_cancelLayerUpdate(JNIEnv* env, jobject clazz, + OpenGLRenderer* renderer, Layer* layer) { + renderer->cancelLayerUpdate(layer); +} + static void android_view_GLES20Canvas_clearLayerUpdates(JNIEnv* env, jobject clazz, OpenGLRenderer* renderer) { renderer->clearLayerUpdates(); @@ -1095,6 +1100,7 @@ static JNINativeMethod gMethods[] = { { "nClearLayerUpdates", "(I)V", (void*) android_view_GLES20Canvas_clearLayerUpdates }, { "nFlushLayerUpdates", "(I)V", (void*) android_view_GLES20Canvas_flushLayerUpdates }, { "nPushLayerUpdate", "(II)V", (void*) android_view_GLES20Canvas_pushLayerUpdate }, + { "nCancelLayerUpdate", "(II)V", (void*) android_view_GLES20Canvas_cancelLayerUpdate }, { "nSetTextureLayerTransform", "(II)V", (void*) android_view_GLES20Canvas_setTextureLayerTransform }, |