Add WebPointerProperties type.

public/web/WebInputEvent.h

 /*
  * 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 15 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebInputEvent_h
 #define WebInputEvent_h
 
 #include "../platform/WebCommon.h"
 #include "../platform/WebGestureDevice.h"
+#include "../platform/WebPointerProperties.h"
 #include "../platform/WebRect.h"
 #include "WebTouchPoint.h"
 
 #include <string.h>
 
 namespace blink {
 
 // The classes defined in this file are intended to be used with
 // WebWidget's handleInputEvent method.  These event types are cross-
 // platform and correspond closely to WebCore's Platform*Event classes.
@@ skipping 247 matching lines @@
     // Sets keyIdentifier based on the value of windowsKeyCode.  This is
     // handy for generating synthetic keyboard events.
     BLINK_EXPORT void setKeyIdentifierFromWindowsKeyCode();
 
     static int windowsKeyCodeWithoutLocation(int keycode);
     static int locationModifiersFromWindowsKeyCode(int keycode);
 };
 
 // WebMouseEvent --------------------------------------------------------------
 
-class WebMouseEvent : public WebInputEvent {
+class WebMouseEvent : public WebInputEvent, public WebPointerProperties {
 public:
-    enum Button {
-        ButtonNone = -1,
-        ButtonLeft,
-        ButtonMiddle,
-        ButtonRight
-    };
-
-    Button button;
     int x;
     int y;
     int windowX;
     int windowY;
     int globalX;
     int globalY;
     int movementX;
     int movementY;
     int clickCount;
 
     WebMouseEvent()
         : WebInputEvent(sizeof(WebMouseEvent))
-        , button(ButtonNone)
+        , WebPointerProperties()
         , x(0)
         , y(0)
         , windowX(0)
         , windowY(0)
         , globalX(0)
         , globalY(0)
         , movementX(0)
         , movementY(0)
         , clickCount(0)
     {
     }
 
 protected:
     explicit WebMouseEvent(unsigned sizeParam)
         : WebInputEvent(sizeParam)
-        , button(ButtonNone)
+        , WebPointerProperties()
         , x(0)
         , y(0)
         , windowX(0)
         , windowY(0)
         , globalX(0)
         , globalY(0)
         , movementX(0)
         , movementY(0)
         , clickCount(0)
     {
@@ skipping 163 matching lines @@
         , y(0)
         , globalX(0)
         , globalY(0)
     {
         memset(&data, 0, sizeof(data));
     }
 };
 
 // WebTouchEvent --------------------------------------------------------------
 
+// TODO(e_hakkinen): Replace with WebPointerEvent. crbug.com/508283
 class WebTouchEvent : public WebInputEvent {
 public:
     // Maximum number of simultaneous touches supported on
     // Ash/Aura.
     enum { touchesLengthCap = 16 };
 
     unsigned touchesLength;
     // List of all touches, regardless of state.
     WebTouchPoint touches[touchesLengthCap];
 
@@ skipping 19 matching lines @@
         , uniqueTouchEventId(0)
     {
     }
 };
 
 #pragma pack(pop)
 
 } // namespace blink
 
 #endif