Once 56 merges to Beta we won't need this flag anymore. Anything with #ifdef MOZ_PHOTON_ANIMATIONS should remain, though the surround conditional should be removed. Anything with #ifndef MOZ_PHOTON_ANIMATIONS should be removed as it won't apply anymore now that we don't need to support non-Photon builds.

Comment on attachment 8894557 [details] Bug 1385913 - Remove MOZ_PHOTON_ANIMATIONS ifdef. https://reviewboard.mozilla.org/r/165714/#review170890 ::: browser/components/downloads/content/indicatorOverlay.xul (Diff revision 1) > 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 You will also need to update this in the jar.mn file, see the try failures. There might be others like this.

Comment on attachment 8894557 [details] Bug 1385913 - Remove MOZ_PHOTON_ANIMATIONS ifdef. https://reviewboard.mozilla.org/r/165714/#review170890 > You will also need to update this in the jar.mn file, see the try failures. There might be others like this. Thanks for spotting that. I just checked the other files and no other jar.mn will need to be changed. Will re-push to Try anyways.

Comment on attachment 8894557 [details] Bug 1385913 - Remove MOZ_PHOTON_ANIMATIONS ifdef. https://reviewboard.mozilla.org/r/165714/#review170898 r=me assuming this trypush is luckier :-)

We're sorry, Autoland could not rebase your commits for you automatically. Please manually rebase your commits and try again. hg error in cmd: hg rebase -s d994650683fb -d 93c2fe5279fe: rebasing 411926:d994650683fb "Bug 1385913 - Remove MOZ_PHOTON_ANIMATIONS ifdef. r=Gijs" (tip) merging browser/base/content/browser-places.js merging browser/base/content/browser.js merging browser/components/customizableui/CustomizeMode.jsm merging browser/themes/shared/downloads/indicator.inc.css merging browser/themes/shared/toolbarbutton-icons.inc.css warning: conflicts while merging browser/themes/shared/downloads/indicator.inc.css! (edit, then use 'hg resolve --mark') unresolved conflicts (see hg resolve, then hg rebase --continue)

Pushed by jwein@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/bf5ee532b95d Remove MOZ_PHOTON_ANIMATIONS ifdef. r=Gijs