Bug 1337432 - browser_new_content_window_chromeflags.js should test the new CHROME_SUPPRESS_ANIMATION flag. r?jaws draft
authorMike Conley <mconley@mozilla.com>
Tue, 07 Feb 2017 12:00:31 -0500
changeset 479982 35da270179fc16dac372cf6c741c2a9887f9a2f5
parent 479917 6d27535f4fe912068e0a0ac5854f7f39e94964a5
child 544841 b996482fa12998cfa44666adb1460df19fbf1a33
push id44421
push usermconley@mozilla.com
push dateTue, 07 Feb 2017 17:03:15 +0000
reviewersjaws
bugs1337432, 1336230
milestone54.0a1
Bug 1337432 - browser_new_content_window_chromeflags.js should test the new CHROME_SUPPRESS_ANIMATION flag. r?jaws Before bug 1336230 landed, we were successfully testing the CHROME_MAC_SUPPRESS_ANIMATION flag. Then we renamed the flag to CHROME_SUPPRESS_ANIMATION, but didn't update the test. The test continued to pass though, since we ended up doing bitwise AND on undefined, which produced the 0 value that the test expected. This patch makes sure that the flag is non-zero-ish before doing the bitwise operation. It also updates the flag to be CHROME_SUPPRESS_ANIMATION. MozReview-Commit-ID: 2ztJ7oqlQMe
toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js
--- a/toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js
+++ b/toolkit/components/windowwatcher/test/browser_new_content_window_chromeflags.js
@@ -84,17 +84,17 @@ const DISALLOWED = {
     flag: Ci.nsIWebBrowserChrome.CHROME_WINDOW_LOWERED, // Renamed to alwaysLowered
     defaults_to: false,
   },
   "alwaysRaised": {
     flag: Ci.nsIWebBrowserChrome.CHROME_WINDOW_RAISED,
     defaults_to: false,
   },
   "suppressanimation": {
-    flag: Ci.nsIWebBrowserChrome.CHROME_MAC_SUPPRESS_ANIMATION,
+    flag: Ci.nsIWebBrowserChrome.CHROME_SUPPRESS_ANIMATION,
     defaults_to: false,
   },
   "extrachrome": {
     flag: Ci.nsIWebBrowserChrome.CHROME_EXTRA,
     defaults_to: false,
   },
   "centerscreen": {
     flag: Ci.nsIWebBrowserChrome.CHROME_CENTER_SCREEN,
@@ -187,16 +187,17 @@ function assertContentFlags(chromeFlags)
       // have been able to flip it on.
       Assert.ok((chromeFlags & flag),
                 `Expected feature ${feature} to be enabled`);
     }
   }
 
   for (let feature in DISALLOWED) {
     let flag = DISALLOWED[feature].flag;
+    Assert.ok(flag, "Expected flag to be a non-zeroish value");
     if (DISALLOWED[feature].defaults_to) {
       // The feature is supposed to default to true, so it should
       // stay true.
       Assert.ok((chromeFlags & flag),
                 `Expected feature ${feature} to be unchanged`);
     } else {
       // The feature is supposed to default to false, so it should
       // stay false.