Fix scaling for aura::GestureEvent and aura::TouchEvent

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/compiler_specific.h"
@@ skipping 94 matching lines @@
     LocatedEvent* located_event_;
   };
 
   virtual ~LocatedEvent();
 
   int x() const { return location_.x(); }
   int y() const { return location_.y(); }
   gfx::Point location() const { return location_; }
   gfx::Point root_location() const { return root_location_; }
 
-  // Applies the |root_transform| to both |location_| and |root_location_|.
-  void UpdateForRootTransform(const ui::Transform& root_transform);
+  // Applies |root_transform| to the event.
+  // This is applied to both |location_| and |root_location_|.
+  virtual void UpdateForRootTransform(const ui::Transform& root_transform);
 
  protected:
   explicit LocatedEvent(const base::NativeEvent& native_event);
 
   // Create a new LocatedEvent 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.
   LocatedEvent(const LocatedEvent& model, Window* source, Window* target);
 
   // Used for synthetic events in testing.
@@ skipping 70 matching lines @@
              base::TimeDelta time_stamp);
 
   virtual ~TouchEvent();
 
   int touch_id() const { return touch_id_; }
   float radius_x() const { return radius_x_; }
   float radius_y() const { return radius_y_; }
   float rotation_angle() const { return rotation_angle_; }
   float force() const { return force_; }
 
+  // Overridden from LocatedEvent.
+  virtual void UpdateForRootTransform(
+      const ui::Transform& root_transform) OVERRIDE;
+
   // Overridden from ui::TouchEvent.
   virtual ui::EventType GetEventType() const OVERRIDE;
   virtual gfx::Point GetLocation() const OVERRIDE;
   virtual int GetTouchId() const OVERRIDE;
   virtual int GetEventFlags() const OVERRIDE;
   virtual base::TimeDelta GetTimestamp() const OVERRIDE;
   virtual TouchEvent* Copy() const OVERRIDE;
 
  private:
   // The identity (typically finger) of the touch starting at 0 and incrementing
   // for each separable additional touch that the hardware can detect.
   const int touch_id_;
 
   // Radius of the X (major) axis of the touch ellipse. 1.0 if unknown.
-  const float radius_x_;
+  float radius_x_;
 
   // Radius of the Y (minor) axis of the touch ellipse. 1.0 if unknown.
-  const float radius_y_;
+  float radius_y_;
 
   // Angle of the major axis away from the X axis. Default 0.0.
   const float rotation_angle_;
 
   // Force (pressure) of the touch. Normalized to be [0, 1]. Default to be 0.0.
   const float force_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchEvent);
 };
 
@@ skipping 126 matching lines @@
   // 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);
 
   virtual ~GestureEvent();
 
   float delta_x() const { return delta_x_; }
   float delta_y() const { return delta_y_; }
 
+  // Overridden from LocatedEvent.
+  virtual void UpdateForRootTransform(
+      const ui::Transform& root_transform) OVERRIDE;
+
   // Returns the lowest touch-id of any of the touches which make up this
   // gesture.
   // If there are no touches associated with this gesture, returns -1.
   virtual int GetLowestTouchId() const OVERRIDE;
 
  private:
   float delta_x_;
   float delta_y_;
 
   // The set of indices of ones in the binary representation of
   // touch_ids_bitfield_ is the set of touch_ids associate with this gesture.
   // This value is stored as a bitfield because the number of touch ids varies,
   // but we currently don't need more than 32 touches at a time.
   const unsigned int touch_ids_bitfield_;
 
   DISALLOW_COPY_AND_ASSIGN(GestureEvent);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_EVENT_H_