Correct scale for touch radius & scroll offset ordinal

ui/base/events/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/base/events/event.h"
 
 #if defined(USE_X11)
 #include <X11/Xlib.h>
 #endif
 
@@ skipping 444 matching lines @@
 }
 
 TouchEvent::~TouchEvent() {
 }
 
 void TouchEvent::Relocate(const gfx::Point& origin) {
   location_ -= origin.OffsetFromOrigin();
   root_location_ -= origin.OffsetFromOrigin();
 }
 
-void TouchEvent::UpdateForRootTransform(const gfx::Transform& root_transform) {
-  LocatedEvent::UpdateForRootTransform(root_transform);
+void TouchEvent::UpdateForRootTransform(
+    const gfx::Transform& inverted_root_transform) {
+  LocatedEvent::UpdateForRootTransform(inverted_root_transform);
   gfx::DecomposedTransform decomp;
-  bool success = gfx::DecomposeTransform(&decomp, root_transform);
+  bool success = gfx::DecomposeTransform(&decomp, inverted_root_transform);
   DCHECK(success);
   if (decomp.scale[0])
-    radius_x_ /= decomp.scale[0];
+    radius_x_ *= decomp.scale[0];
   if (decomp.scale[1])
-    radius_y_ /= decomp.scale[1];
+    radius_y_ *= decomp.scale[1];
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // KeyEvent
 
 KeyEvent::KeyEvent(const base::NativeEvent& native_event, bool is_char)
     : Event(native_event,
             EventTypeFromNative(native_event),
             EventFlagsFromNative(native_event)),
       key_code_(KeyboardCodeFromNative(native_event)),
@@ skipping 199 matching lines @@
   CHECK(IsScrollEvent());
 }
 
 void ScrollEvent::Scale(const float factor) {
   x_offset_ *= factor;
   y_offset_ *= factor;
   x_offset_ordinal_ *= factor;
   y_offset_ordinal_ *= factor;
 }
 
-void ScrollEvent::UpdateForRootTransform(const gfx::Transform& root_transform) {
-  LocatedEvent::UpdateForRootTransform(root_transform);
+void ScrollEvent::UpdateForRootTransform(
+    const gfx::Transform& inverted_root_transform) {
+  LocatedEvent::UpdateForRootTransform(inverted_root_transform);
   gfx::DecomposedTransform decomp;
-  bool success = gfx::DecomposeTransform(&decomp, root_transform);
+  bool success = gfx::DecomposeTransform(&decomp, inverted_root_transform);
   DCHECK(success);
   if (decomp.scale[0])
-    x_offset_ordinal_ /= decomp.scale[0];
+    x_offset_ordinal_ *= decomp.scale[0];
   if (decomp.scale[1])
-    y_offset_ordinal_ /= decomp.scale[1];
+    y_offset_ordinal_ *= decomp.scale[1];
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // GestureEvent
 
 GestureEvent::GestureEvent(EventType type,
                            int x,
                            int y,
                            int flags,
                            base::TimeDelta time_stamp,
@@ skipping 14 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 ui