Bug 1297445 - Remove improper call to WidgetModifiersToDOMModifiers. r=botond
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 23 Aug 2016 13:02:10 -0400
changeset 311073 d237354d2c9ced3d5ba1790161b93e03714fcaf1
parent 311072 d1e75d7e9889a10c687d1148b8c298a1ee830b73
child 311074 ff6730673046bad6c4cb39d2055a45ec4a5781df
push id81034
push userryanvm@gmail.com
push dateThu, 25 Aug 2016 12:27:32 +0000
treeherdermozilla-inbound@87049fc2117f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbotond
bugs1297445
milestone51.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
Bug 1297445 - Remove improper call to WidgetModifiersToDOMModifiers. r=botond MozReview-Commit-ID: 6cB3s4aCmKQ
gfx/layers/apz/util/APZEventState.cpp
--- a/gfx/layers/apz/util/APZEventState.cpp
+++ b/gfx/layers/apz/util/APZEventState.cpp
@@ -249,17 +249,17 @@ APZEventState::ProcessLongTap(const nsCO
   }
 
   mContentReceivedInputBlockCallback(aGuid, aInputBlockId, eventHandled);
 
   if (eventHandled) {
     // Also send a touchcancel to content, so that listeners that might be
     // waiting for a touchend don't trigger.
     WidgetTouchEvent cancelTouchEvent(true, eTouchCancel, widget.get());
-    cancelTouchEvent.mModifiers = WidgetModifiersToDOMModifiers(aModifiers);
+    cancelTouchEvent.mModifiers = aModifiers;
     auto ldPoint = LayoutDeviceIntPoint::Round(aPoint * aScale);
     cancelTouchEvent.mTouches.AppendElement(new mozilla::dom::Touch(mLastTouchIdentifier,
         ldPoint, LayoutDeviceIntPoint(), 0, 0));
     APZCCallbackHelper::DispatchWidgetEvent(cancelTouchEvent);
   }
 }
 
 void