Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 21:18:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D80332
This commit is contained in:
Kagami Sascha Rosylight 2020-06-22 22:54:07 +00:00
parent 166f2891a2
commit 994a3b64f9
12 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/base/nsContentUtils.cpp
View File

@ -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:

2
dom/events/PointerEventHandler.cpp
View File

@ -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();

2
dom/html/HTMLInputElement.cpp
View File

@ -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();

2
gfx/layers/apz/src/APZCTreeManager.cpp
View File

@ -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,

4
widget/EventForwards.h
View File

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

4
widget/MouseEvents.h
View File

@ -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);

4
widget/android/nsWindow.cpp
View File

@ -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;

4
widget/cocoa/nsChildView.mm
View File

@ -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;

25
widget/gtk/nsGtkKeyUtils.cpp
View File

@ -1065,26 +1065,27 @@ 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,
("%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::eRightFlag),
GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::eMiddleFlag),
GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::e4thFlag),
GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::e5thFlag)));
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::ePrimaryFlag),
GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::eSecondaryFlag),
GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::eMiddleFlag),
GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::e4thFlag),
GetBoolName(mouseEvent.mButtons & MouseButtonsFlag::e5thFlag)));
}
}

4
widget/windows/KeyboardLayout.cpp
View File

@ -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;

4
widget/windows/TSFTextStore.cpp
View File

@ -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";
}

4
widget/windows/nsWindow.cpp
View File

@ -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::eRightFlag
? MouseButtonsFlag::ePrimaryFlag
: MouseButtonsFlag::eSecondaryFlag
: MouseButtonsFlag::eNoButtons;
WinPointerInfo pointerInfo(pointerId, penInfo.tiltX, penInfo.tiltY, pressure,
buttons);