Bug 1358805 - part 2: Allow DynamicToolbarAnimator to query if the UiCompositorController is open in the case it missed the open message r=kats

MozReview-Commit-ID: 8wdMpQh44Zc

gfx/layers/ipc/UiCompositorControllerChild.cpp

@@ -130,6 +130,11 @@ UiCompositorControllerChild::ToolbarAnimatorMessageFromUI(const int32_t& aMessag
     return false;
   }
 
+  if (aMessage == IS_COMPOSITOR_CONTROLLER_OPEN) {
+    RecvToolbarAnimatorMessageFromCompositor(COMPOSITOR_CONTROLLER_OPEN);
+    return true;
+  }
+
   return SendToolbarAnimatorMessageFromUI(aMessage);
 }
 

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

@@ -157,6 +157,11 @@ public class DynamicToolbarAnimator {
             for (PinReason reason : pinFlags) {
               mCompositor.setPinned(true, reason.mValue);
             }
+        } else if ((mCompositor != null) && !mCompositorControllerOpen) {
+            // Ask the UiCompositorControllerChild if it is open since the open message can
+            // sometimes be sent to a different instance of the LayerView such as when
+            // Fennec is being used in custom tabs.
+            mCompositor.sendToolbarAnimatorMessage(LayerView.IS_COMPOSITOR_CONTROLLER_OPEN);
         }
     }