Remove the magical typemapping of gfx.mojom.Point3F to blink::Point3D

The gfx types can be used natively inside blink so we don't need to
typemap them. This will allow us to progressively remove the platform
types.

BUG=640049

Change-Id: I028e4f4c6cd806661bbc74078e0a0d0c91609a8c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007279Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Reviewed-by: Ken Buchanan <kenrb@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733429}

third_party/blink/renderer/modules/xr/type_converters.cc

@@ -47,9 +47,9 @@ TypeConverter<blink::TransformationMatrix, device::mojom::blink::VRPosePtr>::
   }
 
   if (pose->position) {
-    decomp.translate_x = pose->position->X();
-    decomp.translate_y = pose->position->Y();
-    decomp.translate_z = pose->position->Z();
+    decomp.translate_x = pose->position->x();
+    decomp.translate_y = pose->position->y();
+    decomp.translate_z = pose->position->z();
   }
 
   result.Recompose(decomp);
@@ -77,9 +77,9 @@ TypeConverter<blink::TransformationMatrix, device::mojom::blink::PosePtr>::
   decomp.quaternion_z = quat.z();
   decomp.quaternion_w = quat.w();
 
-  decomp.translate_x = pose->position.X();
-  decomp.translate_y = pose->position.Y();
-  decomp.translate_z = pose->position.Z();
+  decomp.translate_x = pose->position.x();
+  decomp.translate_y = pose->position.y();
+  decomp.translate_z = pose->position.z();
 
   result.Recompose(decomp);
 

third_party/blink/renderer/modules/xr/xr_bounded_reference_space.cc

@@ -74,7 +74,7 @@ void XRBoundedReferenceSpace::EnsureUpdated() {
             kMinimumNumberOfBoundVertices) {
       for (const auto& bound : *(display_info->stage_parameters->bounds)) {
         FloatPoint3D p = offset_from_native.MapPoint(
-            FloatPoint3D(bound.X(), 0.0, bound.Z()));
+            FloatPoint3D(bound.x(), 0.0, bound.z()));
         offset_bounds_geometry_.push_back(RoundedDOMPoint(p));
       }
     }

third_party/blink/renderer/platform/mojo/geometry.typemap

@@ -18,9 +18,7 @@ traits_headers = [
 ]
 
 # Note: consumers of this typemap must themselves depend on platform.
-deps = [
-  "//mojo/public/cpp/bindings",
-]
+deps = [ "//mojo/public/cpp/bindings" ]
 
 public_deps = [
   "//third_party/blink/public:blink_headers",
@@ -34,7 +32,7 @@ public_deps = [
 type_mappings = [
   "gfx.mojom.Point=::gfx::Point",
   "gfx.mojom.PointF=::gfx::PointF",
-  "gfx.mojom.Point3F=::blink::FloatPoint3D",
+  "gfx.mojom.Point3F=::gfx::Point3F",
   "gfx.mojom.Quaternion=::gfx::Quaternion",
   "gfx.mojom.RectF=::blink::WebFloatRect",
   "gfx.mojom.Rect=::blink::WebRect",

third_party/blink/renderer/platform/mojo/geometry_mojom_traits.cc

@@ -41,15 +41,6 @@ bool StructTraits<gfx::mojom::PointDataView, ::blink::WebPoint>::Read(
   return true;
 }
 
-bool StructTraits<gfx::mojom::Point3FDataView, ::blink::FloatPoint3D>::Read(
-    gfx::mojom::Point3FDataView data,
-    ::blink::FloatPoint3D* out) {
-  out->SetX(data.x());
-  out->SetY(data.y());
-  out->SetZ(data.z());
-  return true;
-}
-
 // static
 bool StructTraits<gfx::mojom::SizeDataView, ::blink::WebSize>::Read(
     gfx::mojom::SizeDataView data,

third_party/blink/renderer/platform/mojo/geometry_mojom_traits.h

@@ -9,7 +9,6 @@
 #include "third_party/blink/public/platform/web_point.h"
 #include "third_party/blink/public/platform/web_rect.h"
 #include "third_party/blink/public/platform/web_size.h"
-#include "third_party/blink/renderer/platform/geometry/float_point_3d.h"
 #include "ui/gfx/geometry/mojom/geometry.mojom-shared.h"
 
 namespace mojo {
@@ -21,15 +20,6 @@ struct StructTraits<gfx::mojom::PointDataView, ::blink::WebPoint> {
   static bool Read(gfx::mojom::PointDataView, ::blink::WebPoint* out);
 };
 
-template <>
-struct StructTraits<gfx::mojom::Point3FDataView, ::blink::FloatPoint3D> {
-  static float x(const gfx::Point3F& p) { return p.x(); }
-  static float y(const gfx::Point3F& p) { return p.y(); }
-  static float z(const gfx::Point3F& p) { return p.z(); }
-  static bool Read(gfx::mojom::Point3FDataView data,
-                   ::blink::FloatPoint3D* out);
-};
-
 template <>
 struct StructTraits<gfx::mojom::RectFDataView, ::blink::WebFloatRect> {
   static float x(const ::blink::WebFloatRect& rect) { return rect.x; }

third_party/blink/renderer/platform/mojo/geometry_mojom_traits_test.cc

@@ -40,7 +40,7 @@ class GeometryStructTraitsTest
     std::move(callback).Run(p);
   }
 
-  void EchoPoint3F(const FloatPoint3D& p,
+  void EchoPoint3F(const gfx::Point3F& p,
                    EchoPoint3FCallback callback) override {
     std::move(callback).Run(p);
   }
@@ -116,18 +116,6 @@ TEST_F(GeometryStructTraitsTest, Size) {
   EXPECT_EQ(input, output);
 }
 
-TEST_F(GeometryStructTraitsTest, Point3D) {
-  const float kX = 1.234;
-  const float kY = 5.678;
-  const float kZ = 9.098;
-  FloatPoint3D input(kX, kY, kZ);
-  mojo::Remote<gfx::mojom::blink::GeometryTraitsTestService> proxy =
-      GetTraitsTestProxy();
-  FloatPoint3D output;
-  proxy->EchoPoint3F(input, &output);
-  EXPECT_EQ(input, output);
-}
-
 TEST_F(GeometryStructTraitsTest, Rect) {
   const float kX = 1;
   const float kY = 2;