Convert //ui typemaps to GN (1/5)

Bug: 1059389
Change-Id: I90a58a2cad2cc7da9a5512b327f3b4d16567154f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2112894
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#758898}

third_party/blink/public/blink_typemaps.gni

@@ -12,6 +12,4 @@ typemaps = [
   "//services/viz/public/cpp/compositing/returned_resource.typemap",
   "//services/viz/public/cpp/compositing/surface_id.typemap",
   "//services/viz/public/cpp/compositing/surface_info.typemap",
-  "//ui/display/mojom/display_rotation_for_blink.typemap",
-  "//ui/gfx/mojom/gpu_fence_handle_for_blink.typemap",
 ]

third_party/blink/renderer/platform/mojo/blink_typemaps.gni

@@ -23,7 +23,4 @@ typemaps = [
   "//third_party/blink/public/common/mediastream/media_stream.typemap",
   "//third_party/blink/public/common/screen_orientation/screen_orientation_lock_types.typemap",
   "//third_party/blink/public/mojom/bluetooth/bluetooth.typemap",
-  "//ui/gfx/geometry/mojom/geometry.typemap",
-  "//ui/gfx/mojom/color_space.typemap",
-  "//ui/gfx/mojom/transform.typemap",
 ]

ui/display/mojom/BUILD.gn

@@ -21,4 +21,55 @@ mojom("mojom") {
     "//ui/gfx/geometry/mojom",
     "//ui/gfx/mojom",
   ]
+
+  shared_cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "display.mojom.Rotation"
+          cpp = "::display::Display::Rotation"
+        },
+      ]
+      traits_headers = [ "display_mojom_traits.h" ]
+      traits_public_deps = [ ":shared_mojom_traits" ]
+    },
+  ]
+
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "display.mojom.Display"
+          cpp = "::display::Display"
+        },
+        {
+          mojom = "display.mojom.TouchSupport"
+          cpp = "::display::Display::TouchSupport"
+        },
+        {
+          mojom = "display.mojom.AccelerometerSupport"
+          cpp = "::display::Display::AccelerometerSupport"
+        },
+      ]
+      traits_headers = [ "display_mojom_traits.h" ]
+      traits_public_deps = [ ":shared_mojom_traits" ]
+    },
+  ]
+  cpp_typemaps += shared_cpp_typemaps
+  blink_cpp_typemaps = shared_cpp_typemaps
+}
+
+component("shared_mojom_traits") {
+  output_name = "display_shared_mojom_traits"
+  defines = [ "IS_DISPLAY_SHARED_MOJOM_TRAITS_IMPL" ]
+  sources = [
+    "display_mojom_traits.cc",
+    "display_mojom_traits.h",
+  ]
+  public_deps = [
+    ":mojom_shared",
+    "//base",
+    "//ui/display",
+    "//ui/gfx/mojom",
+  ]
 }

ui/display/mojom/display.typemap

-# 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.
-
-mojom = "//ui/display/mojom/display.mojom"
-public_headers = [ "//ui/display/display.h" ]
-traits_headers = [ "//ui/display/mojom/display_mojom_traits.h" ]
-sources = [
-  "//ui/display/mojom/display_mojom_traits.cc",
-]
-public_deps = [
-  "//ui/display",
-]
-deps = [
-  "//ui/gfx/geometry",
-  "//ui/gfx/geometry/mojom:mojom_traits",
-]
-
-type_mappings = [
-  "display.mojom.Display=::display::Display",
-  "display.mojom.Rotation=::display::Display::Rotation",
-  "display.mojom.TouchSupport=::display::Display::TouchSupport",
-  "display.mojom.AccelerometerSupport=::display::Display::AccelerometerSupport",
-]

ui/display/mojom/display_mojom_traits.h

@@ -5,23 +5,25 @@
 #ifndef UI_DISPLAY_MOJOM_DISPLAY_MOJOM_TRAITS_H_
 #define UI_DISPLAY_MOJOM_DISPLAY_MOJOM_TRAITS_H_
 
+#include "base/component_export.h"
 #include "ui/display/display.h"
-#include "ui/display/mojom/display.mojom.h"
+#include "ui/display/mojom/display.mojom-shared.h"
 #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
 #include "ui/gfx/mojom/display_color_spaces_mojom_traits.h"
 
 namespace mojo {
 
 template <>
-struct EnumTraits<display::mojom::Rotation, display::Display::Rotation> {
+struct COMPONENT_EXPORT(DISPLAY_SHARED_MOJOM_TRAITS)
+    EnumTraits<display::mojom::Rotation, display::Display::Rotation> {
   static display::mojom::Rotation ToMojom(display::Display::Rotation type);
   static bool FromMojom(display::mojom::Rotation type,
                         display::Display::Rotation* output);
 };
 
 template <>
-struct EnumTraits<display::mojom::TouchSupport,
-                  display::Display::TouchSupport> {
+struct COMPONENT_EXPORT(DISPLAY_SHARED_MOJOM_TRAITS)
+    EnumTraits<display::mojom::TouchSupport, display::Display::TouchSupport> {
   static display::mojom::TouchSupport ToMojom(
       display::Display::TouchSupport type);
   static bool FromMojom(display::mojom::TouchSupport type,
@@ -29,8 +31,9 @@ struct EnumTraits<display::mojom::TouchSupport,
 };
 
 template <>
-struct EnumTraits<display::mojom::AccelerometerSupport,
-                  display::Display::AccelerometerSupport> {
+struct COMPONENT_EXPORT(DISPLAY_SHARED_MOJOM_TRAITS)
+    EnumTraits<display::mojom::AccelerometerSupport,
+               display::Display::AccelerometerSupport> {
   static display::mojom::AccelerometerSupport ToMojom(
       display::Display::AccelerometerSupport type);
   static bool FromMojom(display::mojom::AccelerometerSupport type,
@@ -38,7 +41,8 @@ struct EnumTraits<display::mojom::AccelerometerSupport,
 };
 
 template <>
-struct StructTraits<display::mojom::DisplayDataView, display::Display> {
+struct COMPONENT_EXPORT(DISPLAY_SHARED_MOJOM_TRAITS)
+    StructTraits<display::mojom::DisplayDataView, display::Display> {
   static int64_t id(const display::Display& display) { return display.id(); }
 
   static const gfx::Rect& bounds(const display::Display& display) {

ui/display/mojom/display_mojom_traits_unittest.cc

@@ -12,6 +12,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/display/display.h"
 #include "ui/display/display_layout.h"
+#include "ui/display/mojom/display.mojom.h"
 #include "ui/display/mojom/display_layout_mojom_traits.h"
 #include "ui/display/mojom/display_mode_mojom_traits.h"
 #include "ui/display/mojom/display_mojom_traits.h"

ui/display/mojom/display_rotation_for_blink.typemap

-# Copyright 2018 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.
-
-mojom = "//ui/display/mojom/display.mojom"
-public_headers = [ "//ui/display/display.h" ]
-traits_headers = [ "//ui/display/mojom/display_mojom_traits.h" ]
-public_deps = [
-  "//ui/display",
-  "//ui/display/mojom:mojom",
-]
-type_mappings = [ "display.mojom.Rotation=::display::Display::Rotation" ]

ui/display/mojom/typemaps.gni

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 typemaps = [
-  "//ui/display/mojom/display.typemap",
   "//ui/display/mojom/display_constants.typemap",
   "//ui/display/mojom/display_layout.typemap",
   "//ui/display/mojom/display_mode.typemap",

ui/gfx/geometry/mojom/BUILD.gn

@@ -11,6 +11,72 @@ mojom("mojom") {
   sources = [ "geometry.mojom" ]
 
   check_includes_blink = false
+
+  shared_cpp_typemap = {
+    types = [
+      {
+        mojom = "gfx.mojom.Point"
+        cpp = "::gfx::Point"
+      },
+      {
+        mojom = "gfx.mojom.PointF"
+        cpp = "::gfx::PointF"
+      },
+      {
+        mojom = "gfx.mojom.Point3F"
+        cpp = "::gfx::Point3F"
+      },
+      {
+        mojom = "gfx.mojom.Size"
+        cpp = "::gfx::Size"
+      },
+      {
+        mojom = "gfx.mojom.SizeF"
+        cpp = "::gfx::SizeF"
+      },
+      {
+        mojom = "gfx.mojom.Rect"
+        cpp = "::gfx::Rect"
+      },
+      {
+        mojom = "gfx.mojom.RectF"
+        cpp = "::gfx::RectF"
+      },
+      {
+        mojom = "gfx.mojom.Insets"
+        cpp = "::gfx::Insets"
+      },
+      {
+        mojom = "gfx.mojom.InsetsF"
+        cpp = "::gfx::InsetsF"
+      },
+      {
+        mojom = "gfx.mojom.Quaternion"
+        cpp = "::gfx::Quaternion"
+      },
+      {
+        mojom = "gfx.mojom.Vector2d"
+        cpp = "::gfx::Vector2d"
+      },
+      {
+        mojom = "gfx.mojom.Vector2dF"
+        cpp = "::gfx::Vector2dF"
+      },
+      {
+        mojom = "gfx.mojom.Vector3dF"
+        cpp = "::gfx::Vector3dF"
+      },
+      {
+        mojom = "gfx.mojom.ScrollOffset"
+        cpp = "::gfx::ScrollOffset"
+      },
+    ]
+
+    traits_headers = [ "geometry_mojom_traits.h" ]
+    traits_public_deps = [ ":mojom_traits" ]
+  }
+  cpp_typemaps = [ shared_cpp_typemap ]
+  blink_cpp_typemaps = [ shared_cpp_typemap ]
 }
 
 mojom("test_interfaces") {
@@ -37,7 +103,7 @@ source_set("unit_test") {
 source_set("mojom_traits") {
   sources = [ "geometry_mojom_traits.h" ]
   public_deps = [
-    ":mojom_shared_cpp_sources",
+    ":mojom_shared",
     "//ui/gfx/geometry",
   ]
 }

ui/gfx/geometry/mojom/geometry.typemap

-# 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.
-
-mojom = "//ui/gfx/geometry/mojom/geometry.mojom"
-public_headers = [
-  "//ui/gfx/geometry/point.h",
-  "//ui/gfx/geometry/point_f.h",
-  "//ui/gfx/geometry/point3_f.h",
-  "//ui/gfx/geometry/size.h",
-  "//ui/gfx/geometry/rect.h",
-  "//ui/gfx/geometry/rect_f.h",
-  "//ui/gfx/geometry/safe_integer_conversions.h",
-  "//ui/gfx/geometry/scroll_offset.h",
-  "//ui/gfx/geometry/insets.h",
-  "//ui/gfx/geometry/quaternion.h",
-  "//ui/gfx/geometry/vector2d.h",
-  "//ui/gfx/geometry/vector2d_f.h",
-  "//ui/gfx/geometry/vector3d_f.h",
-]
-traits_headers = [ "//ui/gfx/geometry/mojom/geometry_mojom_traits.h" ]
-public_deps = [
-  "//ui/gfx/geometry/mojom:mojom_traits",
-]
-type_mappings = [
-  "gfx.mojom.Point=::gfx::Point",
-  "gfx.mojom.PointF=::gfx::PointF",
-  "gfx.mojom.Point3F=::gfx::Point3F",
-  "gfx.mojom.Size=::gfx::Size",
-  "gfx.mojom.SizeF=::gfx::SizeF",
-  "gfx.mojom.Rect=::gfx::Rect",
-  "gfx.mojom.RectF=::gfx::RectF",
-  "gfx.mojom.Insets=::gfx::Insets",
-  "gfx.mojom.InsetsF=::gfx::InsetsF",
-  "gfx.mojom.Quaternion=::gfx::Quaternion",
-  "gfx.mojom.Vector2d=::gfx::Vector2d",
-  "gfx.mojom.Vector2dF=::gfx::Vector2dF",
-  "gfx.mojom.Vector3dF=::gfx::Vector3dF",
-  "gfx.mojom.ScrollOffset=::gfx::ScrollOffset",
-]

ui/gfx/mojom/BUILD.gn

@@ -29,43 +29,76 @@ mojom("mojom") {
     "//ui/gfx/geometry/mojom",
   ]
 
-  buffer_types_shared_cpp_typemap = {
-    types = [
-      {
-        mojom = "gfx.mojom.BufferFormat"
-        cpp = "::gfx::BufferFormat"
-      },
-      {
-        mojom = "gfx.mojom.BufferUsage"
-        cpp = "::gfx::BufferUsage"
-      },
-      {
-        mojom = "gfx.mojom.BufferUsageAndFormat"
-        cpp = "::gfx::BufferUsageAndFormat"
-      },
-      {
-        mojom = "gfx.mojom.GpuMemoryBufferHandle"
-        cpp = "::gfx::GpuMemoryBufferHandle"
-        move_only = true
-        nullable_is_same_type = true
-      },
-      {
-        mojom = "gfx.mojom.GpuMemoryBufferId"
-        cpp = "::gfx::GpuMemoryBufferId"
-        copyable_pass_by_value = true
-      },
-      {
-        mojom = "gfx.mojom.GpuMemoryBufferType"
-        cpp = "::gfx::GpuMemoryBufferType"
-      },
-    ]
+  shared_cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "gfx.mojom.BufferFormat"
+          cpp = "::gfx::BufferFormat"
+        },
+        {
+          mojom = "gfx.mojom.BufferUsage"
+          cpp = "::gfx::BufferUsage"
+        },
+        {
+          mojom = "gfx.mojom.BufferUsageAndFormat"
+          cpp = "::gfx::BufferUsageAndFormat"
+        },
+        {
+          mojom = "gfx.mojom.GpuMemoryBufferHandle"
+          cpp = "::gfx::GpuMemoryBufferHandle"
+          move_only = true
+          nullable_is_same_type = true
+        },
+        {
+          mojom = "gfx.mojom.GpuMemoryBufferId"
+          cpp = "::gfx::GpuMemoryBufferId"
+          copyable_pass_by_value = true
+        },
+        {
+          mojom = "gfx.mojom.GpuMemoryBufferType"
+          cpp = "::gfx::GpuMemoryBufferType"
+        },
+      ]
 
-    traits_headers = [ "buffer_types_mojom_traits.h" ]
-    traits_public_deps = [ ":shared_mojom_traits" ]
-  }
+      traits_headers = [ "buffer_types_mojom_traits.h" ]
+      traits_public_deps = [ ":shared_mojom_traits" ]
+    },
+    {
+      types = [
+        {
+          mojom = "gfx.mojom.ColorSpace"
+          cpp = "::gfx::ColorSpace"
+        },
+      ]
+      traits_headers = [ "color_space_mojom_traits.h" ]
+      traits_public_deps = [ ":color_space_mojom_support" ]
+    },
+    {
+      types = [
+        {
+          mojom = "gfx.mojom.GpuFenceHandle"
+          cpp = "::gfx::GpuFenceHandle"
+        },
+      ]
+      traits_headers = [ "gpu_fence_handle_mojom_traits.h" ]
+      traits_public_deps = [ ":shared_mojom_traits" ]
+    },
+    {
+      types = [
+        {
+          mojom = "gfx.mojom.Transform"
+          cpp = "::gfx::Transform"
+        },
+      ]
+      traits_headers = [ "transform_mojom_traits.h" ]
+      traits_public_deps = [ "//ui/gfx" ]
+    },
+  ]
 
-  cpp_typemaps = [ buffer_types_shared_cpp_typemap ]
-  blink_cpp_typemaps = [ buffer_types_shared_cpp_typemap ]
+  cpp_typemaps = []
+  cpp_typemaps = shared_cpp_typemaps
+  blink_cpp_typemaps = shared_cpp_typemaps
 }
 
 mojom("native_handle_types") {
@@ -136,6 +169,8 @@ component("shared_mojom_traits") {
   sources = [
     "buffer_types_mojom_traits.cc",
     "buffer_types_mojom_traits.h",
+    "gpu_fence_handle_mojom_traits.cc",
+    "gpu_fence_handle_mojom_traits.h",
   ]
   public_deps = [
     ":mojom_shared",

ui/gfx/mojom/color_space.typemap

-# 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.
-
-mojom = "//ui/gfx/mojom/color_space.mojom"
-public_headers = [ "//ui/gfx/color_space.h" ]
-traits_headers = [ "//ui/gfx/mojom/color_space_mojom_traits.h" ]
-public_deps = [ "//ui/gfx/mojom:color_space_mojom_support" ]
-type_mappings = [ "gfx.mojom.ColorSpace=::gfx::ColorSpace" ]

ui/gfx/mojom/gpu_fence_handle.typemap

-# Copyright 2017 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.
-
-mojom = "//ui/gfx/mojom/gpu_fence_handle.mojom"
-public_headers = [ "//ui/gfx/gpu_fence_handle.h" ]
-traits_headers = [ "//ui/gfx/mojom/gpu_fence_handle_mojom_traits.h" ]
-sources = [
-  "//ui/gfx/mojom/gpu_fence_handle_mojom_traits.cc",
-]
-deps = [
-  "//ui/gfx",
-]
-type_mappings = [ "gfx.mojom.GpuFenceHandle=::gfx::GpuFenceHandle" ]

ui/gfx/mojom/gpu_fence_handle_for_blink.typemap

-# Copyright 2017 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.
-
-mojom = "//ui/gfx/mojom/gpu_fence_handle.mojom"
-public_headers = [ "//ui/gfx/gpu_fence_handle.h" ]
-traits_headers = [ "//ui/gfx/mojom/gpu_fence_handle_mojom_traits.h" ]
-public_deps = [
-  "//mojo/public/cpp/bindings",
-  "//ui/gfx/mojom",
-]
-type_mappings = [ "gfx.mojom.GpuFenceHandle=::gfx::GpuFenceHandle" ]

ui/gfx/mojom/gpu_fence_handle_mojom_traits.h

@@ -5,13 +5,15 @@
 #ifndef UI_GFX_MOJOM_GPU_FENCE_HANDLE_MOJOM_TRAITS_H_
 #define UI_GFX_MOJOM_GPU_FENCE_HANDLE_MOJOM_TRAITS_H_
 
+#include "base/component_export.h"
 #include "ui/gfx/gpu_fence_handle.h"
-#include "ui/gfx/mojom/gpu_fence_handle.mojom.h"
+#include "ui/gfx/mojom/gpu_fence_handle.mojom-shared.h"
 
 namespace mojo {
 
 template <>
-struct EnumTraits<gfx::mojom::GpuFenceHandleType, gfx::GpuFenceHandleType> {
+struct COMPONENT_EXPORT(GFX_SHARED_MOJOM_TRAITS)
+    EnumTraits<gfx::mojom::GpuFenceHandleType, gfx::GpuFenceHandleType> {
   static gfx::mojom::GpuFenceHandleType ToMojom(gfx::GpuFenceHandleType type) {
     switch (type) {
       case gfx::GpuFenceHandleType::kEmpty:
@@ -38,7 +40,8 @@ struct EnumTraits<gfx::mojom::GpuFenceHandleType, gfx::GpuFenceHandleType> {
 };
 
 template <>
-struct StructTraits<gfx::mojom::GpuFenceHandleDataView, gfx::GpuFenceHandle> {
+struct COMPONENT_EXPORT(GFX_SHARED_MOJOM_TRAITS)
+    StructTraits<gfx::mojom::GpuFenceHandleDataView, gfx::GpuFenceHandle> {
   static gfx::GpuFenceHandleType type(const gfx::GpuFenceHandle& handle) {
     return handle.type;
   }

ui/gfx/mojom/transform.typemap

-# 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.
-
-mojom = "//ui/gfx/mojom/transform.mojom"
-public_headers = [ "//ui/gfx/transform.h" ]
-traits_headers = [ "//ui/gfx/mojom/transform_mojom_traits.h" ]
-type_mappings = [ "gfx.mojom.Transform=::gfx::Transform" ]

ui/gfx/typemaps.gni

@@ -3,20 +3,16 @@
 # found in the LICENSE file.
 
 typemaps = [
-  "//ui/gfx/geometry/mojom/geometry.typemap",
   "//ui/gfx/image/mojom/image.typemap",
   "//ui/gfx/mojom/accelerated_widget.typemap",
   "//ui/gfx/mojom/ca_layer_params.typemap",
-  "//ui/gfx/mojom/color_space.typemap",
   "//ui/gfx/mojom/display_color_spaces.typemap",
   "//ui/gfx/mojom/font_render_params.typemap",
-  "//ui/gfx/mojom/gpu_fence_handle.typemap",
   "//ui/gfx/mojom/overlay_transform.typemap",
   "//ui/gfx/mojom/presentation_feedback.typemap",
   "//ui/gfx/mojom/rrect_f.typemap",
   "//ui/gfx/mojom/selection_bound.typemap",
   "//ui/gfx/mojom/swap_result.typemap",
   "//ui/gfx/mojom/swap_timings.typemap",
-  "//ui/gfx/mojom/transform.typemap",
   "//ui/gfx/range/mojom/range.typemap",
 ]