Bug 1381736 - Fix modifier masks for APZ keyboard shortcuts. r=masayuki
authorRyan Hunt <rhunt@eqrion.net>
Tue, 18 Jul 2017 02:03:14 -0400
changeset 418448 6d68d842f601c310626d2ccedab94b38da321b72
parent 418447 f15bf893f71fb75f4c8c4b3a17994c5531408368
child 418449 5b0d1fdf2d20b75caf46d07af956ba5251674359
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmasayuki
bugs1381736
milestone56.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 1381736 - Fix modifier masks for APZ keyboard shortcuts. r=masayuki MozReview-Commit-ID: LGQzHabEqrz
dom/xbl/nsXBLPrototypeHandler.cpp
--- a/dom/xbl/nsXBLPrototypeHandler.cpp
+++ b/dom/xbl/nsXBLPrototypeHandler.cpp
@@ -153,18 +153,18 @@ nsXBLPrototypeHandler::TryConvertToKeybo
     eventType = KeyboardInput::KEY_PRESS;
   } else if (mEventName == nsGkAtoms::keyup) {
     eventType = KeyboardInput::KEY_UP;
   } else {
     return false;
   }
 
   // Convert the modifiers
-  Modifiers modifiersMask = GetModifiers();
-  Modifiers modifiers = GetModifiersMask();
+  Modifiers modifiersMask = GetModifiersMask();
+  Modifiers modifiers = GetModifiers();
 
   // Mask away any bits that won't be compared
   modifiers &= modifiersMask;
 
   // Convert the keyCode or charCode
   uint32_t keyCode;
   uint32_t charCode;