[Android] Out with the Android GR, in with the new unified C++ GR

content/browser/renderer_host/input/web_input_event_builders_android.cc

 // Copyright 2013 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 "content/browser/renderer_host/input/web_input_event_builders_android.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/input/motion_event_android.h"
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/browser/renderer_host/input/web_input_event_util_posix.h"
@@ skipping 50 matching lines @@
     case MotionEventAndroid::ACTION_POINTER_UP:
       return is_action_pointer ? WebTouchPoint::StateReleased
                                : WebTouchPoint::StateStationary;
   }
   NOTREACHED() << "Invalid MotionEventAndroid::Action.";
   return WebTouchPoint::StateUndefined;
 }
 
 WebTouchPoint BuildWebTouchPoint(const MotionEventAndroid& event,
                                  size_t pointer_index,
-                                 float dpi_scale) {
+                                 float px_to_dp) {
   WebTouchPoint touch;
   touch.id = event.GetPointerId(pointer_index);
-  touch.state = ToWebTouchPointState(event.GetActionMasked(),
-                                     pointer_index == event.GetActionIndex());
-  touch.position.x = event.GetX(pointer_index) / dpi_scale;
-  touch.position.y = event.GetY(pointer_index) / dpi_scale;
+  touch.state = ToWebTouchPointState(
+      event.GetAction(),
+      static_cast<int>(pointer_index) == event.GetActionIndex());
+  touch.position.x = event.GetX(pointer_index) * px_to_dp;
+  touch.position.y = event.GetY(pointer_index) * px_to_dp;
   // TODO(joth): Raw event co-ordinates.
   touch.screenPosition = touch.position;
 
   const int radius_major =
-      static_cast<int>(event.GetTouchMajor(pointer_index) * 0.5f / dpi_scale);
+      static_cast<int>(event.GetTouchMajor(pointer_index) * 0.5f * px_to_dp);
   const int radius_minor =
-      static_cast<int>(event.GetTouchMinor(pointer_index) * 0.5f / dpi_scale);
+      static_cast<int>(event.GetTouchMinor(pointer_index) * 0.5f * px_to_dp);
   const float major_angle_in_radians_clockwise_from_vertical =
       event.GetOrientation();
 
   float major_angle_in_degrees_clockwise_from_vertical = 0;
   if (!std::isnan(major_angle_in_radians_clockwise_from_vertical)) {
     major_angle_in_degrees_clockwise_from_vertical =
         major_angle_in_radians_clockwise_from_vertical * 180.f / M_PI;
   }
   // Android provides a major axis orientation clockwise with respect to the
   // vertical of [-90, 90].  The proposed W3C extension specifies the angle that
@@ skipping 124 matching lines @@
 
   result.type = type;
   result.x = x;
   result.y = y;
   result.timeStampSeconds = time_sec;
   result.sourceDevice = WebGestureEvent::Touchscreen;
 
   return result;
 }
 
-blink::WebTouchEvent WebTouchEventBuilder::Build(jobject motion_event,
-                                                 float dpi_scale) {
-  DCHECK(motion_event);
-  MotionEventAndroid event(motion_event);
-
+blink::WebTouchEvent WebTouchEventBuilder::Build(
+    const MotionEventAndroid& event,
+    float device_scale_factor) {
   blink::WebTouchEvent result;
 
-  result.type = ToWebInputEventType(event.GetActionMasked());
+  result.type = ToWebInputEventType(event.GetAction());
   DCHECK(WebInputEvent::isTouchEventType(result.type));
 
   result.timeStampSeconds =
       (event.GetEventTime() - base::TimeTicks()).InSecondsF();
 
   result.touchesLength =
       std::min(event.GetPointerCount(),
                static_cast<size_t>(WebTouchEvent::touchesLengthCap));
   DCHECK_GT(result.touchesLength, 0U);
 
+  const float px_to_dp = 1.f / device_scale_factor;
   for (size_t i = 0; i < result.touchesLength; ++i)
-    result.touches[i] = BuildWebTouchPoint(event, i, dpi_scale);
+    result.touches[i] = BuildWebTouchPoint(event, i, px_to_dp);
 
   return result;
 }
 
 }  // namespace content