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

ui/aura/event.cc

 // 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.
 
 #include "ui/aura/event.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
 #include <cstring>
 
 #include "ui/aura/window.h"
 #include "ui/base/keycodes/keyboard_code_conversion.h"
 #include "ui/gfx/point3.h"
+#include "ui/gfx/interpolated_transform.h"
 #include "ui/gfx/transform.h"
 
 #if defined(OS_MACOSX)
 #include "ui/aura/event_mac.h"
 #endif
 
 #if defined(USE_X11)
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #endif
 
@@ skipping 247 matching lines @@
       radius_x_(1.0f),
       radius_y_(1.0f),
       rotation_angle_(0.0f),
       force_(0.0f) {
   set_time_stamp(time_stamp);
 }
 
 TouchEvent::~TouchEvent() {
 }
 
+void TouchEvent::UpdateForRootTransform(const ui::Transform& root_transform) {
+  LocatedEvent::UpdateForRootTransform(root_transform);
+  gfx::Point3f scale;
+  ui::InterpolatedTransform::FactorTRS(root_transform, NULL, NULL, &scale);
+  radius_x_ *= scale.x();
+  radius_y_ *= scale.y();
+}
+
 ui::EventType TouchEvent::GetEventType() const {
   return type();
 }
 
 gfx::Point TouchEvent::GetLocation() const {
   return location();
 }
 
 int TouchEvent::GetTouchId() const {
   return touch_id_;
@@ skipping 164 matching lines @@
 int GestureEvent::GetLowestTouchId() const {
   if (touch_ids_bitfield_ == 0)
     return -1;
   int i = -1;
   // Find the index of the least significant 1 bit
   while (!(1 << ++i & touch_ids_bitfield_));
   return i;
 }
 
 }  // namespace aura