Revert of Make a pen in eraser mode visible thru PointerEvent.buttons

components/test_runner/event_sender.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/test_runner/event_sender.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 45 matching lines @@
 using blink::WebTouchEvent;
 using blink::WebTouchPoint;
 using blink::WebVector;
 using blink::WebView;
 
 namespace test_runner {
 
 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.
 bool getPointerType(gin::Arguments* args,
                     bool isOnlyMouseAndPenAllowed,
                     WebPointerProperties::PointerType& pointerType) {
   if (args->PeekNext().IsEmpty())
     return true;
   std::string pointer_type_string;
   if (!args->GetNext(&pointer_type_string)) {
     args->ThrowError();
     return false;
   }
   if (isOnlyMouseAndPenAllowed &&
       (pointer_type_string == kPointerTypeStringUnknown ||
        pointer_type_string == kPointerTypeStringTouch)) {
     args->ThrowError();
     return false;
   }
   if (pointer_type_string == kPointerTypeStringUnknown) {
     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;
   }
   return true;
 }
 
 // Parses |pointerType|, |rawPointerId|, |pressure|, |tiltX| and |tiltY| from
 // the provided |args|. Returns false if there was any error, assuming the last
 // 3 of the five parsed parameters are optional.
@@ skipping 61 matching lines @@
 int GetWebMouseEventModifierForButton(WebMouseEvent::Button button) {
   switch (button) {
     case WebMouseEvent::Button::NoButton:
       return 0;
     case WebMouseEvent::Button::Left:
       return WebMouseEvent::LeftButtonDown;
     case WebMouseEvent::Button::Middle:
       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;
 }
 
 const int kButtonsInModifiers = WebMouseEvent::LeftButtonDown
     | WebMouseEvent::MiddleButtonDown | WebMouseEvent::RightButtonDown;
 
 int modifiersWithButtons(int modifiers, int buttons) {
   return (modifiers & ~kButtonsInModifiers)
@@ skipping 2683 matching lines @@
 }
 
 std::unique_ptr<WebInputEvent> EventSender::ScaleEvent(
     const WebInputEvent& event) {
   // ui::ScaleWebInputEvent returns nullptr when the scale is 1.0f as the event
   // does not have to be converted.
   return ui::ScaleWebInputEvent(event, delegate()->GetWindowToViewportScale());
 }
 
 }  // namespace test_runner