Bug 1366060 - Disable the tab reordering animation if the cosmeticAnimations pref is disabled. r?gijs draft
authorJared Wein <jwein@mozilla.com>
Tue, 20 Jun 2017 17:41:35 -0400
changeset 597741 40ef0b1c070feec0e375d8da2e1b83e0de8016b3
parent 597455 464b2a3c25aa1065760d9ecbb0870bca4a66c62e
child 598363 26d34468c8b8af26a753b9fed0aeb1e4ddc3bc07
push id65010
push userbmo:jaws@mozilla.com
push dateTue, 20 Jun 2017 21:41:51 +0000
reviewersgijs
bugs1366060
milestone56.0a1
Bug 1366060 - Disable the tab reordering animation if the cosmeticAnimations pref is disabled. r?gijs MozReview-Commit-ID: 5YVZvt7dFJT
browser/base/content/tabbrowser.xml
--- a/browser/base/content/tabbrowser.xml
+++ b/browser/base/content/tabbrowser.xml
@@ -7034,17 +7034,18 @@
             newTranslateX -= tabWidth;
           }
 
           let dropIndex = "animDropIndex" in draggedTab._dragData &&
                           draggedTab._dragData.animDropIndex;
           if (dropIndex && dropIndex > draggedTab._tPos)
             dropIndex--;
 
-          if (oldTranslateX && oldTranslateX != newTranslateX) {
+          let animate = Services.prefs.getBoolPref("toolkit.cosmeticAnimations.enabled");
+          if (oldTranslateX && oldTranslateX != newTranslateX && animate) {
             draggedTab.setAttribute("tabdrop-samewindow", "true");
             draggedTab.style.transform = "translateX(" + newTranslateX + "px)";
             let onTransitionEnd = transitionendEvent => {
               if (transitionendEvent.propertyName != "transform" ||
                   transitionendEvent.originalTarget != draggedTab) {
                 return;
               }
               draggedTab.removeEventListener("transitionend", onTransitionEnd);