Bug 844275 - Drive the layer manager creation from the GLController rather than GetLayerManager. r=Cwiiis

This commit is contained in:
Kartikaya Gupta
2013-02-28 13:28:23 -05:00
parent dc5153f1d7
commit ef9f26fb84
9 changed files with 121 additions and 74 deletions

View File

@@ -26,7 +26,6 @@ void AndroidEGLObject::Init(JNIEnv* aJEnv) {
jEGLSurfacePointerField = aJEnv->GetFieldID(jClass, "mEGLSurface", "I");
}
jmethodID AndroidGLController::jWaitForValidSurfaceMethod = 0;
jmethodID AndroidGLController::jProvideEGLSurfaceMethod = 0;
void
@@ -36,7 +35,6 @@ AndroidGLController::Init(JNIEnv* aJEnv)
jProvideEGLSurfaceMethod = aJEnv->GetMethodID(jClass, "provideEGLSurface",
"()Ljavax/microedition/khronos/egl/EGLSurface;");
jWaitForValidSurfaceMethod = aJEnv->GetMethodID(jClass, "waitForValidSurface", "()V");
}
void
@@ -62,11 +60,3 @@ AndroidGLController::ProvideEGLSurface()
return reinterpret_cast<EGLSurface>(mJEnv->GetIntField(jObj, jEGLSurfacePointerField));
}
void
AndroidGLController::WaitForValidSurface()
{
ASSERT_THREAD();
AutoLocalJNIFrame jniFrame(mJEnv, 0);
mJEnv->CallVoidMethod(mJObj, jWaitForValidSurfaceMethod);
}