Bug 1455007 - Temporarily disable the auto-dir feature for redefining the behaviour according to the feedbacks r?kats draft
authorZhang Junzhi <zjz@zjz.name>
Thu, 19 Apr 2018 03:33:23 +0800
changeset 784532 18b7c185faeb72961d9e62b7ff6feb32b4ceafc5
parent 784524 0e45c13b34e815cb42a9f08bb44142d1a81e186e
push id106962
push userbmo:zjz@zjz.name
push dateWed, 18 Apr 2018 19:33:47 +0000
reviewerskats
bugs1455007
milestone61.0a1
Bug 1455007 - Temporarily disable the auto-dir feature for redefining the behaviour according to the feedbacks r?kats MozReview-Commit-ID: A4E6yF9z94g
dom/events/EventStateManager.cpp
modules/libpref/init/all.js
--- a/dom/events/EventStateManager.cpp
+++ b/dom/events/EventStateManager.cpp
@@ -279,21 +279,17 @@ nsWeakPtr EventStateManager::sPointerLoc
 nsWeakPtr EventStateManager::sPointerLockedDoc;
 nsCOMPtr<nsIContent> EventStateManager::sDragOverContent = nullptr;
 TimeStamp EventStateManager::sLatestUserInputStart;
 TimeStamp EventStateManager::sHandlingInputStart;
 
 EventStateManager::WheelPrefs*
   EventStateManager::WheelPrefs::sInstance = nullptr;
 bool EventStateManager::WheelPrefs::sWheelEventsEnabledOnPlugins = true;
-#ifdef EARLY_BETA_OR_EARLIER
-bool EventStateManager::WheelPrefs::sIsAutoDirEnabled = true;
-#else
 bool EventStateManager::WheelPrefs::sIsAutoDirEnabled = false;
-#endif
 bool EventStateManager::WheelPrefs::sHonoursRootForAutoDir = false;
 EventStateManager::DeltaAccumulator*
   EventStateManager::DeltaAccumulator::sInstance = nullptr;
 
 EventStateManager::EventStateManager()
   : mLockCursor(0)
   , mLastFrameConsumedSetCursor(false)
   , mCurrentTarget(nullptr)
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -2670,21 +2670,17 @@ pref("mousewheel.min_line_scroll_amount"
 
 // Auto-dir is a feature which treats any single-wheel scroll as a scroll in the
 // only one scrollable direction if the target has only one scrollable
 // direction. For example, if the user scrolls a vertical wheel inside a target
 // which is horizontally scrollable but vertical unscrollable, then the vertical
 // scroll is converted to a horizontal scroll for that target.
 // Note that auto-dir only takes effect for |mousewheel.*.action|s and
 // |mousewheel.*.action.override_x|s whose values are 1.
-#ifdef EARLY_BETA_OR_EARLIER
-pref("mousewheel.autodir.enabled", true);
-#else
 pref("mousewheel.autodir.enabled", false);
-#endif
 // When a wheel scroll is converted due to auto-dir, which side the converted
 // scroll goes towards is decided by one thing called "honoured target". If the
 // content of the honoured target horizontally starts from right to left, then
 // an upward scroll maps to a rightward scroll and a downward scroll maps to a
 // leftward scroll; otherwise, an upward scroll maps to a leftward scroll and a
 // downward scroll maps to a rightward scroll.
 // If this pref is set to false, then consider the scrolling target as the
 // honoured target.