Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Unified Diff: components/test_runner/event_sender.cc

Issue 2314093002: Revert of Make a pen in eraser mode visible thru PointerEvent.buttons (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/fast/events/pointerevents/mouse-pointer-event-properties.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/test_runner/event_sender.cc
diff --git a/components/test_runner/event_sender.cc b/components/test_runner/event_sender.cc
index 44aba8039829818bccdbb6f4e9bcbd58e5d162ca..e11fc9eea97782ec6ac3890b69a64330d8dff9ec 100644
--- a/components/test_runner/event_sender.cc
+++ b/components/test_runner/event_sender.cc
@@ -63,11 +63,10 @@
namespace {
const int kRawMousePointerId = -1;
-const char* const kPointerTypeStringUnknown = "";
-const char* const kPointerTypeStringMouse = "mouse";
-const char* const kPointerTypeStringTouch = "touch";
-const char* const kPointerTypeStringPen = "pen";
-const char* const kPointerTypeStringEraser = "eraser";
+const char* kPointerTypeStringUnknown = "";
+const char* kPointerTypeStringMouse = "mouse";
+const char* kPointerTypeStringPen = "pen";
+const char* kPointerTypeStringTouch = "touch";
// Assigns |pointerType| from the provided |args|. Returns false if there was
// any error.
@@ -91,12 +90,10 @@
pointerType = WebMouseEvent::PointerType::Unknown;
} else if (pointer_type_string == kPointerTypeStringMouse) {
pointerType = WebMouseEvent::PointerType::Mouse;
+ } else if (pointer_type_string == kPointerTypeStringPen) {
+ pointerType = WebMouseEvent::PointerType::Pen;
} else if (pointer_type_string == kPointerTypeStringTouch) {
pointerType = WebMouseEvent::PointerType::Touch;
- } else if (pointer_type_string == kPointerTypeStringPen) {
- pointerType = WebMouseEvent::PointerType::Pen;
- } else if (pointer_type_string == kPointerTypeStringEraser) {
- pointerType = WebMouseEvent::PointerType::Eraser;
} else {
args->ThrowError();
return false;
@@ -178,10 +175,6 @@
return WebMouseEvent::MiddleButtonDown;
case WebMouseEvent::Button::Right:
return WebMouseEvent::RightButtonDown;
- case WebPointerProperties::Button::X1:
- case WebPointerProperties::Button::X2:
- case WebPointerProperties::Button::Eraser:
- return 0; // Not implemented yet
}
NOTREACHED();
return 0;
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/fast/events/pointerevents/mouse-pointer-event-properties.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698