Merge 142571

Source/WebKit/chromium/public/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 389 matching lines @@
 
     int x;
     int y;
     int globalX;
     int globalY;
     SourceDevice sourceDevice;
 
     union {
         struct {
             int tapCount;
-            int width;
-            int height;
+            float width;
+            float height;
         } tap;
 
         struct {
-            int width;
-            int height;
+            float width;
+            float height;
         } tapDown;
 
         struct {
-            int width;
-            int height;
+            float width;
+            float height;
         } longPress;
 
         struct {
-            int firstFingerWidth;
-            int firstFingerHeight;
+            float firstFingerWidth;
+            float firstFingerHeight;
         } twoFingerTap;
 
         struct {
             float deltaX;
             float deltaY;
             float velocityX;
             float velocityY;
         } scrollUpdate;
 
         struct {
             float velocityX;
             float velocityY;
             // FIXME: Remove this when Chromium uses the top-level field.
             SourceDevice sourceDevice;
         } flingStart;
 
         struct {
             float scale;
         } pinchUpdate;
-    } data; 
+    } data;
 
     WebGestureEvent(unsigned sizeParam = sizeof(WebGestureEvent))
         : WebInputEvent(sizeParam)
         , x(0)
         , y(0)
         , globalX(0)
         , globalY(0)
     {
-      memset(&data, 0, sizeof(data)); 
+        memset(&data, 0, sizeof(data));
     }
 };
 
 // WebTouchEvent --------------------------------------------------------------
 
 class WebTouchEvent : public WebInputEvent {
 public:
     // Maximum number of simultaneous touches supported on
     // Ash/Aura.
     enum { touchesLengthCap = 12 };
@@ skipping 17 matching lines @@
         , targetTouchesLength(0)
     {
     }
 };
 
 #pragma pack(pop)
 
 } // namespace WebKit
 
 #endif