Bug 1458783 - Back out the first patch in bug 1458063 (propagate wheel event modifiers in APZInputBridge::ReceiveInputEvent). r=kats draft
authorBotond Ballo <botond@mozilla.com>
Fri, 04 May 2018 12:21:49 -0400
changeset 791625 858c3848f00f8a4feafb6815ea578d380533cbd8
parent 791511 d07a4da682a2f8a2df811d8f0734a5a632213c9b
push id108854
push userbballo@mozilla.com
push dateFri, 04 May 2018 18:34:53 +0000
reviewerskats
bugs1458783, 1458063
milestone61.0a1
Bug 1458783 - Back out the first patch in bug 1458063 (propagate wheel event modifiers in APZInputBridge::ReceiveInputEvent). r=kats The patch in question is not strictly necessary to fix bug 1458063, and was causing intermittent failures. MozReview-Commit-ID: 1llW2BkmcXn
gfx/layers/apz/src/APZInputBridge.cpp
--- a/gfx/layers/apz/src/APZInputBridge.cpp
+++ b/gfx/layers/apz/src/APZInputBridge.cpp
@@ -130,18 +130,17 @@ APZInputBridge::ReceiveInputEvent(
         WheelDeltaHorizontalizer horizontalizer(wheelEvent);
         if (WheelDeltaAdjustmentStrategy::eHorizontalize == strategy) {
           horizontalizer.Horizontalize();
         }
 
         // If the wheel event becomes no-op event, don't handle it as scroll.
         if (wheelEvent.mDeltaX || wheelEvent.mDeltaY) {
           ScreenPoint origin(wheelEvent.mRefPoint.x, wheelEvent.mRefPoint.y);
-          ScrollWheelInput input(wheelEvent.mTime, wheelEvent.mTimeStamp,
-                                 wheelEvent.mModifiers,
+          ScrollWheelInput input(wheelEvent.mTime, wheelEvent.mTimeStamp, 0,
                                  scrollMode,
                                  ScrollWheelInput::DeltaTypeForDeltaMode(
                                                      wheelEvent.mDeltaMode),
                                  origin,
                                  wheelEvent.mDeltaX, wheelEvent.mDeltaY,
                                  wheelEvent.mAllowToOverrideSystemScrollSpeed,
                                  strategy);
           input.mAPZAction = action.value();