Refactor VR math off of GVR types, onto gfx types where possible.

device/vr/android/gvr/gvr_gamepad_data_fetcher.cc

 // Copyright 2016 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 "device/vr/android/gvr/gvr_gamepad_data_fetcher.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
-
 #include "device/vr/android/gvr/gvr_gamepad_data_provider.h"
+#include "device/vr/vr_types.h"
 #include "third_party/WebKit/public/platform/WebGamepads.h"
 
 namespace device {
 
 namespace {
 
 void CopyToWebUString(blink::WebUChar* dest,
                       size_t dest_length,
                       base::string16 src) {
   static_assert(sizeof(base::string16::value_type) == sizeof(blink::WebUChar),
@@ skipping 77 matching lines @@
     pad.axesLength = 2;
 
     pad.displayId = display_id_;
 
     pad.hand = provided_data.right_handed ? GamepadHandRight : GamepadHandLeft;
   }
 
   pad.timestamp = provided_data.timestamp;
 
   if (provided_data.is_touching) {
-    gvr_vec2f touch_position = provided_data.touch_pos;
-    pad.axes[0] = (touch_position.x * 2.0f) - 1.0f;
-    pad.axes[1] = (touch_position.y * 2.0f) - 1.0f;
+    gfx::Vector2dF touch_position = provided_data.touch_pos;
+    pad.axes[0] = (touch_position.x() * 2.0f) - 1.0f;
+    pad.axes[1] = (touch_position.y() * 2.0f) - 1.0f;
   } else {
     pad.axes[0] = 0.0f;
     pad.axes[1] = 0.0f;
   }
 
   pad.buttons[0].touched = provided_data.is_touching;
   pad.buttons[0].pressed = provided_data.controller_button_pressed;
   pad.buttons[0].value = pad.buttons[0].pressed ? 1.0f : 0.0f;
 
   pad.pose.notNull = true;
   pad.pose.hasOrientation = true;
   pad.pose.hasPosition = false;
 
-  gvr_quatf orientation = provided_data.orientation;
+  vr::Quatf orientation = provided_data.orientation;
   pad.pose.orientation.notNull = true;
   pad.pose.orientation.x = orientation.qx;
   pad.pose.orientation.y = orientation.qy;
   pad.pose.orientation.z = orientation.qz;
   pad.pose.orientation.w = orientation.qw;
 
-  gvr_vec3f accel = provided_data.accel;
+  gfx::Vector3dF accel = provided_data.accel;
   pad.pose.linearAcceleration.notNull = true;
-  pad.pose.linearAcceleration.x = accel.x;
-  pad.pose.linearAcceleration.y = accel.y;
-  pad.pose.linearAcceleration.z = accel.z;
+  pad.pose.linearAcceleration.x = accel.x();
+  pad.pose.linearAcceleration.y = accel.y();
+  pad.pose.linearAcceleration.z = accel.z();
 
-  gvr_vec3f gyro = provided_data.gyro;
+  gfx::Vector3dF gyro = provided_data.gyro;
   pad.pose.angularVelocity.notNull = true;
-  pad.pose.angularVelocity.x = gyro.x;
-  pad.pose.angularVelocity.y = gyro.y;
-  pad.pose.angularVelocity.z = gyro.z;
+  pad.pose.angularVelocity.x = gyro.x();
+  pad.pose.angularVelocity.y = gyro.y();
+  pad.pose.angularVelocity.z = gyro.z();
 }
 
 void GvrGamepadDataFetcher::PauseHint(bool paused) {}
 
 }  // namespace device