Bug 1376822 - Re-enable appmenu reflow tests for sync subview. r=Gijs

MozReview-Commit-ID: B95VVqaTDja

--HG--
extra : rebase_source : 484b78d839e16650167c7dc9937d7f2ec908b8e3

browser/base/content/test/performance/browser_appmenu_reflows.js

@@ -83,23 +83,17 @@ const EXPECTED_APPMENU_SUBVIEW_REFLOWS = [
    *
    * If we add more views where this is necessary, we may need to duplicate
    * these expected reflows further.
-   *
-   * Because the test dirties the frame tree by manipulating margins,
-   * getBoundingClientRect() in the descriptionHeightWorkaround code
-   * seems to sometimes fire multiple times. Bug 1363361 will change how the
-   * test dirties the frametree, after which this (2 hits in that method)
-   * should become deterministic and we can re-enable the subview testing
-   * for the remotetabs subview (this is bug 1376822). In the meantime,
-   * that subview only is excluded from this test.
-  [
-    "descriptionHeightWorkaround@resource:///modules/PanelMultiView.jsm",
-    "onTransitionEnd@resource:///modules/PanelMultiView.jsm",
-  ],
-  [
-    "descriptionHeightWorkaround@resource:///modules/PanelMultiView.jsm",
-    "onTransitionEnd@resource:///modules/PanelMultiView.jsm",
-  ],
    */
+  [
+    "descriptionHeightWorkaround@resource:///modules/PanelMultiView.jsm",
+    "onTransitionEnd@resource:///modules/PanelMultiView.jsm",
+  ],
+
+  [
+    "descriptionHeightWorkaround@resource:///modules/PanelMultiView.jsm",
+    "onTransitionEnd@resource:///modules/PanelMultiView.jsm",
+  ],
+
   /**
    * Please don't add anything new!
    */
@@ -135,16 +129,15 @@ add_task(async function() {
       }
 
       for (let button of navButtons) {
-        // We skip the remote tabs subview, see the comments above
-        // in EXPECTED_APPMENU_SUBVIEW_REFLOWS. bug 1376822 tracks
-        // re-enabling this.
-        if (button.id == "appMenu-library-remotetabs-button") {
-          info("Skipping " + button.id);
-          continue;
-        }
         info("Click " + button.id);
         button.click();
         await BrowserTestUtils.waitForEvent(PanelUI.panel, "ViewShown");
+
+        // Workaround until bug 1363756 is fixed, then this can be removed.
+        await BrowserTestUtils.waitForCondition(() => {
+          return !PanelUI.multiView.instance._viewContainer.hasAttribute("width");
+        });
+
         info("Shown " + PanelUI.multiView.instance._currentSubView.id);
         // Unfortunately, I can't find a better accessor to the current
         // subview, so I have to reach the PanelMultiView instance
@@ -152,6 +145,11 @@ add_task(async function() {
         await openSubViewsRecursively(PanelUI.multiView.instance._currentSubView);
         PanelUI.multiView.goBack();
         await BrowserTestUtils.waitForEvent(PanelUI.panel, "ViewShown");
+
+        // Workaround until bug 1363756 is fixed, then this can be removed.
+        await BrowserTestUtils.waitForCondition(() => {
+          return !PanelUI.multiView.instance._viewContainer.hasAttribute("width");
+        });
       }
     }