Backed out changeset 52573727971b (bug 1449567) for braking android build bustages on a CLOSED TREE

mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java

@@ -76,7 +76,7 @@ public class LayerSession {
         @WrapForJNI(calledFrom = "ui", dispatchTo = "gecko")
         @Override protected native void disposeNative();
 
-        @WrapForJNI(calledFrom = "ui", dispatchTo = "gecko")
+        @WrapForJNI(calledFrom = "any", dispatchTo = "gecko")
         public native void attachNPZC(PanZoomController npzc);
 
         @WrapForJNI(calledFrom = "ui", dispatchTo = "gecko")

widget/android/nsWindow.cpp

@@ -1239,16 +1239,13 @@ nsWindow::GeckoViewSupport::Transfer(const GeckoSession::Window::LocalRef& inst,
         window.mNPZCSupport.Detach();
     }
 
-    if (window.mLayerViewSupport &&
-            window.mLayerViewSupport->GetJavaCompositor() != aCompositor) {
+    if (window.mLayerViewSupport) {
         window.mLayerViewSupport.Detach();
     }
 
     auto compositor = LayerSession::Compositor::LocalRef(
             inst.Env(), LayerSession::Compositor::Ref::From(aCompositor));
-    if (!window.mLayerViewSupport) {
-        window.mLayerViewSupport.Attach(compositor, &window, compositor);
-    }
+    window.mLayerViewSupport.Attach(compositor, &window, compositor);
 
     MOZ_ASSERT(window.mAndroidView);
     window.mAndroidView->mEventDispatcher->Attach(