Merge fixes

config/android-common.mk

@@ -71,5 +71,4 @@ JAVAC_FLAGS = \
   -bootclasspath $(JAVA_BOOTCLASSPATH) \
   -encoding UTF8 \
   -g \
-  -Werror \
   $(NULL)

gfx/layers/ipc/CompositorParent.cpp

@@ -164,7 +164,6 @@ CompositorParent::DeallocPLayers(PLayersParent* actor)
   return true;
 }
 
-<<<<<<< local
 #ifdef MOZ_WIDGET_ANDROID
 void
 CompositorParent::RegisterCompositorWithJava()
@@ -173,9 +172,6 @@ CompositorParent::RegisterCompositorWithJava()
 }
 #endif
 
-
-=======
->>>>>>> other
 } // namespace layers
 } // namespace mozilla
 

mobile/android/base/AboutHomeContent.java

@@ -468,7 +468,7 @@ public class AboutHomeContent extends ScrollView {
         // If gecko is ready, the session restore initialization has already occurred.
         // This means sessionstore.js has been moved to sessionstore.bak. Otherwise, the
         // previous session will still be in sessionstore.js.
-        final String sessionFilename = "sessionstore." + (GeckoApp.mAppContext.sIsGeckoReady ? "bak" : "js");
+        final String sessionFilename = "sessionstore." + (GeckoApp.sIsGeckoReady ? "bak" : "js");
         final JSONArray tabs;
         String jsonString = readJSONFile(activity, sessionFilename);
         if (jsonString == null)

mobile/android/base/gfx/AbstractLayerView.java

@@ -56,5 +56,7 @@ public interface AbstractLayerView {
     public boolean postDelayed(Runnable action, long delayMillis);
     public Context getContext();
     public int getMaxTextureSize();
+    public void clearEventQueue();
+    public void processEventQueue();
 }
 

mobile/android/base/gfx/LayerView.java

@@ -69,7 +69,7 @@ import org.json.JSONObject;
  * mediator between the LayerRenderer and the LayerController.
  */
 public class LayerView extends GLSurfaceView
-    implements AbstractLayerView {
+    implements AbstractLayerView, GeckoEventListener {
     private Context mContext;
     private LayerController mController;
     private InputConnectionHandler mInputConnectionHandler;
@@ -170,9 +170,9 @@ public class LayerView extends GLSurfaceView
     }
 
     public GeckoInputConnection setInputConnectionHandler() {
-        mInputConnectionHandler = GeckoInputConnection.create(this);
-        setInputConnectionHandler(mInputConnectionHandler);
-        return mInputConnectionHandler;
+        GeckoInputConnection geckoInputConnection = GeckoInputConnection.create(this);
+        mInputConnectionHandler = geckoInputConnection;
+        return geckoInputConnection;
     }
 
     @Override

mobile/android/base/gfx/MultiTileLayer.java

@@ -380,7 +380,7 @@ public class MultiTileLayer extends Layer {
     }
 
     @Override
-    public void beginTransaction(LayerView aView) {
+    public void beginTransaction(AbstractLayerView aView) {
         super.beginTransaction(aView);
 
         for (SubTile layer : mTiles) {

mobile/android/base/gfx/layers/OGLSurfaceView.java

@@ -43,6 +43,7 @@ import android.view.SurfaceView;
 import android.util.Log;
 import android.view.View;
 
+import org.mozilla.gecko.GeckoApp;
 import org.mozilla.gecko.gfx.*;
 import org.mozilla.gecko.GeckoInputConnection;
 
@@ -132,6 +133,8 @@ public class OGLSurfaceView implements AbstractLayerView {
     public boolean postDelayed(Runnable action, long delayMillis) { return false; }
     public Context getContext() { return mContext; }
     public int getMaxTextureSize() { return 1024; }
+    public void clearEventQueue() {}
+    public void processEventQueue() {}
 
     private class InternalSurfaceView extends SurfaceView {
         public InternalSurfaceView() {

widget/android/AndroidBridge.cpp

@@ -975,7 +975,11 @@ void *
 AndroidBridge::CallEglCreateWindowSurface(void *dpy, void *config, AndroidGeckoSurfaceView &sview)
 {
     ALOG_BRIDGE("AndroidBridge::CallEglCreateWindowSurface");
-    AutoLocalJNIFrame jniFrame(GetJNIForThread());
+
+    // Called off the main thread by the compositor
+    JNIEnv *env = GetJNIForThread();
+    if (!env)
+        return NULL;
 
     /*
      * This is basically: