Added missing mouse back/forward button plumbing in Blink.
Also renamed the enum labels for these buttons from X1/X2 to
more intuitive back/forward.
We will need more OS-dependent work in future CLs. E.g. in
Linux, back/forward buttons still seems "muted".
BUG=567771
Review-Url: https://codereview.chromium.org/2763313002
Cr-Commit-Position: refs/heads/master@{#461181}
diff --git a/content/shell/test_runner/event_sender.cc b/content/shell/test_runner/event_sender.cc
index 28520a0f..33059b5 100644
--- a/content/shell/test_runner/event_sender.cc
+++ b/content/shell/test_runner/event_sender.cc
@@ -174,6 +174,10 @@
return WebMouseEvent::Button::Middle;
case 2:
return WebMouseEvent::Button::Right;
+ case 3:
+ return WebMouseEvent::Button::Back;
+ case 4:
+ return WebMouseEvent::Button::Forward;
}
NOTREACHED();
return WebMouseEvent::Button::NoButton;
@@ -189,8 +193,10 @@
return WebMouseEvent::MiddleButtonDown;
case WebMouseEvent::Button::Right:
return WebMouseEvent::RightButtonDown;
- case WebPointerProperties::Button::X1:
- case WebPointerProperties::Button::X2:
+ case WebPointerProperties::Button::Back:
+ return WebMouseEvent::BackButtonDown;
+ case WebPointerProperties::Button::Forward:
+ return WebMouseEvent::ForwardButtonDown;
case WebPointerProperties::Button::Eraser:
return 0; // Not implemented yet
}
@@ -198,9 +204,10 @@
return 0;
}
-const int kButtonsInModifiers = WebMouseEvent::LeftButtonDown |
- WebMouseEvent::MiddleButtonDown |
- WebMouseEvent::RightButtonDown;
+const int kButtonsInModifiers =
+ WebMouseEvent::LeftButtonDown | WebMouseEvent::MiddleButtonDown |
+ WebMouseEvent::RightButtonDown | WebMouseEvent::BackButtonDown |
+ WebMouseEvent::ForwardButtonDown;
int modifiersWithButtons(int modifiers, int buttons) {
return (modifiers & ~kButtonsInModifiers) | (buttons & kButtonsInModifiers);
@@ -289,6 +296,10 @@
return WebInputEvent::MiddleButtonDown;
} else if (!strcmp(characters, "rightButton")) {
return WebInputEvent::RightButtonDown;
+ } else if (!strcmp(characters, "backButton")) {
+ return WebInputEvent::BackButtonDown;
+ } else if (!strcmp(characters, "forwardButton")) {
+ return WebInputEvent::ForwardButtonDown;
} else if (!strcmp(characters, "capsLockOn")) {
return WebInputEvent::CapsLockOn;
} else if (!strcmp(characters, "numLockOn")) {
