Add init code for AndroidEGLObjects
authorBenoit Girard <b56girard@gmail.com>
Wed, 01 Feb 2012 18:08:09 -0500
changeset 89054 63a79df01001407f54fffb4851d4d93f5635b80c
parent 89053 dec6aaba6015a76341a0f704ee982bd20c8abbd3
child 89055 7badecd0693f76844bc66d6206eabbc5dad8ab68
push id22242
push userkgupta@mozilla.com
push dateWed, 14 Mar 2012 15:19:09 +0000
treeherdermozilla-central@936ef50fa498 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone12.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Add init code for AndroidEGLObjects
widget/android/AndroidBridge.cpp
--- a/widget/android/AndroidBridge.cpp
+++ b/widget/android/AndroidBridge.cpp
@@ -172,16 +172,20 @@ AndroidBridge::Init(JNIEnv *jEnv,
     jEGLSurfaceImplClass = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("com/google/android/gles_jni/EGLSurfaceImpl"));
     jEGLContextImplClass = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("com/google/android/gles_jni/EGLContextImpl"));
     jEGLConfigImplClass = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("com/google/android/gles_jni/EGLConfigImpl"));
     jEGLDisplayImplClass = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("com/google/android/gles_jni/EGLDisplayImpl"));
 
     jFlexSurfaceView = (jclass) jEnv->NewGlobalRef(jEnv->FindClass("org/mozilla/gecko/gfx/FlexibleGLSurfaceView"));
 
     AndroidGLController::Init(jEnv);
+    AndroidEGLObject<AndroidEGLDisplayInfo>::Init(jEnv);
+    AndroidEGLObject<AndroidEGLConfigInfo>::Init(jEnv);
+    AndroidEGLObject<AndroidEGLContextInfo>::Init(jEnv);
+    AndroidEGLObject<AndroidEGLSurfaceInfo>::Init(jEnv);
     InitAndroidJavaWrappers(jEnv);
 
     // jEnv should NOT be cached here by anything -- the jEnv here
     // is not valid for the real gecko main thread, which is set
     // at SetMainThread time.
 
     return true;
 }