Backed out changeset 52573727971b (bug 1449567) for braking android build bustages on a CLOSED TREE
authorAndreea Pavel <apavel@mozilla.com>
Sun, 16 Sep 2018 07:29:22 +0300
changeset 492350 300d0f16cf6f770200d2e57b1f7bed48f434ab65
parent 492349 52573727971b04056f78c20e6873215c2345bbba
child 492360 7ed950e60f3c1f8a47c117c04124d31e94a66e32
child 492361 431d82d82470c8fba33c338faa1eb84acb11a9a6
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1449567
milestone64.0a1
backs out52573727971b04056f78c20e6873215c2345bbba
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
widget/android/nsWindow.cpp
--- a/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/gecko/gfx/LayerSession.java
@@ -71,17 +71,17 @@ public class LayerSession {
             // Clear out any pending calls on the UI thread.
             LayerSession.this.onCompositorDetached();
             disposeNative();
         }
 
         @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")
         public native void onBoundsChanged(int left, int top, int width, int height);
 
         // Gecko thread pauses compositor; blocks UI thread.
         @WrapForJNI(calledFrom = "ui", dispatchTo = "current")
         public native void syncPauseCompositor();
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -1234,26 +1234,23 @@ nsWindow::GeckoViewSupport::Transfer(con
                                      jni::Object::Param aDispatcher,
                                      jni::Object::Param aInitData)
 {
     if (window.mNPZCSupport) {
         MOZ_ASSERT(window.mLayerViewSupport);
         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(
             java::EventDispatcher::Ref::From(aDispatcher), mDOMWindow);
 
     if (mIsReady) {
         // We're in a transfer; update init-data and notify JS code.
         window.mAndroidView->mInitData =