Bug 1172567 - Use GetLongField rather than GetIntField for jEGLSurfacePointerField when the API version is >= 20. r=snorp

2015-07-10 10:11:20 -05:00
parent afa36a2c32
commit 49870b624a
1 changed files with 2 additions and 1 deletions
--- a/widget/android/AndroidBridge.cpp
+++ b/widget/android/AndroidBridge.cpp
@@ -740,7 +740,8 @@ AndroidBridge::CreateEGLSurfaceForCompositor()
    }

    JNIEnv* const env = GetJNIForThread(); // called on the compositor thread
-    return reinterpret_cast<EGLSurface>(
+    return reinterpret_cast<EGLSurface>(mAPIVersion >= 20 ?
+            env->GetLongField(eglSurface.Get(), jEGLSurfacePointerField) :
            env->GetIntField(eglSurface.Get(), jEGLSurfacePointerField));
 }