Migrate remaining //ui typemaps to GN

Bug: 1059389
Change-Id: Ie8bae98b838cd1f051eaaf234aa4fdbc61052bea
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2173663
Commit-Queue: Ken Rockot <rockot@google.com>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#764388}

mojo/public/tools/bindings/blink_bindings_configuration.gni

@@ -12,7 +12,6 @@ _typemap_imports = [
   "//skia/public/mojom/typemaps.gni",
   "//third_party/blink/renderer/platform/mojo/blink_typemaps.gni",
   "//third_party/blink/public/blink_typemaps.gni",
-  "//ui/events/mojom/blink_typemaps.gni",
 ]
 _typemaps = []
 

mojo/public/tools/bindings/chromium_bindings_configuration.gni

@@ -38,10 +38,6 @@ _typemap_imports = [
   "//skia/public/mojom/typemaps.gni",
   "//third_party/blink/common/typemaps.gni",
   "//third_party/blink/public/public_typemaps.gni",
-  "//ui/display/mojom/typemaps.gni",
-  "//ui/events/mojom/typemaps.gni",
-  "//ui/gl/typemaps.gni",
-  "//ui/latency/mojom/typemaps.gni",
 ]
 
 _typemaps = []

ui/display/mojom/BUILD.gn

@@ -54,7 +54,88 @@ mojom("mojom") {
       traits_headers = [ "display_mojom_traits.h" ]
       traits_public_deps = [ ":shared_mojom_traits" ]
     },
+    {
+      types = [
+        {
+          mojom = "display.mojom.DisplayConnectionType"
+          cpp = "::display::DisplayConnectionType"
+        },
+        {
+          mojom = "display.mojom.HDCPState"
+          cpp = "::display::HDCPState"
+        },
+        {
+          mojom = "display.mojom.PrivacyScreenState"
+          cpp = "::display::PrivacyScreenState"
+        },
+      ]
+      traits_sources = [ "display_constants_mojom_traits.cc" ]
+      traits_headers = [ "display_constants_mojom_traits.h" ]
+      traits_public_deps = [ "//ui/display" ]
+    },
+    {
+      types = [
+        {
+          mojom = "display.mojom.Position"
+          cpp = "::display::DisplayPlacement::Position"
+        },
+        {
+          mojom = "display.mojom.OffsetReference"
+          cpp = "::display::DisplayPlacement::OffsetReference"
+        },
+        {
+          mojom = "display.mojom.DisplayPlacement"
+          cpp = "::display::DisplayPlacement"
+        },
+        {
+          mojom = "display.mojom.DisplayLayout"
+          cpp = "::std::unique_ptr<::display::DisplayLayout>"
+          move_only = true
+        },
+      ]
+      traits_sources = [ "display_layout_mojom_traits.cc" ]
+      traits_headers = [ "display_layout_mojom_traits.h" ]
+      traits_public_deps = [ "//ui/display" ]
+    },
+    {
+      types = [
+        {
+          mojom = "display.mojom.DisplayMode"
+          cpp = "::std::unique_ptr<::display::DisplayMode>"
+          move_only = true
+        },
+      ]
+      traits_sources = [ "display_mode_mojom_traits.cc" ]
+      traits_headers = [ "display_mode_mojom_traits.h" ]
+      traits_public_deps = [ "//ui/display" ]
+      traits_deps = [ "//ui/gfx/geometry" ]
+    },
+    {
+      types = [
+        {
+          mojom = "display.mojom.DisplaySnapshot"
+          cpp = "::std::unique_ptr<::display::DisplaySnapshot>"
+          move_only = true
+        },
+      ]
+      traits_sources = [ "display_snapshot_mojom_traits.cc" ]
+      traits_headers = [ "display_snapshot_mojom_traits.h" ]
+      traits_public_deps = [ "//ui/display" ]
+      traits_deps = [ "//ui/gfx/geometry" ]
+    },
+    {
+      types = [
+        {
+          mojom = "display.mojom.GammaRampRGBEntry"
+          cpp = "::display::GammaRampRGBEntry"
+        },
+      ]
+      traits_sources = [ "gamma_ramp_rgb_entry_mojom_traits.cc" ]
+      traits_headers = [ "gamma_ramp_rgb_entry_mojom_traits.h" ]
+      traits_public_deps = [ "//ui/display" ]
+    },
   ]
+
   cpp_typemaps += shared_cpp_typemaps
   blink_cpp_typemaps = shared_cpp_typemaps
 }

ui/display/mojom/OWNERS

@@ -1,8 +1,4 @@
 per-file *_mojom_traits*.*=set noparent
 per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
-
 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
-
-per-file *.typemap=set noparent
-per-file *.typemap=file://ipc/SECURITY_OWNERS

ui/events/mojom/BUILD.gn

@@ -18,4 +18,64 @@ mojom("mojom") {
     "//ui/gfx/geometry/mojom",
     "//ui/latency/mojom",
   ]
+
+  shared_cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "ui.mojom.EventPointerType"
+          cpp = "::ui::EventPointerType"
+        },
+        {
+          mojom = "ui.mojom.ScrollGranularity"
+          cpp = "::ui::ScrollGranularity"
+        },
+      ]
+      traits_headers = [ "//ui/events/ipc/ui_events_param_traits_macros.h" ]
+      traits_public_deps = [ "//ui/events/ipc" ]
+    },
+  ]
+
+  cpp_typemaps = shared_cpp_typemaps
+  cpp_typemaps += [
+    {
+      types = [
+        # TODO(crbug.com/617167): Map directly to ui::Event.
+        {
+          mojom = "ui.mojom.Event"
+          cpp = "::std::unique_ptr<::ui::Event>"
+          move_only = true
+        },
+        {
+          mojom = "ui.mojom.EventMomentumPhase"
+          cpp = "::ui::EventMomentumPhase"
+        },
+        {
+          mojom = "ui.mojom.PointerDetails"
+          cpp = "::ui::PointerDetails"
+        },
+        {
+          mojom = "ui.mojom.ScrollEventPhase"
+          cpp = "::ui::ScrollEventPhase"
+        },
+        {
+          mojom = "ui.mojom.GestureDeviceType"
+          cpp = "::ui::GestureDeviceType"
+        },
+      ]
+
+      traits_sources = [ "event_mojom_traits.cc" ]
+      traits_headers = [ "//ui/events/event.h" ]
+      traits_private_headers = [ "event_mojom_traits.h" ]
+      traits_public_deps = [
+        "//ui/events",
+        "//ui/events:dom_keycode_converter",
+        "//ui/gfx/geometry/mojom",
+        "//ui/latency/mojom",
+      ]
+      traits_deps = [ "//ipc:param_traits" ]
+    },
+  ]
+
+  blink_cpp_typemaps = shared_cpp_typemaps
 }

ui/events/mojom/OWNERS

@@ -1,8 +1,4 @@
 per-file *.mojom=set noparent
 per-file *.mojom=file://ipc/SECURITY_OWNERS
-
-per-file *.typemap=set noparent
-per-file *.typemap=file://ipc/SECURITY_OWNERS
-
 per-file *_mojom_traits*.*=set noparent
 per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS

ui/events/mojom/event_mojom_traits.h

@@ -14,12 +14,12 @@
 #include "ui/events/event_constants.h"
 #include "ui/events/mojom/event.mojom.h"
 #include "ui/events/mojom/event_constants.mojom.h"
+#include "ui/events/pointer_details.h"
 #include "ui/events/types/event_type.h"
 
 namespace ui {
 class Event;
 class LatencyInfo;
-struct PointerDetails;
 }
 
 namespace mojo {

ui/gl/mojom/BUILD.gn

@@ -6,8 +6,19 @@ import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("mojom") {
   sources = [ "gpu_preference.mojom" ]
-
   public_deps = [ "//mojo/public/mojom/base" ]
+  cpp_typemaps = [
+    {
+      types = [
+        {
+          mojom = "gl.mojom.GpuPreference"
+          cpp = "::gl::GpuPreference"
+        },
+      ]
+      traits_headers = [ "gpu_preference_mojom_traits.h" ]
+      traits_public_deps = [ "//ui/gl" ]
+    },
+  ]
 }
 
 mojom("test_interfaces") {