diff options
| author | Mike Reed <reed@google.com> | 2017-05-01 10:03:58 -0400 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2017-05-01 10:22:44 -0400 |
| commit | 287a1310acc608ee2983cc2734616a28e4d113d6 (patch) | |
| tree | 7d3b872bcd6bd5b93542df65281b5b7cedfbad3f | |
| parent | 926d4a4d49838e0924da4a3dac6e504a7b451103 (diff) | |
remove unused private field
Test: CtsGraphicsTests
Change-Id: I611f5dc127636f67dc219ef15adc0a591a72a95e
| -rw-r--r-- | core/jni/com_google_android_gles_jni_EGLImpl.cpp | 10 | ||||
| -rw-r--r-- | opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java | 3 |
2 files changed, 0 insertions, 13 deletions
diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp index d0ce1927b108..c00d698770b3 100644 --- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp +++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp @@ -45,7 +45,6 @@ static jmethodID gConfig_ctorID; static jfieldID gDisplay_EGLDisplayFieldID; static jfieldID gContext_EGLContextFieldID; static jfieldID gSurface_EGLSurfaceFieldID; -static jfieldID gSurface_NativePixelRefFieldID; static jfieldID gConfig_EGLConfigFieldID; static inline EGLDisplay getDisplay(JNIEnv* env, jobject o) { @@ -84,7 +83,6 @@ static void nativeClassInit(JNIEnv *_env, jclass eglImplClass) jclass surface_class = _env->FindClass("com/google/android/gles_jni/EGLSurfaceImpl"); gSurface_EGLSurfaceFieldID = _env->GetFieldID(surface_class, "mEGLSurface", "J"); - gSurface_NativePixelRefFieldID = _env->GetFieldID(surface_class, "mNativePixelRef", "J"); } static const jint gNull_attrib_base[] = {EGL_NONE}; @@ -398,14 +396,6 @@ static jboolean jni_eglDestroySurface(JNIEnv *_env, jobject _this, jobject displ } EGLDisplay dpy = getDisplay(_env, display); EGLSurface sur = getSurface(_env, surface); - - if (sur) { - SkPixelRef* ref = (SkPixelRef*)(_env->GetLongField(surface, - gSurface_NativePixelRefFieldID)); - if (ref) { - SkSafeUnref(ref); - } - } return EglBoolToJBool(eglDestroySurface(dpy, sur)); } diff --git a/opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java b/opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java index 7a3ed24f8811..21c350be7c39 100644 --- a/opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java +++ b/opengl/java/com/google/android/gles_jni/EGLSurfaceImpl.java @@ -20,14 +20,11 @@ import javax.microedition.khronos.egl.*; public class EGLSurfaceImpl extends EGLSurface { long mEGLSurface; - private long mNativePixelRef; public EGLSurfaceImpl() { mEGLSurface = 0; - mNativePixelRef = 0; } public EGLSurfaceImpl(long surface) { mEGLSurface = surface; - mNativePixelRef = 0; } @Override |