Use touch events to report stylus events

content/renderer/pepper/event_conversion.cc

 // Copyright (c) 2012 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 "content/renderer/pepper/event_conversion.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
 
@@ skipping 63 matching lines @@
 static_assert(static_cast<int>(PP_INPUTEVENT_MODIFIER_NUMLOCKKEY) ==
                   static_cast<int>(WebInputEvent::NumLockOn),
               "NumLock should match");
 static_assert(static_cast<int>(PP_INPUTEVENT_MODIFIER_ISLEFT) ==
                   static_cast<int>(WebInputEvent::IsLeft),
               "IsLeft should match");
 static_assert(static_cast<int>(PP_INPUTEVENT_MODIFIER_ISRIGHT) ==
                   static_cast<int>(WebInputEvent::IsRight),
               "IsRight should match");
 
-bool IsStylusEvent(const WebInputEvent& event) {
-  switch (event.type) {
-    case WebInputEvent::MouseDown:
-    case WebInputEvent::MouseUp:
-    case WebInputEvent::MouseMove: {
-      const WebMouseEvent& mouse_event =
-          static_cast<const WebMouseEvent&>(event);
-      using PointerType = blink::WebPointerProperties::PointerType;
-      return mouse_event.pointerType == PointerType::Pen ||
-             mouse_event.pointerType == PointerType::Eraser;
-    }
-    default:
-      return false;
-  }
-}
-
 PP_InputEvent_Type ConvertEventTypes(const WebInputEvent& event) {
-  if (IsStylusEvent(event)) {
-    const WebMouseEvent& mouse_event = static_cast<const WebMouseEvent&>(event);
-    if (mouse_event.button != blink::WebMouseEvent::Button::Left &&
-        !(mouse_event.modifiers & blink::WebInputEvent::LeftButtonDown))
-      return PP_INPUTEVENT_TYPE_UNDEFINED;
-
-    switch (event.type) {
-      case WebInputEvent::MouseDown:
-        return PP_INPUTEVENT_TYPE_TOUCHSTART;
-      case WebInputEvent::MouseUp:
-        return PP_INPUTEVENT_TYPE_TOUCHEND;
-      case WebInputEvent::MouseMove:
-        return PP_INPUTEVENT_TYPE_TOUCHMOVE;
-      default:
-        return PP_INPUTEVENT_TYPE_UNDEFINED;
-    }
-  }
   switch (event.type) {
     case WebInputEvent::MouseDown:
       return PP_INPUTEVENT_TYPE_MOUSEDOWN;
     case WebInputEvent::MouseUp:
       return PP_INPUTEVENT_TYPE_MOUSEUP;
     case WebInputEvent::MouseMove:
       return PP_INPUTEVENT_TYPE_MOUSEMOVE;
     case WebInputEvent::MouseEnter:
       return PP_INPUTEVENT_TYPE_MOUSEENTER;
     case WebInputEvent::MouseLeave:
@@ skipping 84 matching lines @@
   while (!iter.end()) {
     InputEventData result = GetEventWithCommonFieldsAndType(event);
     result.event_modifiers = ConvertEventModifiers(key_event.modifiers);
     base::WriteUnicodeCharacter(iter.get(), &result.character_text);
 
     result_events->push_back(result);
     iter.Advance();
   }
 }
 
-void AppendStylusTouchEvent(const WebInputEvent& event,
-                            std::vector<InputEventData>* result_events) {
-  const WebMouseEvent& mouse_event = static_cast<const WebMouseEvent&>(event);
-
-  InputEventData result = GetEventWithCommonFieldsAndType(event);
-  result.event_modifiers = ConvertEventModifiers(event.modifiers);
-  if (result.event_type == PP_INPUTEVENT_TYPE_UNDEFINED)
-    return;
-
-  PP_TouchPoint touch_point;
-  touch_point.id = 0;
-  touch_point.position.x = mouse_event.x;
-  touch_point.position.y = mouse_event.y;
-  touch_point.pressure = mouse_event.force;
-
-  result.changed_touches.push_back(touch_point);
-  result.target_touches.push_back(touch_point);
-  if (result.event_type != PP_INPUTEVENT_TYPE_TOUCHEND)
-    result.touches.push_back(touch_point);
-
-  result_events->push_back(result);
-}
-
 void AppendMouseEvent(const WebInputEvent& event,
                       std::vector<InputEventData>* result_events) {
   static_assert(static_cast<int>(WebMouseEvent::Button::NoButton) ==
                     static_cast<int>(PP_INPUTEVENT_MOUSEBUTTON_NONE),
                 "MouseNone should match");
   static_assert(static_cast<int>(WebMouseEvent::Button::Left) ==
                     static_cast<int>(PP_INPUTEVENT_MOUSEBUTTON_LEFT),
                 "MouseLeft should match");
   static_assert(static_cast<int>(WebMouseEvent::Button::Right) ==
                     static_cast<int>(PP_INPUTEVENT_MOUSEBUTTON_RIGHT),
                 "MouseRight should match");
   static_assert(static_cast<int>(WebMouseEvent::Button::Middle) ==
                     static_cast<int>(PP_INPUTEVENT_MOUSEBUTTON_MIDDLE),
                 "MouseMiddle should match");
 
   const WebMouseEvent& mouse_event = static_cast<const WebMouseEvent&>(event);
   InputEventData result = GetEventWithCommonFieldsAndType(event);
   result.event_modifiers = ConvertEventModifiers(mouse_event.modifiers);
-  if (mouse_event.pointerType ==
-      blink::WebPointerProperties::PointerType::Pen) {
-    result.event_modifiers |= PP_INPUTEVENT_MODIFIER_ISPEN;
-  } else if (mouse_event.pointerType ==
-      blink::WebPointerProperties::PointerType::Eraser) {
-    result.event_modifiers |= PP_INPUTEVENT_MODIFIER_ISERASER;
-  }
   if (mouse_event.type == WebInputEvent::MouseDown ||
       mouse_event.type == WebInputEvent::MouseMove ||
       mouse_event.type == WebInputEvent::MouseUp) {
     result.mouse_button =
         static_cast<PP_InputEvent_MouseButton>(mouse_event.button);
   }
   result.mouse_position.x = mouse_event.x;
   result.mouse_position.y = mouse_event.y;
   result.mouse_click_count = mouse_event.clickCount;
   result.mouse_movement.x = mouse_event.movementX;
@@ skipping 47 matching lines @@
     result->push_back(pp_pt);
   }
 }
 
 void AppendTouchEvent(const WebInputEvent& event,
                       std::vector<InputEventData>* result_events) {
   const WebTouchEvent& touch_event =
       reinterpret_cast<const WebTouchEvent&>(event);
 
   InputEventData result = GetEventWithCommonFieldsAndType(event);
+
+  if (touch_event.touchesLength == 1) {
+    if (touch_event.touches[0].pointerType ==
+        blink::WebPointerProperties::PointerType::Pen) {
+      result.event_modifiers |= PP_INPUTEVENT_MODIFIER_ISPEN;
+    } else if (touch_event.touches[0].pointerType ==
+               blink::WebPointerProperties::PointerType::Eraser) {
+      result.event_modifiers |= PP_INPUTEVENT_MODIFIER_ISERASER;
+    }
+  }
+
   SetPPTouchPoints(
       touch_event.touches, touch_event.touchesLength, ACTIVE, &result.touches);
   SetPPTouchPoints(touch_event.touches,
                    touch_event.touchesLength,
                    CHANGED,
                    &result.changed_touches);
   SetPPTouchPoints(touch_event.touches,
                    touch_event.touchesLength,
                    ALL,
                    &result.target_touches);
@@ skipping 282 matching lines @@
                           std::vector<InputEventData>* result) {
   result->clear();
 
   switch (event.type) {
     case WebInputEvent::MouseDown:
     case WebInputEvent::MouseUp:
     case WebInputEvent::MouseMove:
     case WebInputEvent::MouseEnter:
     case WebInputEvent::MouseLeave:
     case WebInputEvent::ContextMenu:
-      if (IsStylusEvent(event)) {
-        AppendStylusTouchEvent(event, result);
-      } else {
-        AppendMouseEvent(event, result);
-      }
+      AppendMouseEvent(event, result);
       break;
     case WebInputEvent::MouseWheel:
       AppendMouseWheelEvent(event, result);
       break;
     case WebInputEvent::RawKeyDown:
     case WebInputEvent::KeyDown:
     case WebInputEvent::KeyUp:
       AppendKeyEvent(event, result);
       break;
     case WebInputEvent::Char:
@@ skipping 148 matching lines @@
 }
 
 PP_InputEvent_Class ClassifyInputEvent(const WebInputEvent& event) {
   switch (event.type) {
     case WebInputEvent::MouseDown:
     case WebInputEvent::MouseUp:
     case WebInputEvent::MouseMove:
     case WebInputEvent::MouseEnter:
     case WebInputEvent::MouseLeave:
     case WebInputEvent::ContextMenu:
-      if (IsStylusEvent(event)) {
-        return PP_INPUTEVENT_CLASS_TOUCH;
-      } else {
-        return PP_INPUTEVENT_CLASS_MOUSE;
-      }
+      return PP_INPUTEVENT_CLASS_MOUSE;
     case WebInputEvent::MouseWheel:
       return PP_INPUTEVENT_CLASS_WHEEL;
     case WebInputEvent::RawKeyDown:
     case WebInputEvent::KeyDown:
     case WebInputEvent::KeyUp:
     case WebInputEvent::Char:
       return PP_INPUTEVENT_CLASS_KEYBOARD;
     case WebInputEvent::TouchCancel:
     case WebInputEvent::TouchEnd:
     case WebInputEvent::TouchMove:
     case WebInputEvent::TouchStart:
       return PP_INPUTEVENT_CLASS_TOUCH;
     case WebInputEvent::TouchScrollStarted:
       return PP_InputEvent_Class(0);
     default:
       CHECK(WebInputEvent::isGestureEventType(event.type));
       return PP_InputEvent_Class(0);
   }
 }
 
 }  // namespace content