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 154 matching lines @@
                            Window* target)
     : LocatedEvent(model, source, target),
       delta_x_(model.delta_x_),
       delta_y_(model.delta_y_),
       touch_ids_bitfield_(model.touch_ids_bitfield_) {
 }
 
 GestureEvent::~GestureEvent() {
 }
 
+void GestureEvent::UpdateForRootTransform(const ui::Transform& root_transform) {
+  LocatedEvent::UpdateForRootTransform(root_transform);
+  gfx::Point3f scale;
+  ui::InterpolatedTransform::FactorTRS(root_transform, NULL, NULL, &scale);
+  delta_x_ *= scale.x();
+  delta_y_ *= scale.y();

[sadrul, 2012/04/22 19:35:55]

Are you sure the change here is necessary? The
pinch-scale/scroll-amount/velocity that these variables represent are usually
computed from the touch-event locations, and since the touch-event locations are
transformed properly, it is probably unnecessary to do this again here. (a test
might be useful)

[pkotwicz, 2012/04/23 00:15:40]

You are right that UpdateForRootTransform is never called on GestureEvent at
present. But this can change and it would be nice for this to be correct.

[sadrul, 2012/04/23 01:13:51]

I actually meant that the scale-factor on the root-window will already have been
taken into account by way of the touch-event location's transformation. So doing
this here again would mean the scale is applied twice, and that would be wrong.
So whether UpdateForRootTransform is applied or not, this change should not be
necessary.

+}
+
 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