Bug 1643464 - Part 2: Rename eLeft/eRightFlag to ePrimary/eSecondaryFlag r=masayuki,geckoview-reviewers,agi

Differential Revision: https://phabricator.services.mozilla.com/D80332

dom/base/nsContentUtils.cpp

@@ -7745,11 +7745,11 @@ int16_t nsContentUtils::GetButtonsFlagForButton(int32_t aButton) {
     case -1:
       return MouseButtonsFlag::eNoButtons;
     case MouseButton::ePrimary:
-      return MouseButtonsFlag::eLeftFlag;
+      return MouseButtonsFlag::ePrimaryFlag;
     case MouseButton::eMiddle:
       return MouseButtonsFlag::eMiddleFlag;
     case MouseButton::eSecondary:
-      return MouseButtonsFlag::eRightFlag;
+      return MouseButtonsFlag::eSecondaryFlag;
     case 4:
       return MouseButtonsFlag::e4thFlag;
     case 5:

dom/events/PointerEventHandler.cpp

@@ -451,7 +451,7 @@ void PointerEventHandler::InitPointerEventFromTouch(
 
   int16_t buttons = aTouchEvent->mMessage == eTouchEnd
                         ? MouseButtonsFlag::eNoButtons
-                        : MouseButtonsFlag::eLeftFlag;
+                        : MouseButtonsFlag::ePrimaryFlag;
 
   aPointerEvent->mIsPrimary = aIsPrimary;
   aPointerEvent->pointerId = aTouch->Identifier();

dom/html/HTMLInputElement.cpp

@@ -4104,7 +4104,7 @@ void HTMLInputElement::PostHandleEventForRangeThumb(
       }
       if (aVisitor.mEvent->mMessage == eMouseDown) {
         if (aVisitor.mEvent->AsMouseEvent()->mButtons ==
-            MouseButtonsFlag::eLeftFlag) {
+            MouseButtonsFlag::ePrimaryFlag) {
           StartRangeThumbDrag(inputEvent);
         } else if (mIsDraggingRange) {
           CancelRangeThumbDrag();

gfx/layers/apz/src/APZCTreeManager.cpp

@@ -2128,7 +2128,7 @@ APZEventResult APZCTreeManager::ProcessTouchInputForScrollbarDrag(
   MouseInput mouseInput{MultiTouchTypeToMouseType(aTouchInput.mType),
                         MouseInput::LEFT_BUTTON,
                         dom::MouseEvent_Binding::MOZ_SOURCE_TOUCH,
-                        MouseButtonsFlag::eLeftFlag,
+                        MouseButtonsFlag::ePrimaryFlag,
                         aTouchInput.mTouches[0].mScreenPoint,
                         aTouchInput.mTime,
                         aTouchInput.mTimeStamp,

widget/EventForwards.h

@@ -447,8 +447,8 @@ enum MouseButton {
 
 enum MouseButtonsFlag {
   eNoButtons = 0x00,
-  eLeftFlag = 0x01,
+  ePrimaryFlag = 0x01,
-  eRightFlag = 0x02,
+  eSecondaryFlag = 0x02,
   eMiddleFlag = 0x04,
   // typicall, "back" button being left side of 5-button
   // mice, see "buttons" attribute document of DOM3 Events.

widget/MouseEvents.h

@@ -135,10 +135,10 @@ class WidgetMouseEventBase : public WidgetInputEvent {
   uint16_t mInputSource;
 
   bool IsLeftButtonPressed() const {
-    return !!(mButtons & MouseButtonsFlag::eLeftFlag);
+    return !!(mButtons & MouseButtonsFlag::ePrimaryFlag);
   }
   bool IsRightButtonPressed() const {
-    return !!(mButtons & MouseButtonsFlag::eRightFlag);
+    return !!(mButtons & MouseButtonsFlag::eSecondaryFlag);
   }
   bool IsMiddleButtonPressed() const {
     return !!(mButtons & MouseButtonsFlag::eMiddleFlag);

widget/android/nsWindow.cpp

@@ -579,10 +579,10 @@ class nsWindow::NPZCSupport final
     int16_t result = 0;
 
     if (buttons & java::sdk::MotionEvent::BUTTON_PRIMARY) {
-      result |= MouseButtonsFlag::eLeftFlag;
+      result |= MouseButtonsFlag::ePrimaryFlag;
     }
     if (buttons & java::sdk::MotionEvent::BUTTON_SECONDARY) {
-      result |= MouseButtonsFlag::eRightFlag;
+      result |= MouseButtonsFlag::eSecondaryFlag;
     }
     if (buttons & java::sdk::MotionEvent::BUTTON_TERTIARY) {
       result |= MouseButtonsFlag::eMiddleFlag;

widget/cocoa/nsChildView.mm

@@ -3631,10 +3631,10 @@ static gfx::IntPoint GetIntegerDeltaForEvent(NSEvent* aEvent) {
   NSUInteger mouseButtons = [NSEvent pressedMouseButtons];
 
   if (mouseButtons & 0x01) {
-    mouseEvent->mButtons |= MouseButtonsFlag::eLeftFlag;
+    mouseEvent->mButtons |= MouseButtonsFlag::ePrimaryFlag;
   }
   if (mouseButtons & 0x02) {
-    mouseEvent->mButtons |= MouseButtonsFlag::eRightFlag;
+    mouseEvent->mButtons |= MouseButtonsFlag::eSecondaryFlag;
   }
   if (mouseButtons & 0x04) {
     mouseEvent->mButtons |= MouseButtonsFlag::eMiddleFlag;

widget/gtk/nsGtkKeyUtils.cpp

@@ -1065,23 +1065,24 @@ void KeymapWrapper::InitInputEvent(WidgetInputEvent& aInputEvent,
   WidgetMouseEventBase& mouseEvent = *aInputEvent.AsMouseEventBase();
   mouseEvent.mButtons = 0;
   if (aModifierState & GDK_BUTTON1_MASK) {
-    mouseEvent.mButtons |= MouseButtonsFlag::eLeftFlag;
+    mouseEvent.mButtons |= MouseButtonsFlag::ePrimaryFlag;
   }
   if (aModifierState & GDK_BUTTON3_MASK) {
-    mouseEvent.mButtons |= MouseButtonsFlag::eRightFlag;
+    mouseEvent.mButtons |= MouseButtonsFlag::eSecondaryFlag;
   }
   if (aModifierState & GDK_BUTTON2_MASK) {
     mouseEvent.mButtons |= MouseButtonsFlag::eMiddleFlag;
   }
 
   if (doLog) {
-    MOZ_LOG(gKeymapWrapperLog, LogLevel::Debug,
+    MOZ_LOG(
+        gKeymapWrapperLog, LogLevel::Debug,
         ("%p InitInputEvent, aInputEvent has mButtons, "
          "aInputEvent.mButtons=0x%04X (Left: %s, Right: %s, Middle: %s, "
          "4th (BACK): %s, 5th (FORWARD): %s)",
          keymapWrapper, mouseEvent.mButtons,
-             GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::eLeftFlag),
+         GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::ePrimaryFlag),
-             GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::eRightFlag),
+         GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::eSecondaryFlag),
          GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::eMiddleFlag),
          GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::e4thFlag),
          GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::e5thFlag)));

widget/windows/KeyboardLayout.cpp

@@ -918,10 +918,10 @@ void ModifierKeyState::InitMouseEvent(WidgetInputEvent& aMouseEvent) const {
   WidgetMouseEventBase& mouseEvent = *aMouseEvent.AsMouseEventBase();
   mouseEvent.mButtons = 0;
   if (::GetKeyState(VK_LBUTTON) < 0) {
-    mouseEvent.mButtons |= MouseButtonsFlag::eLeftFlag;
+    mouseEvent.mButtons |= MouseButtonsFlag::ePrimaryFlag;
   }
   if (::GetKeyState(VK_RBUTTON) < 0) {
-    mouseEvent.mButtons |= MouseButtonsFlag::eRightFlag;
+    mouseEvent.mButtons |= MouseButtonsFlag::eSecondaryFlag;
   }
   if (::GetKeyState(VK_MBUTTON) < 0) {
     mouseEvent.mButtons |= MouseButtonsFlag::eMiddleFlag;

widget/windows/TSFTextStore.cpp

@@ -557,10 +557,10 @@ static nsCString GetMouseButtonsName(int16_t aButtons) {
     return NS_LITERAL_CSTRING("no buttons");
   }
   nsCString names;
-  if (aButtons & MouseButtonsFlag::eLeftFlag) {
+  if (aButtons & MouseButtonsFlag::ePrimaryFlag) {
     names = "LeftButton";
   }
-  if (aButtons & MouseButtonsFlag::eRightFlag) {
+  if (aButtons & MouseButtonsFlag::eSecondaryFlag) {
     ADD_SEPARATOR_IF_NECESSARY(names);
     names += "RightButton";
   }

widget/windows/nsWindow.cpp

@@ -8617,8 +8617,8 @@ bool nsWindow::OnPointerEvents(UINT msg, WPARAM aWParam, LPARAM aLParam) {
   // 1024. Convert it to float.
   float pressure = penInfo.pressure ? (float)penInfo.pressure / 1024 : 0;
   int16_t buttons = sPointerDown ? button == MouseButton::ePrimary
-                                       ? MouseButtonsFlag::eLeftFlag
+                                       ? MouseButtonsFlag::ePrimaryFlag
-                                       : MouseButtonsFlag::eRightFlag
+                                       : MouseButtonsFlag::eSecondaryFlag
                                  : MouseButtonsFlag::eNoButtons;
   WinPointerInfo pointerInfo(pointerId, penInfo.tiltX, penInfo.tiltY, pressure,
                              buttons);