Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge working on Nexus S

Browse Source
This commit is contained in:
Benoit Girard 2012-02-08 20:23:27 -05:00
parent 45f236563b
commit 08dc021a3b
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mobile/android/base/gfx/LayerView.java
View File

@ -92,6 +92,7 @@ public class LayerView extends FlexibleGLSurfaceView {
setFocusable(true);
setFocusableInTouchMode(true);
createGLThread();
}
private void addToEventQueue(MotionEvent event) {

3
widget/android/AndroidBridge.cpp
View File

@ -1077,10 +1077,13 @@ AndroidBridge::RegisterCompositor()
jmethodID registerCompositor = env->GetStaticMethodID(jFlexSurfaceView, "registerCxxCompositor", "()Lorg/mozilla/gecko/gfx/GLController;");
__android_log_print(ANDROID_LOG_ERROR, "Gecko", "### registerCxxCompositor()");
jobject glController = env->CallStaticObjectMethod(jFlexSurfaceView, registerCompositor);
__android_log_print(ANDROID_LOG_ERROR, "Gecko", "### Acquire()");
sController.Acquire(env, glController);
sController.SetGLVersion(2);
__android_log_print(ANDROID_LOG_ERROR, "Gecko", "Registered Compositor");
}
EGLSurface

1
widget/android/AndroidJavaWrappers.cpp
View File

@ -364,7 +364,6 @@ AndroidGeckoSoftwareLayerClient::InitGeckoSoftwareLayerClientClass(JNIEnv *jEnv)
jUnlockBufferMethod = getMethod("unlockBuffer", "()V");
jBeginDrawingMethod = getMethod("beginDrawing", "(IIIILjava/lang/String;Z)Z");
jEndDrawingMethod = getMethod("endDrawing", "(IIII)V");
jGetRenderOffsetMethod = getMethod("getRenderOffset", "()Landroid/graphics/Point;");
#endif
}