Bug 1385913 - Remove MOZ_PHOTON_ANIMATIONS ifdef. r?gijs draft
authorJared Wein <jwein@mozilla.com>
Mon, 07 Aug 2017 12:37:34 -0400
changeset 642177 d2d017d0679394b61f53ac28a9723710c78b5495
parent 641632 47248637eafa9a38dade8dc3aa6c4736177c8d8d
child 724927 c75ec4c6dcd41b9a902fcd6436d68f27d69fc2c9
push id72672
push userbmo:jaws@mozilla.com
push dateMon, 07 Aug 2017 20:18:40 +0000
reviewersgijs
bugs1385913
milestone57.0a1
Bug 1385913 - Remove MOZ_PHOTON_ANIMATIONS ifdef. r?gijs MozReview-Commit-ID: 40TP43EKPCU
browser/base/content/browser-places.js
browser/base/content/browser.css
browser/base/content/browser.js
browser/base/content/browser.xul
browser/components/customizableui/CustomizeMode.jsm
browser/components/downloads/content/indicator.js
browser/components/downloads/content/indicatorOverlay.xul
browser/components/downloads/jar.mn
browser/extensions/pocket/bootstrap.js
browser/themes/linux/downloads/download-notification-finish.png
browser/themes/linux/downloads/download-notification-start.png
browser/themes/linux/jar.mn
browser/themes/osx/downloads/download-notification-finish.png
browser/themes/osx/downloads/download-notification-finish@2x.png
browser/themes/osx/downloads/download-notification-start.png
browser/themes/osx/downloads/download-notification-start@2x.png
browser/themes/osx/downloads/indicator.css
browser/themes/osx/jar.mn
browser/themes/shared/downloads/indicator.inc.css
browser/themes/shared/jar.inc.mn
browser/themes/shared/toolbarbutton-icons.inc.css
browser/themes/shared/toolbarbuttons.inc.css
browser/themes/shared/urlbar-searchbar.inc.css
browser/themes/windows/downloads/download-notification-finish.png
browser/themes/windows/downloads/download-notification-start.png
browser/themes/windows/jar.mn
toolkit/content/xul.css
toolkit/modules/AppConstants.jsm
toolkit/moz.configure
--- a/browser/base/content/browser-places.js
+++ b/browser/base/content/browser-places.js
@@ -137,17 +137,16 @@ var StarUI = {
               }
               break;
             }
 
             PlacesTransactions.Remove(guidsForRemoval)
                               .transact().catch(Cu.reportError);
           } else if (this._isNewBookmark &&
                      Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled") &&
-                     AppConstants.MOZ_PHOTON_ANIMATIONS &&
                      (libraryButton = document.getElementById("library-button")) &&
                      libraryButton.getAttribute("cui-areatype") != "menu-panel" &&
                      libraryButton.getAttribute("overflowedItem") != "true" &&
                      libraryButton.closest("#nav-bar")) {
             BrowserUtils.setToolbarButtonHeightProperty(libraryButton);
             libraryButton.removeAttribute("fade");
             libraryButton.setAttribute("animate", "bookmark");
             libraryButton.addEventListener("animationend", this);
@@ -1700,33 +1699,30 @@ var BookmarkingUI = {
   },
 
   init() {
     CustomizableUI.addListener(this);
     if (!AppConstants.MOZ_PHOTON_THEME) {
       this._updateCustomizationState();
     }
 
-    if (AppConstants.MOZ_PHOTON_ANIMATIONS &&
-        Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled")) {
+    if (Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled")) {
       let starButtonBox = document.getElementById("star-button-box");
       starButtonBox.setAttribute("animationsenabled", "true");
       this.star.addEventListener("mouseover", this, {once: true});
     }
   },
 
   _hasBookmarksObserver: false,
   _itemGuids: new Set(),
   uninit: function BUI_uninit() {
     this.updateBookmarkPageMenuItem(true);
     CustomizableUI.removeListener(this);
 
-    if (AppConstants.MOZ_PHOTON_ANIMATIONS) {
-      this.star.removeEventListener("mouseover", this);
-    }
+    this.star.removeEventListener("mouseover", this);
 
     this._uninitView();
 
     if (this._hasBookmarksObserver) {
       PlacesUtils.bookmarks.removeObserver(this);
     }
 
     if (this._pendingUpdate) {
@@ -1795,19 +1791,17 @@ var BookmarkingUI = {
     if (this._itemGuids.size > 0) {
       this.broadcaster.setAttribute("starred", "true");
       this.broadcaster.setAttribute("buttontooltiptext", this._starredTooltip);
       this.broadcaster.setAttribute("tooltiptext", this._starredTooltip);
       if (!AppConstants.MOZ_PHOTON_THEME && this.button.getAttribute("overflowedItem") == "true") {
         this.button.setAttribute("label", this._starButtonOverflowedStarredLabel);
       }
     } else {
-      if (AppConstants.MOZ_PHOTON_ANIMATIONS) {
-        this.star.removeAttribute("animate");
-      }
+      this.star.removeAttribute("animate");
       this.broadcaster.removeAttribute("starred");
       this.broadcaster.setAttribute("buttontooltiptext", this._unstarredTooltip);
       this.broadcaster.setAttribute("tooltiptext", this._unstarredTooltip);
       if (!AppConstants.MOZ_PHOTON_THEME && this.button.getAttribute("overflowedItem") == "true") {
         this.button.setAttribute("label", this._starButtonOverflowedLabel);
       }
     }
   },
@@ -1933,34 +1927,32 @@ var BookmarkingUI = {
   onStarCommand(aEvent) {
     // Ignore non-left clicks on the star, or if we are updating its state.
     if (!this._pendingUpdate && (aEvent.type != "click" || aEvent.button == 0)) {
       let isBookmarked = this._itemGuids.size > 0;
       // Disable the old animation in photon
       if (!isBookmarked && !AppConstants.MOZ_PHOTON_THEME)
         this._showBookmarkedNotification();
       // Set up variables for new animation in Photon
-      if (!isBookmarked && AppConstants.MOZ_PHOTON_ANIMATIONS) {
+      if (!isBookmarked) {
         BrowserUtils.setToolbarButtonHeightProperty(this.star);
         this.star.setAttribute("animate", "true");
       }
       PlacesCommandHook.bookmarkCurrentPage(true);
     }
   },
 
   onCurrentPageContextPopupShowing() {
     this.updateBookmarkPageMenuItem();
   },
 
   handleEvent: function BUI_handleEvent(aEvent) {
     switch (aEvent.type) {
       case "mouseover":
-        if (AppConstants.MOZ_PHOTON_ANIMATIONS) {
-          this.star.setAttribute("preloadanimations", "true");
-        }
+        this.star.setAttribute("preloadanimations", "true");
         break;
       case "ViewShowing":
         this.onPanelMenuViewShowing(aEvent);
         break;
       case "ViewHiding":
         this.onPanelMenuViewHiding(aEvent);
         break;
     }
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -1129,17 +1129,16 @@ toolbarpaletteitem[place="palette"] > #d
   -moz-appearance: none;
   -moz-binding: url("chrome://browser/content/places/menu.xml#places-popup-arrow");
   background: transparent;
   border: none;
   /* The popup inherits -moz-image-region from the button, must reset it */
   -moz-image-region: auto;
 }
 
-%ifdef MOZ_PHOTON_ANIMATIONS
 %ifdef MOZ_WIDGET_COCOA
 
 /* On Mac, use the properties "-moz-window-transform" and "-moz-window-opacity"
    instead of "transform" and "opacity" for these animations.
    The -moz-window* properties apply to the whole window including the window's
    shadow, and they don't affect the window's "shape", so the system doesn't
    have to recompute the shadow shape during the animation. This makes them a
    lot faster. In fact, Gecko no longer triggers shadow shape recomputations
@@ -1193,96 +1192,16 @@ toolbarpaletteitem[place="palette"] > #d
     var(--animation-easing-function), ease-in-out;
 }
 
 #BMB_bookmarksPopup[animate="cancel"] {
   transform: none;
 }
 %endif
 
-%else
-%ifdef MOZ_WIDGET_COCOA
-#BMB_bookmarksPopup {
-  -moz-window-transform: scale(.4);
-  -moz-window-opacity: 0;
-  transition-property: -moz-window-transform, -moz-window-opacity;
-  transition-duration: 0.15s;
-  transition-timing-function: ease-out;
-}
-
-#BMB_bookmarksPopup[animate="open"] {
-  -moz-window-transform: none;
-  -moz-window-opacity: 1.0;
-}
-
-#BMB_bookmarksPopup[animate="cancel"] {
-  -moz-window-transform: none;
-}
-
-#BMB_bookmarksPopup[arrowposition="after_start"]:-moz-locale-dir(ltr),
-#BMB_bookmarksPopup[arrowposition="after_end"]:-moz-locale-dir(rtl) {
-  -moz-window-transform-origin: 20px top;
-}
-
-#BMB_bookmarksPopup[arrowposition="after_end"]:-moz-locale-dir(ltr),
-#BMB_bookmarksPopup[arrowposition="after_start"]:-moz-locale-dir(rtl) {
-  -moz-window-transform-origin: calc(100% - 20px) top;
-}
-
-#BMB_bookmarksPopup[arrowposition="before_start"]:-moz-locale-dir(ltr),
-#BMB_bookmarksPopup[arrowposition="before_end"]:-moz-locale-dir(rtl) {
-  -moz-window-transform-origin: 20px bottom;
-}
-
-#BMB_bookmarksPopup[arrowposition="before_end"]:-moz-locale-dir(ltr),
-#BMB_bookmarksPopup[arrowposition="before_start"]:-moz-locale-dir(rtl) {
-  -moz-window-transform-origin: calc(100% - 20px) bottom;
-}
-
-%elifndef MOZ_WIDGET_GTK
-
-#BMB_bookmarksPopup {
-  transform: scale(.4);
-  opacity: 0;
-  transition-property: transform, opacity;
-  transition-duration: 0.15s;
-  transition-timing-function: ease-out;
-}
-
-#BMB_bookmarksPopup[animate="open"] {
-  transform: none;
-  opacity: 1.0;
-}
-
-#BMB_bookmarksPopup[animate="cancel"] {
-  transform: none;
-}
-
-#BMB_bookmarksPopup[arrowposition="after_start"]:-moz-locale-dir(ltr),
-#BMB_bookmarksPopup[arrowposition="after_end"]:-moz-locale-dir(rtl) {
-  transform-origin: 20px top;
-}
-
-#BMB_bookmarksPopup[arrowposition="after_end"]:-moz-locale-dir(ltr),
-#BMB_bookmarksPopup[arrowposition="after_start"]:-moz-locale-dir(rtl) {
-  transform-origin: calc(100% - 20px) top;
-}
-
-#BMB_bookmarksPopup[arrowposition="before_start"]:-moz-locale-dir(ltr),
-#BMB_bookmarksPopup[arrowposition="before_end"]:-moz-locale-dir(rtl) {
-  transform-origin: 20px bottom;
-}
-
-#BMB_bookmarksPopup[arrowposition="before_end"]:-moz-locale-dir(ltr),
-#BMB_bookmarksPopup[arrowposition="before_start"]:-moz-locale-dir(rtl) {
-  transform-origin: calc(100% - 20px) bottom;
-}
-%endif
-%endif
-
 /* Customize mode */
 %ifndef MOZ_PHOTON_THEME
 #navigator-toolbox,
 #browser-bottombox,
 #content-deck {
   transition-property: margin-left, margin-right;
   transition-duration: 200ms;
   transition-timing-function: linear;
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5054,18 +5054,17 @@ var CombinedStopReload = {
 
     // Store the time that we switched to the stop button only if a request
     // is active. Requests are null if the switch is related to a tabswitch.
     // This is used to determine if we should show the stop->reload animation.
     if (aRequest) {
       this.timeWhenSwitchedToStop = window.performance.now();
     }
 
-    let shouldAnimate = AppConstants.MOZ_PHOTON_ANIMATIONS &&
-                        aRequest &&
+    let shouldAnimate = aRequest &&
                         aWebProgress.isTopLevel &&
                         aWebProgress.isLoadingDocument &&
                         !gBrowser.tabAnimationsInProgress &&
                         this.stopReloadContainer.closest("#nav-bar-customization-target") &&
                         this.animate;
 
     this._cancelTransition();
     if (shouldAnimate) {
@@ -5078,18 +5077,17 @@ var CombinedStopReload = {
   },
 
   switchToReload(aRequest, aWebProgress) {
     if (!this._initialized || !this._shouldSwitch(aRequest, aWebProgress) ||
         !this.reload.hasAttribute("displaystop")) {
       return;
     }
 
-    let shouldAnimate = AppConstants.MOZ_PHOTON_ANIMATIONS &&
-                        aRequest &&
+    let shouldAnimate = aRequest &&
                         aWebProgress.isTopLevel &&
                         !aWebProgress.isLoadingDocument &&
                         !gBrowser.tabAnimationsInProgress &&
                         this._loadTimeExceedsMinimumForAnimation() &&
                         this.stopReloadContainer.closest("#nav-bar-customization-target") &&
                         this.animate;
 
     if (shouldAnimate) {
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1062,21 +1062,19 @@
                        cui-areatype="toolbar"
                        tooltip="dynamic-shortcut-tooltip"/>
       </hbox>
 
       <toolbarbutton id="nav-bar-overflow-button"
                      class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
                      skipintoolbarset="true"
                      tooltiptext="&navbarOverflow.label;">
-#ifdef MOZ_PHOTON_ANIMATIONS
         <box class="toolbarbutton-animatable-box">
           <image class="toolbarbutton-animatable-image"/>
         </box>
-#endif
       </toolbarbutton>
 
       <toolbaritem id="PanelUI-button"
                    class="chromeclass-toolbar-additional"
                    removable="false">
         <toolbarbutton id="PanelUI-menu-button"
                        class="toolbarbutton-1 badged-button"
                        consumeanchor="PanelUI-button"
--- a/browser/components/customizableui/CustomizeMode.jsm
+++ b/browser/components/customizableui/CustomizeMode.jsm
@@ -661,18 +661,17 @@ CustomizeMode.prototype = {
       aNode = aNode.firstChild;
     }
     let panel = CustomizableUI.AREA_FIXED_OVERFLOW_PANEL;
     CustomizableUI.addWidgetToArea(aNode.id, panel);
     if (!this._customizing) {
       CustomizableUI.dispatchToolboxEvent("customizationchange");
     }
 
-    if (AppConstants.MOZ_PHOTON_ANIMATIONS &&
-        Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled")) {
+    if (Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled")) {
       let overflowButton = this.document.getElementById("nav-bar-overflow-button");
       BrowserUtils.setToolbarButtonHeightProperty(overflowButton).then(() => {
         overflowButton.setAttribute("animate", "true");
         overflowButton.addEventListener("animationend", function onAnimationEnd(event) {
           if (event.animationName.startsWith("overflow-animation")) {
             this.setAttribute("fade", "true");
           } else if (event.animationName == "overflow-fade") {
             this.removeEventListener("animationend", onAnimationEnd);
--- a/browser/components/downloads/content/indicator.js
+++ b/browser/components/downloads/content/indicator.js
@@ -341,17 +341,17 @@ const DownloadsIndicatorView = {
     // The notification element is positioned to show in the same location as
     // the downloads button. It's not in the downloads button itself in order to
     // be able to anchor the notification elsewhere if required, and to ensure
     // the notification isn't clipped by overflow properties of the anchor's
     // container.
     // Note: no notifier animation for download finished in Photon
     let notifier = this.notifier;
 
-    if (aType == "start" || !AppConstants.MOZ_PHOTON_ANIMATIONS) {
+    if (aType == "start") {
       // Show the notifier before measuring for size/placement. Being hidden by default
       // avoids the interference with scrolling/APZ when the notifier element is
       // tall enough to overlap the tabbrowser element
       notifier.removeAttribute("hidden");
 
       // the anchor height may vary if font-size is changed or
       // compact/tablet mode is selected so recalculate this each time
       let anchorRect = anchor.getBoundingClientRect();
@@ -364,21 +364,17 @@ const DownloadsIndicatorView = {
       let translateY = (topDiff + .5 * heightDiff) + "px";
       notifier.style.transform = "translate(" + translateX + ", " + translateY + ")";
       notifier.setAttribute("notification", aType);
     }
     anchor.setAttribute("notification", aType);
 
     let animationDuration;
     // This value is determined by the overall duration of animation in CSS.
-    if (AppConstants.MOZ_PHOTON_ANIMATIONS) {
-      animationDuration = aType == "start" ? 760 : 850;
-    } else {
-      animationDuration = 2000;
-    }
+    animationDuration = aType == "start" ? 760 : 850;
 
     this._notificationTimeout = setTimeout(() => {
       notifier.setAttribute("hidden", "true");
       notifier.removeAttribute("notification");
       notifier.style.transform = "";
       anchor.removeAttribute("notification");
     }, animationDuration);
   },
--- a/browser/components/downloads/content/indicatorOverlay.xul
+++ b/browser/components/downloads/content/indicatorOverlay.xul
@@ -20,17 +20,15 @@
        downloads-button. -->
   <toolbarbutton id="downloads-button" indicator="true">
     <!-- The panel's anchor area is smaller than the outer button, but must
          always be visible and must not move or resize when the indicator
          state changes, otherwise the panel could change its position or lose
          its arrow unexpectedly. -->
     <stack id="downloads-indicator-anchor"
            consumeanchor="downloads-button">
-#ifdef MOZ_PHOTON_ANIMATIONS
       <box id="downloads-indicator-icon"/>
-#endif
       <stack id="downloads-indicator-progress-outer">
         <box id="downloads-indicator-progress-inner"/>
       </stack>
     </stack>
   </toolbarbutton>
 </overlay>
--- a/browser/components/downloads/jar.mn
+++ b/browser/components/downloads/jar.mn
@@ -3,14 +3,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 browser.jar:
 *       content/browser/downloads/download.xml           (content/download.xml)
         content/browser/downloads/downloads.css          (content/downloads.css)
         content/browser/downloads/downloads.js           (content/downloads.js)
 *       content/browser/downloads/downloadsOverlay.xul   (content/downloadsOverlay.xul)
         content/browser/downloads/indicator.js           (content/indicator.js)
-*       content/browser/downloads/indicatorOverlay.xul   (content/indicatorOverlay.xul)
+        content/browser/downloads/indicatorOverlay.xul   (content/indicatorOverlay.xul)
 *       content/browser/downloads/allDownloadsViewOverlay.xul (content/allDownloadsViewOverlay.xul)
         content/browser/downloads/allDownloadsViewOverlay.js  (content/allDownloadsViewOverlay.js)
 *       content/browser/downloads/contentAreaDownloadsView.xul (content/contentAreaDownloadsView.xul)
         content/browser/downloads/contentAreaDownloadsView.js  (content/contentAreaDownloadsView.js)
         content/browser/downloads/contentAreaDownloadsView.css (content/contentAreaDownloadsView.css)
--- a/browser/extensions/pocket/bootstrap.js
+++ b/browser/extensions/pocket/bootstrap.js
@@ -115,18 +115,17 @@ function CreatePocketWidget(reason) {
       let view = doc.createElement("panelview");
       view.id = "PanelUI-pocketView";
       let panel = doc.createElement("vbox");
       panel.setAttribute("class", "panel-subview-body");
       view.appendChild(panel);
       doc.getElementById("PanelUI-multiView").appendChild(view);
     },
     onCreated(node) {
-      if (Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled") &&
-          AppConstants.MOZ_PHOTON_ANIMATIONS) {
+      if (Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled")) {
         let doc = node.ownerDocument;
         let box = doc.createElement("box");
         box.classList.add("toolbarbutton-animatable-box");
         let image = doc.createElement("image");
         image.classList.add("toolbarbutton-animatable-image");
         box.appendChild(image);
         node.appendChild(box);
         node.setAttribute("animationsenabled", "true");
deleted file mode 100644
index f5fa1205315dc2ed1f634acdbd2621dc415db711..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index bd548b18382388cfbe7672d1d0725bff0d21432c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -35,20 +35,16 @@ browser.jar:
   skin/classic/browser/customizableui/background-noise-toolbar.png  (customizableui/background-noise-toolbar.png)
   skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
   skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
   skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
 #endif
 * skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css)
 * skin/classic/browser/downloads/allDownloadsViewOverlay.css   (downloads/allDownloadsViewOverlay.css)
   skin/classic/browser/downloads/download-glow-menuPanel.png (downloads/download-glow-menuPanel.png)
-#ifndef MOZ_PHOTON_ANIMATIONS
-  skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
-  skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
-#endif
 * skin/classic/browser/downloads/downloads.css        (downloads/downloads.css)
   skin/classic/browser/feeds/feedIcon.png             (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png           (feeds/feedIcon16.png)
   skin/classic/browser/feeds/subscribe.css            (feeds/subscribe.css)
 * skin/classic/browser/newtab/newTab.css              (newtab/newTab.css)
   skin/classic/browser/places/allBookmarks.png        (places/allBookmarks.png)
   skin/classic/browser/places/bookmarksMenu.png       (places/bookmarksMenu.png)
   skin/classic/browser/places/bookmarksToolbar.png    (places/bookmarksToolbar.png)
deleted file mode 100644
index 139bf0b539e3d978b05396f78269043275223b2f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4a251218157fc74c318de4fa93b6f0308c6890dc..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index bd548b18382388cfbe7672d1d0725bff0d21432c..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1d6278050e93899cdcc1baeadefcd16c63e3c827..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/osx/downloads/indicator.css
+++ b/browser/themes/osx/downloads/indicator.css
@@ -5,24 +5,8 @@
 %include ../../shared/downloads/indicator.inc.css
 
 
 @media (min-resolution: 2dppx) {
   #downloads-button[cui-areatype="menu-panel"][attention="success"] {
     list-style-image: url("chrome://browser/skin/downloads/download-glow-menuPanel@2x.png");
   }
 }
-
-
-%ifndef MOZ_PHOTON_ANIMATIONS
-@media (min-resolution: 2dppx) {
-  #downloads-notification-anchor[notification="start"] > #downloads-indicator-notification {
-    background-image: url("chrome://browser/skin/downloads/download-notification-start@2x.png");
-  }
-}
-
-
-@media (min-resolution: 2dppx) {
-  #downloads-notification-anchor[notification="finish"] > #downloads-indicator-notification {
-    background-image: url("chrome://browser/skin/downloads/download-notification-finish@2x.png");
-  }
-}
-%endif
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -55,22 +55,16 @@ browser.jar:
   skin/classic/browser/customizableui/customizeMode-gridTexture.png  (customizableui/customizeMode-gridTexture.png)
   skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
   skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
 #endif
 * skin/classic/browser/customizableui/panelUI.css    (customizableui/panelUI.css)
 * skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css)
   skin/classic/browser/downloads/download-glow-menuPanel.png (downloads/download-glow-menuPanel.png)
   skin/classic/browser/downloads/download-glow-menuPanel@2x.png (downloads/download-glow-menuPanel@2x.png)
-#ifndef MOZ_PHOTON_ANIMATIONS
-  skin/classic/browser/downloads/download-notification-finish.png  (downloads/download-notification-finish.png)
-  skin/classic/browser/downloads/download-notification-finish@2x.png  (downloads/download-notification-finish@2x.png)
-  skin/classic/browser/downloads/download-notification-start.png  (downloads/download-notification-start.png)
-  skin/classic/browser/downloads/download-notification-start@2x.png  (downloads/download-notification-start@2x.png)
-#endif
 * skin/classic/browser/downloads/downloads.css              (downloads/downloads.css)
   skin/classic/browser/feeds/subscribe.css                  (feeds/subscribe.css)
   skin/classic/browser/feeds/feedIcon.png                   (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png                 (feeds/feedIcon16.png)
 * skin/classic/browser/newtab/newTab.css                    (newtab/newTab.css)
   skin/classic/browser/setDesktopBackground.css
   skin/classic/browser/monitor.png
   skin/classic/browser/monitor_16-10.png
--- a/browser/themes/shared/downloads/indicator.inc.css
+++ b/browser/themes/shared/downloads/indicator.inc.css
@@ -17,109 +17,65 @@
   min-height: 16px;
 }
 
 #downloads-indicator-progress-outer {
   width: 16px;
   height: 16px;
   background-size: 16px;
   -moz-context-properties: fill;
-%ifdef MOZ_PHOTON_ANIMATIONS
   background: url("chrome://browser/skin/downloads/download-icons.svg#default-bar") center no-repeat;
-%else
-  background: var(--downloads-indicator-image) center no-repeat;
-%endif
 }
 
-%ifdef MOZ_PHOTON_ANIMATIONS
 #downloads-button[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-icon,
-%endif
 #downloads-button[attention="success"] > #downloads-indicator-anchor > #downloads-indicator-progress-outer {
   fill: var(--toolbarbutton-icon-fill-attention);
 }
-%ifdef MOZ_PHOTON_ANIMATIONS
 #downloads-button[progress] > #downloads-indicator-anchor > #downloads-indicator-progress-outer {
   background: url("chrome://browser/skin/downloads/download-icons.svg#progress-bar-bg") center no-repeat;
 }
-%endif
 
 #downloads-button[attention="success"] {
   list-style-image: url("chrome://browser/skin/downloads/download-glow-menuPanel.png");
   -moz-image-region: auto;
 }
 
-%ifdef MOZ_PHOTON_ANIMATIONS
 #downloads-indicator-icon {
   -moz-context-properties: fill;
   background-image: url("chrome://browser/skin/downloads/download-icons.svg#arrow");
   width: 16px;
   height: 16px;
 }
-%endif
 
 #downloads-indicator-progress-inner {
-%ifdef MOZ_PHOTON_ANIMATIONS
   background: url("chrome://browser/skin/downloads/download-icons.svg#progress-bar-fg") left no-repeat;
   margin-right: 16px;
-%else
-  background: var(--downloads-indicator-image) bottom no-repeat;
-  margin-top: 16px;
-%endif
   -moz-context-properties: fill;
   fill: var(--toolbarbutton-icon-fill-attention);
   background-size: 16px;
   /* From javascript side we use animation delay from 0s to -100s to show
    * corresponding frames needed for progress.
    * animation-delay is set to a positive value to make nothing shown.
    */
   animation-play-state: paused;
   animation-delay: 1s;
   animation-duration: 100s;
   animation-timing-function: linear;
   animation-name: indicatorArrowProgress;
 }
 
-%ifndef MOZ_PHOTON_ANIMATIONS
-toolbar[brighttext] #downloads-indicator-progress-inner {
-  animation-name: indicatorArrowProgressDark;
-}
-%endif
-
 @keyframes indicatorArrowProgress {
   0% {
-%ifdef MOZ_PHOTON_ANIMATIONS
     margin-right: 14px;
-%else
-    margin-top: 12px;
-    filter: brightness(1.2);
-%endif
   }
   100% {
-%ifdef MOZ_PHOTON_ANIMATIONS
     margin-right: 2px;
-%else
-    margin-top: 2px;
-    filter: brightness(1);
-%endif
   }
 }
 
-%ifndef MOZ_PHOTON_ANIMATIONS
-@keyframes indicatorArrowProgressDark {
-  0% {
-    margin-top: 12px;
-    filter: brightness(0.7);
-  }
-  100% {
-    margin-top: 2px;
-    filter: brightness(1);
-  }
-}
-%endif
-
 /*** Status badges ***/
 
 #downloads-button[attention="warning"] > .toolbarbutton-badge-stack > .toolbarbutton-badge,
 #downloads-button[attention="severe"] > .toolbarbutton-badge-stack > .toolbarbutton-badge {
   display: -moz-box;
   height: 8px;
   width: 8px;
   min-width: 0;
@@ -144,40 +100,28 @@ toolbar[brighttext] #downloads-indicator
 
 #downloads-button[attention="severe"] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive,
 #downloads-button[attention="warning"] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive {
   filter: none;
 }
 
 /*** Download notifications ***/
 
-%ifdef MOZ_PHOTON_ANIMATIONS
 #downloads-button[notification="start"] > #downloads-indicator-anchor > #downloads-indicator-icon {
   animation-name: downloadsIndicatorStartDip;
   /* Upon changing the duration_delay below, please keep the delay time of
      setTimeout() identical in indicator.js for this animation.
 
      Timing here needs to align with the animation on #downloads-indicator-notification
   */
   animation-duration: 360ms;
   animation-delay: 400ms;
   animation-iteration-count: 1;
 }
-%else
-#downloads-button[notification="start"] > #downloads-indicator-anchor > #downloads-indicator-progress-outer {
-  animation-name: downloadsIndicatorStartJump;
-  /* Upon changing the overall duration below, please keep the delay time of
-     setTimeout() identical in indicator.js for this animation. */
-  animation-duration: 0.5s;
-  animation-delay: 1s;
-  animation-iteration-count: 2;
-}
-%endif
 
-%ifdef MOZ_PHOTON_ANIMATIONS
 @keyframes downloadsIndicatorStartDip {
   0% {
     transform: translateY(0);
     animation-timing-function: linear;
   }
   50% {
     transform: translateY(0);
     animation-timing-function: ease-out;
@@ -191,135 +135,69 @@ toolbar[brighttext] #downloads-indicator
   }
 }
 
 @keyframes downloadsIndicatorFinishPulse {
   from  { transform: scale(1); }
   37.5% { transform: scale(1.4); animation-timing-function: ease-out; }
   to    { transform: scale(1); animation-timing-function: ease-in; }
 }
-%else
 
-@keyframes downloadsIndicatorStartJump {
-  0% {
-    transform: translateY(0);
-    animation-timing-function: ease-out;
-  }
-  50% {
-    transform: translateY(-3px);
-    animation-timing-function: ease-in;
-  }
-  100% {
-    transform: translateY(0);
-  }
-}
-%endif
-
-%ifdef MOZ_PHOTON_ANIMATIONS
 #downloads-button[notification="finish"] > #downloads-indicator-anchor > #downloads-indicator-icon {
   animation-name: downloadsIndicatorFinishPulse;
   animation-delay: 250ms;
   animation-duration: 300ms;
   animation-iteration-count: 2;
 }
-%endif
 
 #downloads-animation-container {
   min-height: 1px;
   min-width: 1px;
   height: 1px;
   margin-bottom: -1px;
   /* Makes the outermost animation container element positioned, so that its
      contents are rendered over the main browser window in the Z order.
      This is required by the animated event notification. */
   position: relative;
   /* The selected tab may overlap #downloads-indicator-notification */
   z-index: 5;
 }
 
-%ifdef MOZ_PHOTON_ANIMATIONS
 /* download start animation */
 
 #downloads-notification-anchor {
   width: 42px;
   /* Height is equal to height of each frame in the SVG animation
      Use of min/max-height instead of height is to avoid an
      assertion for `inline-size less than zero..` (bug 1379332). */
   min-height: 98px;
   max-height: 98px;
   overflow: hidden;
 }
-%endif
 
 #downloads-indicator-notification {
   opacity: 0;
-%ifdef MOZ_PHOTON_ANIMATIONS
   min-width: 1344px;
   height: 98px; /* Height is equal to height of each frame in the SVG animation */
   -moz-context-properties: fill;
   /* Intentionally not using --toolbarbutton-icon-fill to get better contrast/balance
      across default, dark and light themes */
   fill: #737373;
-%else
-  background-size: 16px;
-  background-position: center;
-  background-repeat: no-repeat;
-  width: 16px;
-  height: 16px;
-%endif
 }
 
-%ifdef MOZ_PHOTON_ANIMATIONS
 @keyframes downloadsIndicatorNotificationStart {
   from {
     transform: translateX(0);
   }
   to {
     transform: translateX(-1302px);
   }
 }
-%else
-@keyframes downloadsIndicatorNotificationStartRight {
-  from { opacity: 0; transform: translate(-128px, 128px) scale(8); }
-  20%  { opacity: .85; animation-timing-function: ease-out; }
-  to   { opacity: 0; transform: translate(0) scale(1); }
-}
-
-@keyframes downloadsIndicatorNotificationStartLeft {
-  from { opacity: 0; transform: translate(128px, 128px) scale(8); }
-  20%  { opacity: .85; animation-timing-function: ease-out; }
-  to   { opacity: 0; transform: translate(0) scale(1); }
-}
-
-@keyframes downloadsIndicatorNotificationFinish {
-  from { opacity: 0; transform: scale(1); }
-  20%  { opacity: .65; animation-timing-function: ease-in; }
-  to   { opacity: 0; transform: scale(8); }
-}
-%endif
 
 #downloads-notification-anchor[notification="start"] > #downloads-indicator-notification {
-%ifdef MOZ_PHOTON_ANIMATIONS
   opacity: 1;
   background: url("chrome://browser/skin/downloads/notification-start-animation.svg") 0 center no-repeat;
   transform: translateX(0px);
   animation-name: downloadsIndicatorNotificationStart;
   animation-duration: 540ms;
   animation-delay: 64ms;
   animation-timing-function: steps(31);
-%else
-  background-image: url("chrome://browser/skin/downloads/download-notification-start.png");
-  animation-name: downloadsIndicatorNotificationStartRight;
-  animation-duration: 1s;
-%endif
 }
-
-%ifndef MOZ_PHOTON_ANIMATIONS
-#downloads-notification-anchor[notification="start"]:-moz-locale-dir(rtl) > #downloads-indicator-notification {
-  animation-name: downloadsIndicatorNotificationStartLeft;
-}
-
-#downloads-notification-anchor[notification="finish"] > #downloads-indicator-notification {
-  background-image: url("chrome://browser/skin/downloads/download-notification-finish.png");
-  animation-name: downloadsIndicatorNotificationFinish;
-  animation-duration: 1s;
-}
-%endif
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -56,19 +56,17 @@
   skin/classic/browser/customizableui/whimsy.png               (../shared/customizableui/whimsy.png)
   skin/classic/browser/customizableui/whimsy@2x.png            (../shared/customizableui/whimsy@2x.png)
   skin/classic/browser/downloads/contentAreaDownloadsView.css  (../shared/downloads/contentAreaDownloadsView.css)
   skin/classic/browser/downloads/download-blocked.svg          (../shared/downloads/download-blocked.svg)
   skin/classic/browser/downloads/download-summary.svg          (../shared/downloads/download-summary.svg)
 #ifdef MOZ_PHOTON_THEME
   skin/classic/browser/downloads/download-icons.svg            (../shared/downloads/download-icons.svg)
 #endif
-#ifdef MOZ_PHOTON_ANIMATIONS
   skin/classic/browser/downloads/notification-start-animation.svg  (../shared/downloads/notification-start-animation.svg)
-#endif
   skin/classic/browser/drm-icon.svg                            (../shared/drm-icon.svg)
   skin/classic/browser/fullscreen/insecure.svg                 (../shared/fullscreen/insecure.svg)
   skin/classic/browser/fullscreen/secure.svg                   (../shared/fullscreen/secure.svg)
   skin/classic/browser/connection-secure.svg                   (../shared/identity-block/connection-secure.svg)
   skin/classic/browser/connection-mixed-passive-loaded.svg     (../shared/identity-block/connection-mixed-passive-loaded.svg)
   skin/classic/browser/connection-mixed-active-loaded.svg      (../shared/identity-block/connection-mixed-active-loaded.svg)
   skin/classic/browser/identity-icon.svg                       (../shared/identity-block/identity-icon.svg)
   skin/classic/browser/identity-icon-notice.svg                (../shared/identity-block/identity-icon-notice.svg)
@@ -119,30 +117,26 @@
   skin/classic/browser/arrow-dropdown-16.svg          (../shared/icons/arrow-dropdown-16.svg)
   skin/classic/browser/arrow-left.svg                 (../shared/icons/arrow-left.svg)
   skin/classic/browser/back.svg                       (../shared/icons/back.svg)
 #ifndef MOZ_PHOTON_THEME
   skin/classic/browser/back-large.svg                 (../shared/icons/back-large.svg)
 #endif
   skin/classic/browser/back-12.svg                    (../shared/icons/back-12.svg)
   skin/classic/browser/bookmark.svg                   (../shared/icons/bookmark.svg)
-#ifdef MOZ_PHOTON_ANIMATIONS
   skin/classic/browser/bookmark-animation.svg         (../shared/icons/bookmark-animation.svg)
-#endif
   skin/classic/browser/bookmark-hollow.svg            (../shared/icons/bookmark-hollow.svg)
 #ifndef MOZ_PHOTON_THEME
   skin/classic/browser/bookmarksMenu.svg              (../shared/icons/bookmarksMenu.svg)
 #else
   skin/classic/browser/bookmark-star-on-tray.svg      (../shared/icons/bookmark-star-on-tray.svg)
 #endif
   skin/classic/browser/characterEncoding.svg          (../shared/icons/characterEncoding.svg)
   skin/classic/browser/chevron.svg                    (../shared/icons/chevron.svg)
-#ifdef MOZ_PHOTON_ANIMATIONS
   skin/classic/browser/chevron-animation.svg          (../shared/icons/chevron-animation.svg)
-#endif
   skin/classic/browser/check.svg                      (../shared/icons/check.svg)
   skin/classic/browser/containers.svg                 (../shared/icons/containers.svg)
   skin/classic/browser/customize.svg                  (../shared/icons/customize.svg)
   skin/classic/browser/developer.svg                  (../shared/icons/developer.svg)
   skin/classic/browser/device-mobile.svg              (../shared/icons/device-mobile.svg)
 #ifdef MOZ_PHOTON_THEME
   skin/classic/browser/device-desktop.svg             (../shared/icons/device-desktop.svg)
 #endif
@@ -161,46 +155,40 @@
   skin/classic/browser/forward.svg                    (../shared/icons/forward.svg)
   skin/classic/browser/fullscreen.svg                 (../shared/icons/fullscreen.svg)
   skin/classic/browser/fullscreen-enter.svg           (../shared/icons/fullscreen-enter.svg)
   skin/classic/browser/fullscreen-exit.svg            (../shared/icons/fullscreen-exit.svg)
   skin/classic/browser/help.svg                       (../shared/icons/help.svg)
   skin/classic/browser/history.svg                    (../shared/icons/history.svg)
   skin/classic/browser/home.svg                       (../shared/icons/home.svg)
   skin/classic/browser/library.svg                    (../shared/icons/library.svg)
-#ifdef MOZ_PHOTON_ANIMATIONS
   skin/classic/browser/library-bookmark-animation.svg (../shared/icons/library-bookmark-animation.svg)
-#endif
 #ifdef MOZ_PHOTON_THEME
   skin/classic/browser/link.svg                       (../shared/icons/link.svg)
 #endif
   skin/classic/browser/mail.svg                       (../shared/icons/mail.svg)
   skin/classic/browser/menu.svg                       (../shared/icons/menu.svg)
   skin/classic/browser/new-tab.svg                    (../shared/icons/new-tab.svg)
   skin/classic/browser/new-window.svg                 (../shared/icons/new-window.svg)
   skin/classic/browser/open.svg                       (../shared/icons/open.svg)
 #ifdef MOZ_PHOTON_THEME
   skin/classic/browser/page-action.svg                (../shared/icons/page-action.svg)
 #endif
   skin/classic/browser/print.svg                      (../shared/icons/print.svg)
   skin/classic/browser/privateBrowsing.svg            (../shared/icons/privateBrowsing.svg)
   skin/classic/browser/quit.svg                       (../shared/icons/quit.svg)
   skin/classic/browser/reload.svg                     (../shared/icons/reload.svg)
-#ifdef MOZ_PHOTON_ANIMATIONS
   skin/classic/browser/reload-to-stop.svg             (../shared/icons/reload-to-stop.svg)
-#endif
   skin/classic/browser/save.svg                       (../shared/icons/save.svg)
   skin/classic/browser/settings.svg                   (../shared/icons/settings.svg)
   skin/classic/browser/share.svg                      (../shared/icons/share.svg)
   skin/classic/browser/sidebars.svg                   (../shared/icons/sidebars.svg)
   skin/classic/browser/sidebars-right.svg             (../shared/icons/sidebars-right.svg)
   skin/classic/browser/stop.svg                       (../shared/icons/stop.svg)
-#ifdef MOZ_PHOTON_ANIMATIONS
   skin/classic/browser/stop-to-reload.svg             (../shared/icons/stop-to-reload.svg)
-#endif
   skin/classic/browser/sync.svg                       (../shared/icons/sync.svg)
   skin/classic/browser/synced-tabs.svg                (../shared/icons/synced-tabs.svg)
   skin/classic/browser/webIDE.svg                     (../shared/icons/webIDE.svg)
   skin/classic/browser/zoom-in.svg                    (../shared/icons/zoom-in.svg)
   skin/classic/browser/zoom-out.svg                   (../shared/icons/zoom-out.svg)
 
 
   skin/classic/browser/search-indicator.png                    (../shared/search/search-indicator.png)
--- a/browser/themes/shared/toolbarbutton-icons.inc.css
+++ b/browser/themes/shared/toolbarbutton-icons.inc.css
@@ -32,17 +32,16 @@ toolbar[brighttext] .toolbarbutton-1 {
 %endif
 }
 
 #forward-button {
   list-style-image: url("chrome://browser/skin/forward.svg");
 }
 
 %ifdef MOZ_PHOTON_THEME
-%ifdef MOZ_PHOTON_ANIMATIONS
 .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
   animation-fill-mode: forwards;
   animation-iteration-count: 1;
   list-style-image: none;
 }
 
 /* The animations for the reload-button and stop-button are disabled
    outside of the nav-bar due to bug 1382894. */
@@ -168,17 +167,17 @@ toolbar[brighttext] .toolbarbutton-1 {
 
 #reload-button[displaystop] + #stop-button > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
   transform: translateX(-450px);
 }
 
 #reload-button[displaystop] + #stop-button:-moz-locale-dir(rtl) > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
   transform: scaleX(-1) translateX(-450px);
 }
-%endif
+
 #reload-button {
   list-style-image: url("chrome://browser/skin/reload.svg");
 }
 
 #stop-button {
   list-style-image: url("chrome://browser/skin/stop.svg");
 }
 %endif
@@ -326,17 +325,16 @@ toolbar:not([brighttext]) #bookmarks-men
 #zoom-controls@PSEUDO_FOR_COMBINED_BUTTONS@ > #zoom-in-button {
   list-style-image: url("chrome://browser/skin/zoom-in.svg");
 }
 
 #nav-bar-overflow-button {
   list-style-image: url("chrome://browser/skin/chevron.svg");
 }
 
-%ifdef MOZ_PHOTON_ANIMATIONS
 #nav-bar-overflow-button[animate] > .toolbarbutton-icon {
   fill: transparent;
 }
 
 @keyframes overflow-animation {
   from {
     transform: translateX(0);
   }
@@ -412,17 +410,16 @@ toolbar:not([brighttext]) #bookmarks-men
   animation-name: overflow-fade;
   animation-timing-function: ease-out;
   animation-duration: 730ms;
 }
 
 #nav-bar-overflow-button[animate][fade]:-moz-locale-dir(rtl) > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
   transform: scaleX(-1);
 }
-%endif
 
 #email-link-button@attributeSelectorForToolbar@ {
   list-style-image: url("chrome://browser/skin/mail.svg");
 }
 
 #sidebar-button@attributeSelectorForToolbar@ {
   list-style-image: url("chrome://browser/skin/sidebars-right.svg");
 }
@@ -443,17 +440,16 @@ toolbar:not([brighttext]) #bookmarks-men
 #webide-button@attributeSelectorForToolbar@ {
   list-style-image: url("chrome://browser/skin/webIDE.svg");
 }
 
 #library-button {
   list-style-image: url("chrome://browser/skin/library.svg");
 }
 
-%ifdef MOZ_PHOTON_ANIMATIONS
 @keyframes library-bookmark-animation {
   from {
     transform: translateX(0);
     fill: inherit;
   }
   25% {
     fill: inherit;
   }
@@ -530,9 +526,8 @@ toolbar:not([brighttext]) #bookmarks-men
   transform: scaleX(-1);
 }
 
 #library-button[animate="bookmark"][fade] > .toolbarbutton-animatable-box > .toolbarbutton-animatable-image {
   animation-name: library-bookmark-fade;
   animation-duration: 2s;
   animation-timing-function: ease-out;
 }
-%endif
--- a/browser/themes/shared/toolbarbuttons.inc.css
+++ b/browser/themes/shared/toolbarbuttons.inc.css
@@ -24,22 +24,20 @@
 %else
   --backbutton-urlbar-overlap: 6px;
 
   /* icon width + border + horizontal padding (without the overlap from backbutton-urlbar-overlap) */
   --forwardbutton-width: 25px;
 
   --toolbarbutton-inner-padding: 3px;
 %endif
-%ifdef MOZ_PHOTON_ANIMATIONS
   /* This default value of --toolbarbutton-height is defined to prevent
      CSS errors for an invalid variable. The value should not get used,
      as a more specific value should be set when the value will be used. */
   --toolbarbutton-height: 0;
-%endif
 }
 
 /* Larger buttons in touch mode */
 :root[uidensity=touch] {
   --toolbarbutton-inner-padding: 9px;
 }
 
 %ifndef MOZ_PHOTON_THEME
--- a/browser/themes/shared/urlbar-searchbar.inc.css
+++ b/browser/themes/shared/urlbar-searchbar.inc.css
@@ -127,17 +127,16 @@
   fill-opacity: 0.6;
   color: inherit;
 }
 
 #pageActionButton {
   list-style-image: url("chrome://browser/skin/page-action.svg");
 }
 
-%ifdef MOZ_PHOTON_ANIMATIONS
 @keyframes bookmark-animation {
   from {
     transform: translateX(0);
   }
   to {
     transform: translateX(-627px);
   }
 }
@@ -196,17 +195,16 @@
   animation-timing-function: steps(19);
   animation-duration: 317ms;
   width: 660px;
 }
 
 #star-button-box[animationsenabled] > #star-button[starred][animate]:-moz-locale-dir(rtl) + #star-button-animatable-box > #star-button-animatable-image {
   animation-name: bookmark-animation-rtl;
 }
-%endif /* MOZ_PHOTON_ANIMATIONS */
 %endif /* MOZ_PHOTON_THEME */
 
 /* Zoom button */
 #urlbar-zoom-button {
   margin: 0 3px;
   font-size: .8em;
   padding: 0 8px;
   border-radius: 1em;
deleted file mode 100644
index 2ef1420ade6494c57e0bd36f29313cae03c4398d..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a2fca743bbe54c07818e6517d5c415bc81ce8349..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -60,20 +60,16 @@ browser.jar:
   skin/classic/browser/customizableui/customizeMode-separatorHorizontal.png  (customizableui/customizeMode-separatorHorizontal.png)
   skin/classic/browser/customizableui/customizeMode-separatorVertical.png  (customizableui/customizeMode-separatorVertical.png)
 #endif
   skin/classic/browser/customizableui/menu-arrow.svg           (customizableui/menu-arrow.svg)
 * skin/classic/browser/customizableui/panelUI.css       (customizableui/panelUI.css)
 * skin/classic/browser/downloads/allDownloadsViewOverlay.css   (downloads/allDownloadsViewOverlay.css)
   skin/classic/browser/downloads/download-glow-menuPanel.png   (downloads/download-glow-menuPanel.png)
   skin/classic/browser/downloads/download-glow-menuPanel-win7.png   (downloads/download-glow-menuPanel-win7.png)
-#ifndef MOZ_PHOTON_ANIMATIONS
-  skin/classic/browser/downloads/download-notification-finish.png (downloads/download-notification-finish.png)
-  skin/classic/browser/downloads/download-notification-start.png (downloads/download-notification-start.png)
-#endif
 * skin/classic/browser/downloads/downloads.css                 (downloads/downloads.css)
   skin/classic/browser/feeds/feedIcon.png                      (feeds/feedIcon.png)
   skin/classic/browser/feeds/feedIcon16.png                    (feeds/feedIcon16.png)
   skin/classic/browser/feeds/subscribe.css                     (feeds/subscribe.css)
 * skin/classic/browser/newtab/newTab.css                       (newtab/newTab.css)
 * skin/classic/browser/places/places.css                       (places/places.css)
 * skin/classic/browser/places/organizer.css                    (places/organizer.css)
   skin/classic/browser/places/query.png                        (places/query.png)
--- a/toolkit/content/xul.css
+++ b/toolkit/content/xul.css
@@ -436,17 +436,16 @@ tooltip {
   white-space: pre-wrap;
   margin-top: 21px;
 }
 
 panel[type="arrow"] {
   -moz-binding: url("chrome://global/content/bindings/popup.xml#arrowpanel");
 }
 
-%ifdef MOZ_PHOTON_ANIMATIONS
 %ifdef MOZ_WIDGET_COCOA
 
 /* On Mac, use the properties "-moz-window-transform" and "-moz-window-opacity"
    instead of "transform" and "opacity" for these animations.
    The -moz-window* properties apply to the whole window including the window's
    shadow, and they don't affect the window's "shape", so the system doesn't
    have to recompute the shadow shape during the animation. This makes them a
    lot faster. In fact, Gecko no longer triggers shadow shape recomputations
@@ -504,138 +503,16 @@ panel[type="arrow"][animate="cancel"] {
   transform: none;
 }
 
 %endif
 panel[type="arrow"][animating] {
   pointer-events: none;
 }
 
-%else
-
-%ifdef MOZ_WIDGET_COCOA
-panel[type="arrow"]:not([animate="false"]) {
-  -moz-window-transform: scale(.4);
-  -moz-window-opacity: 0;
-  transition-property: -moz-window-transform, -moz-window-opacity;
-  transition-duration: 0.15s;
-  transition-timing-function: ease-out;
-}
-
-panel[type="arrow"][animate="open"] {
-  -moz-window-transform: none;
-  -moz-window-opacity: 1.0;
-}
-
-panel[type="arrow"][animate="cancel"] {
-  -moz-window-transform: none;
-}
-
-panel[arrowposition="after_start"]:-moz-locale-dir(ltr),
-panel[arrowposition="after_end"]:-moz-locale-dir(rtl) {
-  -moz-window-transform-origin: 20px top;
-}
-
-panel[arrowposition="after_end"]:-moz-locale-dir(ltr),
-panel[arrowposition="after_start"]:-moz-locale-dir(rtl) {
-  -moz-window-transform-origin: calc(100% - 20px) top;
-}
-
-panel[arrowposition="before_start"]:-moz-locale-dir(ltr),
-panel[arrowposition="before_end"]:-moz-locale-dir(rtl) {
-  -moz-window-transform-origin: 20px bottom;
-}
-
-panel[arrowposition="before_end"]:-moz-locale-dir(ltr),
-panel[arrowposition="before_start"]:-moz-locale-dir(rtl) {
-  -moz-window-transform-origin: calc(100% - 20px) bottom;
-}
-
-panel[arrowposition="start_before"]:-moz-locale-dir(ltr),
-panel[arrowposition="end_before"]:-moz-locale-dir(rtl) {
-  -moz-window-transform-origin: right 20px;
-}
-
-panel[arrowposition="start_after"]:-moz-locale-dir(ltr),
-panel[arrowposition="end_after"]:-moz-locale-dir(rtl) {
-  -moz-window-transform-origin: right calc(100% - 20px);
-}
-
-panel[arrowposition="end_before"]:-moz-locale-dir(ltr),
-panel[arrowposition="start_before"]:-moz-locale-dir(rtl) {
-  -moz-window-transform-origin: left 20px;
-}
-
-panel[arrowposition="end_after"]:-moz-locale-dir(ltr),
-panel[arrowposition="start_after"]:-moz-locale-dir(rtl) {
-  -moz-window-transform-origin: left calc(100% - 20px);
-}
-
-%elifndef MOZ_WIDGET_GTK
-
-panel[type="arrow"]:not([animate="false"]) {
-  transform: scale(.4);
-  opacity: 0;
-  transition-property: transform, opacity;
-  transition-duration: 0.15s;
-  transition-timing-function: ease-out;
-}
-
-panel[type="arrow"][animate="open"] {
-  transform: none;
-  opacity: 1.0;
-}
-
-panel[type="arrow"][animate="cancel"] {
-  transform: none;
-}
-
-panel[arrowposition="after_start"]:-moz-locale-dir(ltr),
-panel[arrowposition="after_end"]:-moz-locale-dir(rtl) {
-  transform-origin: 20px top;
-}
-
-panel[arrowposition="after_end"]:-moz-locale-dir(ltr),
-panel[arrowposition="after_start"]:-moz-locale-dir(rtl) {
-  transform-origin: calc(100% - 20px) top;
-}
-
-panel[arrowposition="before_start"]:-moz-locale-dir(ltr),
-panel[arrowposition="before_end"]:-moz-locale-dir(rtl) {
-  transform-origin: 20px bottom;
-}
-
-panel[arrowposition="before_end"]:-moz-locale-dir(ltr),
-panel[arrowposition="before_start"]:-moz-locale-dir(rtl) {
-  transform-origin: calc(100% - 20px) bottom;
-}
-
-panel[arrowposition="start_before"]:-moz-locale-dir(ltr),
-panel[arrowposition="end_before"]:-moz-locale-dir(rtl) {
-  transform-origin: right 20px;
-}
-
-panel[arrowposition="start_after"]:-moz-locale-dir(ltr),
-panel[arrowposition="end_after"]:-moz-locale-dir(rtl) {
-  transform-origin: right calc(100% - 20px);
-}
-
-panel[arrowposition="end_before"]:-moz-locale-dir(ltr),
-panel[arrowposition="start_before"]:-moz-locale-dir(rtl) {
-  transform-origin: left 20px;
-}
-
-panel[arrowposition="end_after"]:-moz-locale-dir(ltr),
-panel[arrowposition="start_after"]:-moz-locale-dir(rtl) {
-  transform-origin: left calc(100% - 20px);
-}
-
-%endif
-%endif
-
 %ifdef XP_MACOSX
 .statusbar-resizerpanel {
   display: none;
 }
 %else
 window[sizemode="maximized"] statusbarpanel.statusbar-resizerpanel {
   visibility: collapse;
 }
--- a/toolkit/modules/AppConstants.jsm
+++ b/toolkit/modules/AppConstants.jsm
@@ -353,23 +353,16 @@ this.AppConstants = Object.freeze({
 
   HAVE_SHELL_SERVICE:
 #ifdef HAVE_SHELL_SERVICE
     true,
 #else
     false,
 #endif
 
-  MOZ_PHOTON_ANIMATIONS:
-#ifdef MOZ_PHOTON_ANIMATIONS
-    true,
-#else
-    false,
-#endif
-
   MOZ_PHOTON_PREFERENCES:
 #ifdef MOZ_PHOTON_PREFERENCES
     true,
 #else
     false,
 #endif
 
   MOZ_PHOTON_THEME:
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -505,28 +505,16 @@ project_flag('MOZ_SERVICES_SYNC',
 project_flag('MOZ_ANDROID_HISTORY',
              help='Enable Android History instead of Places',
              set_as_define=True)
 
 project_flag('MOZ_ALLOW_LEGACY_EXTENSIONS',
              help='Allow legacy browser extensions',
              default=True, set_as_define=True)
 
-option(env='MOZ_PHOTON_ANIMATIONS',
-       help='Enable Photon UI animations',
-       default=milestone.is_nightly)
-
-@depends('MOZ_PHOTON_ANIMATIONS')
-def photon_animations(value):
-    if value:
-        return bool(value)
-
-set_config('MOZ_PHOTON_ANIMATIONS', photon_animations)
-set_define('MOZ_PHOTON_ANIMATIONS', photon_animations)
-
 option(env='MOZ_PHOTON_PREFERENCES',
        help='Enable Photon preferences',
        default=milestone.is_nightly)
 
 @depends('MOZ_PHOTON_PREFERENCES')
 def photon_preferences(value):
     if value:
         return bool(value)