Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 785597 - Get rid of unused mGLVersion field. r=snorp

Browse Source
This commit is contained in:
Kartikaya Gupta 2012-12-21 11:33:09 -05:00
parent f1ed178242
commit df745970bc
4 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mobile/android/base/gfx/GLController.java
View File

@ -16,7 +16,6 @@ public class GLController {
private static final String LOGTAG = "GeckoGLController";
private LayerView mView;
private int mGLVersion;
private boolean mSurfaceValid;
private int mWidth, mHeight;
@ -37,15 +36,9 @@ public class GLController {
GLController(LayerView view) {
mView = view;
mGLVersion = 2;
mSurfaceValid = false;
}
/* This function is invoked by JNI */
void setGLVersion(int version) {
mGLVersion = version;
}
/* This function is invoked by JNI */
void resumeCompositorIfValid() {
synchronized (this) {

1
widget/android/AndroidBridge.cpp
View File

@ -1198,7 +1198,6 @@ AndroidBridge::RegisterCompositor(JNIEnv *env, bool resetting)
sController.Reacquire(env, glController);
} else {
sController.Acquire(env, glController);
sController.SetGLVersion(2);
}
}

10
widget/android/AndroidLayerViewWrapper.cpp
View File

@ -21,7 +21,6 @@ void AndroidEGLObject::Init(JNIEnv* aJEnv) {
jEGLSurfacePointerField = aJEnv->GetFieldID(jClass, "mEGLSurface", "I");
}
jmethodID AndroidGLController::jSetGLVersionMethod = 0;
jmethodID AndroidGLController::jWaitForValidSurfaceMethod = 0;
jmethodID AndroidGLController::jProvideEGLSurfaceMethod = 0;
jmethodID AndroidGLController::jResumeCompositorIfValidMethod = 0;
@ -31,7 +30,6 @@ AndroidGLController::Init(JNIEnv* aJEnv)
{
jclass jClass = reinterpret_cast<jclass>(aJEnv->NewGlobalRef(aJEnv->FindClass("org/mozilla/gecko/gfx/GLController")));
jSetGLVersionMethod = aJEnv->GetMethodID(jClass, "setGLVersion", "(I)V");
jProvideEGLSurfaceMethod = aJEnv->GetMethodID(jClass, "provideEGLSurface",
"()Ljavax/microedition/khronos/egl/EGLSurface;");
jResumeCompositorIfValidMethod = aJEnv->GetMethodID(jClass, "resumeCompositorIfValid", "()V");
@ -46,14 +44,6 @@ AndroidGLController::Acquire(JNIEnv* aJEnv, jobject aJObj)
mJObj = aJEnv->NewGlobalRef(aJObj);
}
void
AndroidGLController::SetGLVersion(int aVersion)
{
ASSERT_THREAD();
AutoLocalJNIFrame jniFrame(mJEnv, 0);
mJEnv->CallVoidMethod(mJObj, jSetGLVersionMethod, aVersion);
}
void
AndroidGLController::Reacquire(JNIEnv *aJEnv, jobject aJObj)
{

2
widget/android/AndroidLayerViewWrapper.h
View File

@ -21,13 +21,11 @@ public:
static void Init(JNIEnv* aJEnv);
void Acquire(JNIEnv* aJEnv, jobject aJObj);
void SetGLVersion(int aVersion);
void Reacquire(JNIEnv* aJEnv, jobject aJObj);
EGLSurface ProvideEGLSurface();
void WaitForValidSurface();
private:
static jmethodID jSetGLVersionMethod;
static jmethodID jWaitForValidSurfaceMethod;
static jmethodID jProvideEGLSurfaceMethod;
static jmethodID jResumeCompositorIfValidMethod;