Merge working on Nexus S

mobile/android/base/gfx/LayerView.java

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

widget/android/AndroidBridge.cpp

@@ -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

widget/android/AndroidJavaWrappers.cpp

@@ -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
 }