Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: widget/android/AndroidBridge.cpp

Issue 29334661: Issue 3406 - [Adblock Browser for Android] Crash after updating to Android 6.0.1 (Closed)
Patch Set: Created Jan. 27, 2016, 10:19 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | xpcom/threads/ThreadStackHelper.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: widget/android/AndroidBridge.cpp
diff --git a/widget/android/AndroidBridge.cpp b/widget/android/AndroidBridge.cpp
index a1dd7089e66a967bd09d62eb1e7f805cfeee87e6..9773a07ea56153f0bd837eba975197f532062f03 100644
--- 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));
}
« no previous file with comments | « no previous file | xpcom/threads/ThreadStackHelper.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld