This patch implements Chromium's Aura gesture recognizer in terms of utouch-grail and utouch-frame …

ui/aura/event.h

 // 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.
 
 #ifndef UI_AURA_EVENT_H_
 #define UI_AURA_EVENT_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/event_types.h"
@@ skipping 276 matching lines @@
 class AURA_EXPORT ScrollEvent : public MouseEvent {
  public:
   explicit ScrollEvent(const base::NativeEvent& native_event);
   ScrollEvent(const ScrollEvent& model,
               Window* source,
               Window* target,
               ui::EventType type,
               int flags)
       : MouseEvent(model, source, target, type, flags),
         x_offset_(model.x_offset_),
-        y_offset_(model.y_offset_) {
-  }
+        y_offset_(model.y_offset_) {}
 
   float x_offset() const { return x_offset_; }
   float y_offset() const { return y_offset_; }
 
  private:
   float x_offset_;
   float y_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(ScrollEvent);
 };
 
 class AURA_EXPORT GestureEvent : public LocatedEvent {
  public:
+  struct Properties {

[tdresser, 2012/03/29 17:44:38]

If this is being refactored, we should update the GestureRecognizerAura at the
same time.

Currently, GestureSequence::AppendLongPressGestureEvent uses delta_x to store a
point id.

This struct should be extended with an int point_id, and the  GestureEvent
constructor which takes two floats should be removed.

+    Properties()
+        : delta_x(0.f),
+          delta_y(0.f),
+          scale_x(1.f),
+          scale_y(1.f) {
+    }
+
+    // For drag gestures
+    float delta_x;
+    float delta_y;
+
+    // For pinch gestures
+    float scale_x;
+    float scale_y;
+  };
+
   GestureEvent(ui::EventType type,
                int x,
                int y,
                int flags,
                base::Time time_stamp,
                float delta_x,
                float delta_y);
 
+  GestureEvent(ui::EventType type,
+               int x,
+               int y,
+               int flags,
+               base::Time time_stamp,
+               const Properties& properties);
+
   // Create a new TouchEvent which is identical to the provided model.
   // If source / target windows are provided, the model location will be
   // converted from |source| coordinate system to |target| coordinate system.
   GestureEvent(const GestureEvent& model, Window* source, Window* target);
 
-  float delta_x() const { return delta_x_; }
-  float delta_y() const { return delta_y_; }
+  float delta_x() const { return properties_.delta_x; }
+  float delta_y() const { return properties_.delta_y; }
+
+  float scale_x() const { return properties_.scale_x; }
+  float scale_y() const { return properties_.scale_y; }
+
+  const Properties& properties() const { return properties_; }
 
  private:
-  float delta_x_;
-  float delta_y_;
+  Properties properties_;
 
   DISALLOW_COPY_AND_ASSIGN(GestureEvent);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_EVENT_H_