Fixed missing pointerTypes for touch events.

third_party/WebKit/Source/web/WebInputEventConversion.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 491 matching lines @@
             break;
         case RightButton:
             modifiers |= WebInputEvent::RightButtonDown;
             break;
         }
     } else
         button = WebMouseEvent::ButtonNone;
     movementX = event.movementX();
     movementY = event.movementY();
     clickCount = event.detail();
+
+    pointerType = WebPointerProperties::PointerType::Mouse;
 }
 
 // Generate a synthetic WebMouseEvent given a TouchEvent (eg. for emulating a mouse
 // with touch input for plugins that don't support touch input).
 WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const LayoutObject* layoutObject, const TouchEvent& event)
 {
     if (!event.touches())
         return;
     if (event.touches()->length() != 1) {
         if (event.touches()->length() || event.type() != EventTypeNames::touchend || !event.changedTouches() || event.changedTouches()->length() != 1)
@@ skipping 28 matching lines @@
     windowX = pointInRootFrame.x();
     windowY = pointInRootFrame.y();
 
     button = WebMouseEvent::ButtonLeft;
     modifiers |= WebInputEvent::LeftButtonDown;
     clickCount = (type == MouseDown || type == MouseUp);
 
     IntPoint localPoint = convertAbsoluteLocationForLayoutObject(touch->absoluteLocation(), *layoutObject);
     x = localPoint.x();
     y = localPoint.y();
+
+    pointerType = WebPointerProperties::PointerType::Touch;
 }
 
 WebMouseWheelEventBuilder::WebMouseWheelEventBuilder(const Widget* widget, const LayoutObject* layoutObject, const WheelEvent& event)
 {
     if (event.type() != EventTypeNames::wheel && event.type() != EventTypeNames::mousewheel)
         return;
     type = WebInputEvent::MouseWheel;
     updateWebMouseEventFromCoreMouseEvent(event, widget, *layoutObject, *this);
     deltaX = -event.deltaX();
     deltaY = -event.deltaY();
@@ skipping 49 matching lines @@
     case PlatformEvent::Char:
         return WebInputEvent::Char;
     default:
         return WebInputEvent::Undefined;
     }
 }
 
 static WebTouchPoint toWebTouchPoint(const Touch* touch, const LayoutObject* layoutObject, WebTouchPoint::State state)
 {
     WebTouchPoint point;
+    point.pointerType = WebPointerProperties::PointerType::Touch;
     point.id = touch->identifier();
     point.screenPosition = touch->screenLocation();
     point.position = convertAbsoluteLocationForLayoutObjectFloat(touch->absoluteLocation(), *layoutObject);
     point.radiusX = touch->radiusX();
     point.radiusY = touch->radiusY();
     point.rotationAngle = touch->rotationAngle();
     point.force = touch->force();
     point.state = state;
     return point;
 }
@@ skipping 101 matching lines @@
         break;
     case GestureSourceTouchscreen:
         sourceDevice = WebGestureDeviceTouchscreen;
         break;
     case GestureSourceUninitialized:
         ASSERT_NOT_REACHED();
     }
 }
 
 } // namespace blink