author | Kartikaya Gupta <kgupta@mozilla.com> |
Mon, 06 Jul 2015 14:10:35 -0400 | |
changeset 251584 | fce4e030bd712e91e3090728ebd2742407501a09 |
parent 251583 | a70570dbb15518818b74d63768e159482da97e2b |
child 251585 | 9d8209f754dfba60033461b65508066c76609928 |
push id | 29007 |
push user | ryanvm@gmail.com |
push date | Tue, 07 Jul 2015 18:38:06 +0000 |
treeherder | mozilla-central@9340658848d1 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mstange |
bugs | 1180780 |
milestone | 42.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/gfx/layers/apz/src/APZCTreeManager.cpp +++ b/gfx/layers/apz/src/APZCTreeManager.cpp @@ -935,25 +935,19 @@ APZCTreeManager::ProcessWheelEvent(Widge // APZ. If this returns true, the event must not perform a synchronous // scroll. // // Even if this returns false, all wheel events in APZ-aware widgets must // be sent through APZ so they are transformed correctly for TabParent. static bool WillHandleWheelEvent(WidgetWheelEvent* aEvent) { - // Only support pixel units on OS X for now because it causes more test - // failures when APZ is turned on, and we want to do that on Windows very - // soon. return EventStateManager::WheelEventIsScrollAction(aEvent) && (aEvent->deltaMode == nsIDOMWheelEvent::DOM_DELTA_LINE -#ifdef XP_MACOSX - || aEvent->deltaMode == nsIDOMWheelEvent::DOM_DELTA_PIXEL -#endif - ) && + || aEvent->deltaMode == nsIDOMWheelEvent::DOM_DELTA_PIXEL) && !EventStateManager::WheelEventNeedsDeltaMultipliers(aEvent); } nsEventStatus APZCTreeManager::ReceiveInputEvent(WidgetInputEvent& aEvent, ScrollableLayerGuid* aOutTargetGuid, uint64_t* aOutInputBlockId) {