Break apart WebGestureEvent from WebInputEvent.

third_party/WebKit/public/platform/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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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 "WebCommon.h"
-#include "WebGestureDevice.h"
 #include "WebPointerProperties.h"
 #include "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-
@@ skipping 280 matching lines @@
   // longer.
   WebUChar text[textLengthCap];
   WebUChar unmodifiedText[textLengthCap];
 
   WebKeyboardEvent()
       : WebInputEvent(sizeof(WebKeyboardEvent)),
         windowsKeyCode(0),
         nativeKeyCode(0),
         isSystemKey(false),
         isBrowserShortcut(false) {
-    memset(&text, 0, sizeof(text));
-    memset(&unmodifiedText, 0, sizeof(unmodifiedText));
   }
 
   // Please refer to bug http://b/issue?id=961192, which talks about Webkit
   // keyboard event handling changes. It also mentions the list of keys
   // which don't have associated character events.
   bool isCharacterKey() const {
     // TODO(dtapuska): Determine if we can remove this method and just
     // not actually generate events for these instead of filtering them out.
     switch (windowsKeyCode) {
       case 0x08:  // VK_BACK
@@ skipping 105 matching lines @@
         accelerationRatioY(1.0f),
         resendingPluginId(-1),
         phase(PhaseNone),
         momentumPhase(PhaseNone),
         scrollByPage(false),
         hasPreciseScrollingDeltas(false),
         railsMode(RailsModeFree),
         dispatchType(Blocking) {}
 };
 
-// WebGestureEvent ---------------------------------------------------------
-
-class WebGestureEvent : public WebInputEvent {
- public:
-  enum ScrollUnits {
-    PrecisePixels = 0,  // generated by high precision devices.
-    Pixels,             // large pixel jump duration; should animate to delta.
-    Page                // page (visible viewport) based scrolling.
-  };
-
-  enum InertialPhaseState {
-    UnknownMomentumPhase = 0,  // No phase information.
-    NonMomentumPhase,          // Regular scrolling phase.
-    MomentumPhase,             // Momentum phase.
-  };
-
-  int x;
-  int y;
-  int globalX;
-  int globalY;
-  WebGestureDevice sourceDevice;
-
-  // If the WebGestureEvent has sourceDevice=WebGestureDeviceTouchscreen, this
-  // field contains the unique identifier for the touch event that released
-  // this event at TouchDispositionGestureFilter. If the WebGestureEvents was
-  // not released through a touch event (e.g. timer-released gesture events or
-  // gesture events with sourceDevice!=WebGestureDeviceTouchscreen), the field
-  // contains 0. See crbug.com/618738.
-  uint32_t uniqueTouchEventId;
-
-  // This field exists to allow BrowserPlugin to mark GestureScroll events as
-  // 'resent' to handle the case where an event is not consumed when first
-  // encountered; it should be handled differently by the plugin when it is
-  // sent for thesecond time. No code within Blink touches this, other than to
-  // plumb it through event conversions.
-  int resendingPluginId;
-
-  union {
-    // Tap information must be set for GestureTap, GestureTapUnconfirmed,
-    // and GestureDoubleTap events.
-    struct {
-      int tapCount;
-      float width;
-      float height;
-    } tap;
-
-    struct {
-      float width;
-      float height;
-    } tapDown;
-
-    struct {
-      float width;
-      float height;
-    } showPress;
-
-    struct {
-      float width;
-      float height;
-    } longPress;
-
-    struct {
-      float firstFingerWidth;
-      float firstFingerHeight;
-    } twoFingerTap;
-
-    struct {
-      // Initial motion that triggered the scroll.
-      // May be redundant with deltaX/deltaY in the first scrollUpdate.
-      float deltaXHint;
-      float deltaYHint;
-      // Default initialized to ScrollUnits::PrecisePixels.
-      ScrollUnits deltaHintUnits;
-      // If true, this event will skip hit testing to find a scroll
-      // target and instead just scroll the viewport.
-      bool targetViewport;
-      // The state of inertial phase scrolling. OSX has unique phases for normal
-      // and momentum scroll events. Should always be UnknownMomentumPhase for
-      // touch based input as it generates GestureFlingStart instead.
-      InertialPhaseState inertialPhase;
-      // True if this event was synthesized in order to force a hit test;
-      // avoiding scroll latching behavior until crbug.com/526463 is fully
-      // implemented.
-      bool synthetic;
-
-      // number of pointers down.
-      int pointerCount;
-    } scrollBegin;
-
-    struct {
-      float deltaX;
-      float deltaY;
-      float velocityX;
-      float velocityY;
-      // Whether any previous GestureScrollUpdate in the current scroll
-      // sequence was suppressed (e.g., the causal touchmove was
-      // preventDefault'ed). This bit is particularly useful for
-      // determining whether the observed scroll update sequence captures
-      // the entirety of the generative motion.
-      bool previousUpdateInSequencePrevented;
-      bool preventPropagation;
-      InertialPhaseState inertialPhase;
-      // Default initialized to ScrollUnits::PrecisePixels.
-      ScrollUnits deltaUnits;
-    } scrollUpdate;
-
-    struct {
-      // The original delta units the scrollBegin and scrollUpdates
-      // were sent as.
-      ScrollUnits deltaUnits;
-      // The state of inertial phase scrolling. OSX has unique phases for normal
-      // and momentum scroll events. Should always be UnknownMomentumPhase for
-      // touch based input as it generates GestureFlingStart instead.
-      InertialPhaseState inertialPhase;
-      // True if this event was synthesized in order to generate the proper
-      // GSB/GSU/GSE matching sequences. This is a temporary so that a future
-      // GSB will generate a hit test so latching behavior is avoided
-      // until crbug.com/526463 is fully implemented.
-      bool synthetic;
-    } scrollEnd;
-
-    struct {
-      float velocityX;
-      float velocityY;
-      // If true, this event will skip hit testing to find a scroll
-      // target and instead just scroll the viewport.
-      bool targetViewport;
-    } flingStart;
-
-    struct {
-      // If set to true, don't treat flingCancel
-      // as a part of fling boost events sequence.
-      bool preventBoosting;
-    } flingCancel;
-
-    struct {
-      bool zoomDisabled;
-      float scale;
-    } pinchUpdate;
-  } data;
-
-  WebGestureEvent()
-      : WebInputEvent(sizeof(WebGestureEvent)),
-        x(0),
-        y(0),
-        globalX(0),
-        globalY(0),
-        sourceDevice(WebGestureDeviceUninitialized),
-        resendingPluginId(-1) {
-    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 { kTouchesLengthCap = 16 };
 
@@ skipping 25 matching lines @@
         movedBeyondSlopRegion(false),
         touchStartOrFirstTouchMove(false),
         uniqueTouchEventId(0) {}
 };
 
 #pragma pack(pop)
 
 }  // namespace blink
 
 #endif