Bug 1358215 - Add a flag to permit early landing of photon animation changes ahead of 57. r?jaws draft
authorSam Foster <sfoster@mozilla.com>
Mon, 24 Apr 2017 15:19:11 -0700
changeset 568356 5a9ace93b7ccaa3186a45c3eedaa7da2edf56332
parent 563802 a374c35469935a874fefe64d3e07003fc5bc8884
child 625899 ed2efb01e80d735698bd052ba9f9b9bc48c06916
push id55842
push userbmo:sfoster@mozilla.com
push dateWed, 26 Apr 2017 02:18:48 +0000
reviewersjaws
bugs1358215
milestone55.0a1
Bug 1358215 - Add a flag to permit early landing of photon animation changes ahead of 57. r?jaws * Note: I'm not clear if the moz.configure changes are really necessary, correct or in the right place. The end-goal here is to be able to ifdef MOZ_PHOTON_ANIMATIONS in css/xul/js etc. and include code there only in nightly builds when the flag hasn't been explicitly set false MozReview-Commit-ID: 9bwQrfdclPn
browser/base/moz.build
browser/moz.configure
--- a/browser/base/moz.build
+++ b/browser/base/moz.build
@@ -38,16 +38,20 @@ BROWSER_CHROME_MANIFESTS += [
 ]
 
 if CONFIG['MOZ_UPDATER']:
     BROWSER_CHROME_MANIFESTS += ['content/test/appUpdate/browser.ini']
 
 DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']
 
+# photon animations: Nightly-only and unless explicitly disabled
+if (CONFIG['NIGHTLY_BUILD'] and not (CONFIG['MOZ_PHOTON_ANIMATIONS'] is 0)) :
+    DEFINES['MOZ_PHOTON_ANIMATIONS'] = 1
+
 DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'cocoa'):
     DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'cocoa'):
     DEFINES['CAN_DRAW_IN_TITLEBAR'] = 1
 
--- a/browser/moz.configure
+++ b/browser/moz.configure
@@ -4,9 +4,11 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 imply_option('MOZ_PLACES', True)
 imply_option('MOZ_SERVICES_HEALTHREPORT', True)
 imply_option('MOZ_SERVICES_SYNC', True)
 imply_option('MOZ_SERVICES_CLOUDSYNC', True)
 
+set_define('MOZ_PHOTON_ANIMATIONS', False)
+
 include('../toolkit/moz.configure')