pepper: Report proper touch end event for lifting stylus

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 81 matching lines @@
       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: {
-        const WebMouseEvent& mouse_event =
-            static_cast<const WebMouseEvent&>(event);
-        return (mouse_event.modifiers & blink::WebInputEvent::LeftButtonDown)
-                   ? PP_INPUTEVENT_TYPE_TOUCHMOVE
-                   : PP_INPUTEVENT_TYPE_UNDEFINED;
-      }
+      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:
@@ skipping 94 matching lines @@
     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;
 
-  if (mouse_event.modifiers & blink::WebInputEvent::LeftButtonDown &&
-      (mouse_event.type == WebInputEvent::MouseDown ||
-       mouse_event.type == WebInputEvent::MouseMove)) {
-    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;
+  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.changed_touches.push_back(touch_point);
-    result.target_touches.push_back(touch_point);
-  }
 
-  if (result.event_type != PP_INPUTEVENT_TYPE_UNDEFINED)
-    result_events->push_back(result);
+  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");
@@ skipping 575 matching lines @@
       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