Rename traits and mojo directory in //services/viz/public
This CL renames mojo to mojom and *_struct_traits.* to
*_mojom_traits.* in //services/viz/public.
*_struct_traits.* => *_mojom_traits.*
services/viz/public/interfaces => services/viz/public/mojom
Bug: 806965
Change-Id: If8838d8a33c1063b4ce97cc791723a2e89d9f632
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715488
Commit-Queue: Miyoung Shin <myid.shin@igalia.com>
Reviewed-by: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: John Abd-El-Malek <jam@chromium.org>
Reviewed-by: enne <enne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#681628}
diff --git a/android_webview/DEPS b/android_webview/DEPS
index 9a1bae88..ac2bc71 100644
--- a/android_webview/DEPS
+++ b/android_webview/DEPS
@@ -32,7 +32,7 @@
"+services/network/public/cpp",
"+services/preferences/tracked",
"+services/service_manager/public",
- "+services/viz/public/interfaces",
+ "+services/viz/public/mojom",
"+skia",
"+third_party/skia/include",
"+third_party/boringssl/src/include",
diff --git a/android_webview/browser/gfx/BUILD.gn b/android_webview/browser/gfx/BUILD.gn
index 641eae0..237fb03f 100644
--- a/android_webview/browser/gfx/BUILD.gn
+++ b/android_webview/browser/gfx/BUILD.gn
@@ -63,7 +63,7 @@
"//gpu/skia_bindings",
"//gpu/vulkan:vulkan",
"//gpu/vulkan/init",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia",
"//ui/gfx",
"//ui/gl",
diff --git a/android_webview/browser/gfx/hardware_renderer.h b/android_webview/browser/gfx/hardware_renderer.h
index dec087b..38a1b29 100644
--- a/android_webview/browser/gfx/hardware_renderer.h
+++ b/android_webview/browser/gfx/hardware_renderer.h
@@ -13,7 +13,7 @@
#include "base/memory/ref_counted.h"
#include "components/viz/common/frame_timing_details_map.h"
#include "components/viz/common/surfaces/frame_sink_id.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
#include "ui/gfx/color_space.h"
namespace viz {
diff --git a/android_webview/browser/gfx/surfaces_instance.h b/android_webview/browser/gfx/surfaces_instance.h
index 5b0f5cf..52a27d4 100644
--- a/android_webview/browser/gfx/surfaces_instance.h
+++ b/android_webview/browser/gfx/surfaces_instance.h
@@ -17,7 +17,7 @@
#include "components/viz/common/surfaces/surface_id.h"
#include "components/viz/service/display/display_client.h"
#include "gpu/command_buffer/service/shared_context_state.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
#include "ui/gfx/color_space.h"
namespace gfx {
diff --git a/ash/public/cpp/BUILD.gn b/ash/public/cpp/BUILD.gn
index caff4388..a16a6b3 100644
--- a/ash/public/cpp/BUILD.gn
+++ b/ash/public/cpp/BUILD.gn
@@ -272,7 +272,7 @@
"//services/preferences/public/mojom",
"//services/service_manager/public/cpp",
"//services/service_manager/public/mojom",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
]
}
diff --git a/ash/wm/video_detector.h b/ash/wm/video_detector.h
index 1a2bcf4..7cd3e307 100644
--- a/ash/wm/video_detector.h
+++ b/ash/wm/video_detector.h
@@ -19,7 +19,7 @@
#include "base/time/time.h"
#include "base/timer/timer.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/video_detector_observer.mojom.h"
+#include "services/viz/public/mojom/compositing/video_detector_observer.mojom.h"
#include "ui/aura/env_observer.h"
#include "ui/aura/window_observer.h"
diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index 80c2ef76..a39b7bb 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -831,7 +831,7 @@
"//media",
"//mojo/core/embedder",
"//mojo/public/cpp/bindings",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia",
"//testing/gmock",
"//testing/gtest",
diff --git a/cc/mojo_embedder/BUILD.gn b/cc/mojo_embedder/BUILD.gn
index 3abdc4c..63e0725 100644
--- a/cc/mojo_embedder/BUILD.gn
+++ b/cc/mojo_embedder/BUILD.gn
@@ -19,6 +19,6 @@
"//components/viz/client",
"//components/viz/common",
"//mojo/public/cpp/bindings",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
]
}
diff --git a/cc/mojo_embedder/DEPS b/cc/mojo_embedder/DEPS
index d5c8e6fc..325a68d 100644
--- a/cc/mojo_embedder/DEPS
+++ b/cc/mojo_embedder/DEPS
@@ -1,4 +1,4 @@
include_rules = [
"+mojo/public/cpp/bindings",
- "+services/viz/public/interfaces/compositing",
+ "+services/viz/public/mojom/compositing",
]
diff --git a/cc/mojo_embedder/async_layer_tree_frame_sink.h b/cc/mojo_embedder/async_layer_tree_frame_sink.h
index 1b176d0..70f521b 100644
--- a/cc/mojo_embedder/async_layer_tree_frame_sink.h
+++ b/cc/mojo_embedder/async_layer_tree_frame_sink.h
@@ -20,7 +20,7 @@
#include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
#include "components/viz/common/surfaces/surface_id.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
namespace base {
class HistogramBase;
diff --git a/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc b/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc
index 8205b65..95580ee 100644
--- a/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc
+++ b/cc/mojo_embedder/async_layer_tree_frame_sink_unittest.cc
@@ -23,7 +23,7 @@
#include "components/viz/test/test_context_provider.h"
#include "components/viz/test/test_gpu_memory_buffer_manager.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace cc {
diff --git a/cc/test/DEPS b/cc/test/DEPS
index 525f2332..b2da679b 100644
--- a/cc/test/DEPS
+++ b/cc/test/DEPS
@@ -11,7 +11,7 @@
"+gpu/config/gpu_info.h",
"+gpu/ipc",
"+services/viz/privileged/interfaces/gl/gpu_host.mojom.h",
- "+services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h",
+ "+services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h",
]
specific_include_rules = {
diff --git a/cc/test/test_layer_tree_frame_sink.h b/cc/test/test_layer_tree_frame_sink.h
index 73de92c..c283a57 100644
--- a/cc/test/test_layer_tree_frame_sink.h
+++ b/cc/test/test_layer_tree_frame_sink.h
@@ -16,7 +16,7 @@
#include "components/viz/service/display/display_client.h"
#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
#include "components/viz/test/test_shared_bitmap_manager.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
namespace base {
class SingleThreadTaskRunner;
diff --git a/chrome/browser/chromeos/DEPS b/chrome/browser/chromeos/DEPS
index d388eba..6e1b5db 100644
--- a/chrome/browser/chromeos/DEPS
+++ b/chrome/browser/chromeos/DEPS
@@ -18,7 +18,7 @@
"+services/metrics/public",
"+services/network",
"+services/tracing/public",
- "+services/viz/public/interfaces",
+ "+services/viz/public/mojom",
# keyboard::KeyboardController only exists in ash and should not be accessed
# directly from src/chrome. Use ChromeKeyboardControllerClient instead.
diff --git a/chrome/browser/chromeos/power/ml/adaptive_screen_brightness_manager.cc b/chrome/browser/chromeos/power/ml/adaptive_screen_brightness_manager.cc
index 2891acf..62c2696 100644
--- a/chrome/browser/chromeos/power/ml/adaptive_screen_brightness_manager.cc
+++ b/chrome/browser/chromeos/power/ml/adaptive_screen_brightness_manager.cc
@@ -35,7 +35,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/common/page_importance_signals.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
-#include "services/viz/public/interfaces/compositing/video_detector_observer.mojom.h"
+#include "services/viz/public/mojom/compositing/video_detector_observer.mojom.h"
#include "ui/aura/env.h"
#include "ui/base/user_activity/user_activity_detector.h"
diff --git a/chrome/browser/chromeos/power/ml/adaptive_screen_brightness_manager.h b/chrome/browser/chromeos/power/ml/adaptive_screen_brightness_manager.h
index f6d8230..4960293 100644
--- a/chrome/browser/chromeos/power/ml/adaptive_screen_brightness_manager.h
+++ b/chrome/browser/chromeos/power/ml/adaptive_screen_brightness_manager.h
@@ -16,7 +16,7 @@
#include "chromeos/dbus/power/power_manager_client.h"
#include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/video_detector_observer.mojom.h"
+#include "services/viz/public/mojom/compositing/video_detector_observer.mojom.h"
#include "ui/base/user_activity/user_activity_observer.h"
namespace base {
diff --git a/chrome/browser/chromeos/power/ml/idle_event_notifier.h b/chrome/browser/chromeos/power/ml/idle_event_notifier.h
index 5b70648..5c8708b 100644
--- a/chrome/browser/chromeos/power/ml/idle_event_notifier.h
+++ b/chrome/browser/chromeos/power/ml/idle_event_notifier.h
@@ -18,7 +18,7 @@
#include "chromeos/dbus/power/power_manager_client.h"
#include "chromeos/dbus/power_manager/power_supply_properties.pb.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/video_detector_observer.mojom.h"
+#include "services/viz/public/mojom/compositing/video_detector_observer.mojom.h"
#include "ui/base/user_activity/user_activity_detector.h"
#include "ui/base/user_activity/user_activity_observer.h"
diff --git a/chrome/browser/chromeos/power/ml/user_activity_controller.cc b/chrome/browser/chromeos/power/ml/user_activity_controller.cc
index d4b1bb08..5f7dfea9 100644
--- a/chrome/browser/chromeos/power/ml/user_activity_controller.cc
+++ b/chrome/browser/chromeos/power/ml/user_activity_controller.cc
@@ -9,7 +9,7 @@
#include "chromeos/dbus/dbus_thread_manager.h"
#include "components/session_manager/session_manager_types.h"
#include "components/viz/host/host_frame_sink_manager.h"
-#include "services/viz/public/interfaces/compositing/video_detector_observer.mojom.h"
+#include "services/viz/public/mojom/compositing/video_detector_observer.mojom.h"
#include "ui/aura/env.h"
#include "ui/compositor/compositor.h"
diff --git a/chrome/browser/chromeos/power/ml/user_activity_manager.h b/chrome/browser/chromeos/power/ml/user_activity_manager.h
index d0f2a9b..954fca5 100644
--- a/chrome/browser/chromeos/power/ml/user_activity_manager.h
+++ b/chrome/browser/chromeos/power/ml/user_activity_manager.h
@@ -23,7 +23,7 @@
#include "components/session_manager/core/session_manager.h"
#include "components/session_manager/core/session_manager_observer.h"
#include "services/metrics/public/cpp/ukm_source_id.h"
-#include "services/viz/public/interfaces/compositing/video_detector_observer.mojom.h"
+#include "services/viz/public/mojom/compositing/video_detector_observer.mojom.h"
#include "ui/aura/window.h"
#include "ui/base/user_activity/user_activity_detector.h"
#include "ui/base/user_activity/user_activity_observer.h"
diff --git a/components/arc/common/BUILD.gn b/components/arc/common/BUILD.gn
index 5aa3954..8599964 100644
--- a/components/arc/common/BUILD.gn
+++ b/components/arc/common/BUILD.gn
@@ -91,7 +91,7 @@
}
# Media related mojo interfaces. These are used by
- # //services/viz/public/interfaces. We have this separate mojom target to
+ # //services/viz/public/mojom. We have this separate mojom target to
# avoid pulling in unnecessary interfaces.
mojom("media") {
sources = [
diff --git a/components/exo/wayland/BUILD.gn b/components/exo/wayland/BUILD.gn
index d5e5844..608f361 100644
--- a/components/exo/wayland/BUILD.gn
+++ b/components/exo/wayland/BUILD.gn
@@ -110,7 +110,7 @@
"//components/exo/wayland/protocol:aura_shell_protocol",
"//device/gamepad",
"//services/viz/privileged/interfaces/compositing",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia",
"//third_party/libsync",
"//third_party/wayland:wayland_server",
diff --git a/components/exo/wayland/DEPS b/components/exo/wayland/DEPS
index a15815d3..33a9ebc 100644
--- a/components/exo/wayland/DEPS
+++ b/components/exo/wayland/DEPS
@@ -1,4 +1,4 @@
include_rules = [
- "+services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h",
+ "+services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h",
"+third_party/wayland/include",
]
diff --git a/components/viz/client/BUILD.gn b/components/viz/client/BUILD.gn
index b58252d..57636a46 100644
--- a/components/viz/client/BUILD.gn
+++ b/components/viz/client/BUILD.gn
@@ -51,7 +51,7 @@
"//components/viz/client",
"//components/viz/test:test_support",
"//mojo/public/cpp/bindings",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//testing/gmock",
"//testing/gtest",
]
diff --git a/components/viz/demo/BUILD.gn b/components/viz/demo/BUILD.gn
index 55981f9..d73a6ca 100644
--- a/components/viz/demo/BUILD.gn
+++ b/components/viz/demo/BUILD.gn
@@ -15,7 +15,7 @@
deps = [
"//components/viz/common",
"//mojo/public/cpp/bindings",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
]
}
diff --git a/components/viz/demo/client/demo_client.h b/components/viz/demo/client/demo_client.h
index fbe3a53..09ae4136 100644
--- a/components/viz/demo/client/demo_client.h
+++ b/components/viz/demo/client/demo_client.h
@@ -14,7 +14,7 @@
#include "components/viz/common/quads/compositor_frame_metadata.h"
#include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
namespace viz {
class CompositorFrame;
diff --git a/components/viz/host/BUILD.gn b/components/viz/host/BUILD.gn
index 57e211c..d4301ff 100644
--- a/components/viz/host/BUILD.gn
+++ b/components/viz/host/BUILD.gn
@@ -57,7 +57,7 @@
"//gpu/command_buffer/client",
"//gpu/ipc/host",
"//services/viz/privileged/interfaces/compositing",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//ui/gfx/geometry",
]
@@ -88,7 +88,7 @@
"//gpu/ipc/host",
"//mojo/public/cpp/bindings",
"//services/viz/privileged/interfaces",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//testing/gmock",
"//testing/gtest",
diff --git a/components/viz/host/DEPS b/components/viz/host/DEPS
index 1b7c7322..423fba8 100644
--- a/components/viz/host/DEPS
+++ b/components/viz/host/DEPS
@@ -15,8 +15,8 @@
"+mojo/public/cpp",
"+services/service_manager/public",
"+services/viz/privileged/interfaces",
- "+services/viz/public/interfaces",
- "+services/viz/public/interfaces/hit_test",
+ "+services/viz/public/mojom",
+ "+services/viz/public/mojom/hit_test",
"+skia",
"+third_party/skia",
"+ui/accelerated_widget_mac",
diff --git a/components/viz/host/gpu_client.h b/components/viz/host/gpu_client.h
index 330bf7c..9b9cdc0 100644
--- a/components/viz/host/gpu_client.h
+++ b/components/viz/host/gpu_client.h
@@ -11,7 +11,7 @@
#include "components/viz/host/gpu_host_impl.h"
#include "components/viz/host/viz_host_export.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/viz/public/interfaces/gpu.mojom.h"
+#include "services/viz/public/mojom/gpu.mojom.h"
namespace viz {
diff --git a/components/viz/host/hit_test/DEPS b/components/viz/host/hit_test/DEPS
index 0c23a8bf..28690bc5 100644
--- a/components/viz/host/hit_test/DEPS
+++ b/components/viz/host/hit_test/DEPS
@@ -1,7 +1,7 @@
# Please consult components/viz/README.md about allowable dependencies.
include_rules = [
- "+services/viz/public/interfaces",
+ "+services/viz/public/mojom",
]
specific_include_rules = {
diff --git a/components/viz/host/hit_test/hit_test_query.h b/components/viz/host/hit_test/hit_test_query.h
index 14d5bf2..90a5b4b 100644
--- a/components/viz/host/hit_test/hit_test_query.h
+++ b/components/viz/host/hit_test/hit_test_query.h
@@ -19,7 +19,7 @@
FrameSinkId frame_sink_id;
// Coordinates in the coordinate system of the target FrameSinkId.
gfx::PointF location_in_target;
- // Different flags are defined in services/viz/public/interfaces/hit_test/
+ // Different flags are defined in services/viz/public/mojom/hit_test/
// hit_test_region_list.mojom.
uint32_t flags = 0;
};
diff --git a/components/viz/host/host_frame_sink_manager.cc b/components/viz/host/host_frame_sink_manager.cc
index c4bfe8b..dc4b742 100644
--- a/components/viz/host/host_frame_sink_manager.cc
+++ b/components/viz/host/host_frame_sink_manager.cc
@@ -15,7 +15,7 @@
#include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
#include "mojo/public/cpp/bindings/sync_call_restrictions.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
namespace viz {
diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn
index fdd358f..71579e1 100644
--- a/components/viz/service/BUILD.gn
+++ b/components/viz/service/BUILD.gn
@@ -210,7 +210,7 @@
"//cc/debug",
"//gpu/command_buffer/client:gles2_interface",
"//services/viz/privileged/interfaces/compositing",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//ui/gfx",
"//ui/gfx/geometry",
"//ui/latency",
@@ -451,7 +451,7 @@
"//gpu/ipc/service",
"//media",
"//media/capture:capture_lib",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia",
"//testing/gmock",
"//testing/gtest",
diff --git a/components/viz/service/DEPS b/components/viz/service/DEPS
index 01b30d6..26c19fa 100644
--- a/components/viz/service/DEPS
+++ b/components/viz/service/DEPS
@@ -9,7 +9,7 @@
"+gpu/config/gpu_feature_info.h",
"+gpu/ipc/common/surface_handle.h",
"+services/viz/privileged/interfaces",
- "+services/viz/public/interfaces",
+ "+services/viz/public/mojom",
"+third_party/skia",
"+ui/latency",
"+ui/ozone/public",
diff --git a/components/viz/service/display/display.cc b/components/viz/service/display/display.cc
index 72373b8..e5d8930 100644
--- a/components/viz/service/display/display.cc
+++ b/components/viz/service/display/display.cc
@@ -35,7 +35,7 @@
#include "components/viz/service/surfaces/surface.h"
#include "components/viz/service/surfaces/surface_manager.h"
#include "gpu/command_buffer/client/gles2_interface.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
#include "ui/gfx/buffer_types.h"
#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/overlay_transform_utils.h"
diff --git a/components/viz/service/display_embedder/compositing_mode_reporter_impl.h b/components/viz/service/display_embedder/compositing_mode_reporter_impl.h
index 90852b6..14f9758 100644
--- a/components/viz/service/display_embedder/compositing_mode_reporter_impl.h
+++ b/components/viz/service/display_embedder/compositing_mode_reporter_impl.h
@@ -9,7 +9,7 @@
#include "components/viz/service/viz_service_export.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/interface_ptr_set.h"
-#include "services/viz/public/interfaces/compositing/compositing_mode_watcher.mojom.h"
+#include "services/viz/public/mojom/compositing/compositing_mode_watcher.mojom.h"
namespace viz {
diff --git a/components/viz/service/frame_sinks/compositor_frame_sink_impl.h b/components/viz/service/frame_sinks/compositor_frame_sink_impl.h
index 8eb02da..63088674 100644
--- a/components/viz/service/frame_sinks/compositor_frame_sink_impl.h
+++ b/components/viz/service/frame_sinks/compositor_frame_sink_impl.h
@@ -11,7 +11,7 @@
#include "components/viz/common/surfaces/local_surface_id.h"
#include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
namespace viz {
diff --git a/components/viz/service/frame_sinks/compositor_frame_sink_support.h b/components/viz/service/frame_sinks/compositor_frame_sink_support.h
index 8ec28d3..08bded4 100644
--- a/components/viz/service/frame_sinks/compositor_frame_sink_support.h
+++ b/components/viz/service/frame_sinks/compositor_frame_sink_support.h
@@ -25,8 +25,8 @@
#include "components/viz/service/hit_test/hit_test_aggregator.h"
#include "components/viz/service/surfaces/surface_client.h"
#include "components/viz/service/viz_service_export.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
-#include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom.h"
namespace viz {
diff --git a/components/viz/service/frame_sinks/compositor_frame_sink_support_unittest.cc b/components/viz/service/frame_sinks/compositor_frame_sink_support_unittest.cc
index 14ab075..61cd15e 100644
--- a/components/viz/service/frame_sinks/compositor_frame_sink_support_unittest.cc
+++ b/components/viz/service/frame_sinks/compositor_frame_sink_support_unittest.cc
@@ -23,7 +23,7 @@
#include "components/viz/test/fake_surface_observer.h"
#include "components/viz/test/mock_compositor_frame_sink_client.h"
#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/khronos/GLES2/gl2.h"
diff --git a/components/viz/service/frame_sinks/direct_layer_tree_frame_sink.h b/components/viz/service/frame_sinks/direct_layer_tree_frame_sink.h
index f8d3d1f1..d5f0dd6 100644
--- a/components/viz/service/frame_sinks/direct_layer_tree_frame_sink.h
+++ b/components/viz/service/frame_sinks/direct_layer_tree_frame_sink.h
@@ -17,7 +17,7 @@
#include "components/viz/service/frame_sinks/compositor_frame_sink_support.h"
#include "components/viz/service/viz_service_export.h"
#include "services/viz/privileged/interfaces/compositing/display_private.mojom.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
namespace base {
class HistogramBase;
diff --git a/components/viz/service/frame_sinks/frame_sink_manager_impl.h b/components/viz/service/frame_sinks/frame_sink_manager_impl.h
index 10288ed..70d8426 100644
--- a/components/viz/service/frame_sinks/frame_sink_manager_impl.h
+++ b/components/viz/service/frame_sinks/frame_sink_manager_impl.h
@@ -37,7 +37,7 @@
#include "mojo/public/cpp/bindings/binding.h"
#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
#include "services/viz/privileged/interfaces/compositing/frame_sink_video_capture.mojom.h"
-#include "services/viz/public/interfaces/compositing/video_detector_observer.mojom.h"
+#include "services/viz/public/mojom/compositing/video_detector_observer.mojom.h"
namespace viz {
diff --git a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
index 0e44282..464e3fe 100644
--- a/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
+++ b/components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
@@ -17,7 +17,7 @@
#include "mojo/public/cpp/bindings/associated_binding.h"
#include "services/viz/privileged/interfaces/compositing/display_private.mojom.h"
#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
namespace viz {
diff --git a/components/viz/service/frame_sinks/video_detector.h b/components/viz/service/frame_sinks/video_detector.h
index e0784b4..970b8b1 100644
--- a/components/viz/service/frame_sinks/video_detector.h
+++ b/components/viz/service/frame_sinks/video_detector.h
@@ -14,7 +14,7 @@
#include "components/viz/service/surfaces/surface_observer.h"
#include "components/viz/service/viz_service_export.h"
#include "mojo/public/cpp/bindings/interface_ptr_set.h"
-#include "services/viz/public/interfaces/compositing/video_detector_observer.mojom.h"
+#include "services/viz/public/mojom/compositing/video_detector_observer.mojom.h"
namespace viz {
diff --git a/components/viz/service/frame_sinks/video_detector_unittest.cc b/components/viz/service/frame_sinks/video_detector_unittest.cc
index f09973e8..1c411e99 100644
--- a/components/viz/service/frame_sinks/video_detector_unittest.cc
+++ b/components/viz/service/frame_sinks/video_detector_unittest.cc
@@ -21,7 +21,7 @@
#include "components/viz/test/fake_compositor_frame_sink_client.h"
#include "components/viz/test/surface_id_allocator_set.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/video_detector_observer.mojom.h"
+#include "services/viz/public/mojom/compositing/video_detector_observer.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/components/viz/service/gl/gpu_service_impl_unittest.cc b/components/viz/service/gl/gpu_service_impl_unittest.cc
index 70e0a75a..72ec7d5 100644
--- a/components/viz/service/gl/gpu_service_impl_unittest.cc
+++ b/components/viz/service/gl/gpu_service_impl_unittest.cc
@@ -18,7 +18,7 @@
#include "gpu/ipc/service/gpu_watchdog_thread.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
-#include "services/viz/public/interfaces/gpu.mojom.h"
+#include "services/viz/public/mojom/gpu.mojom.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gl/init/gl_factory.h"
diff --git a/components/viz/service/hit_test/hit_test_manager.h b/components/viz/service/hit_test/hit_test_manager.h
index f2bc9af..ce2c6ab 100644
--- a/components/viz/service/hit_test/hit_test_manager.h
+++ b/components/viz/service/hit_test/hit_test_manager.h
@@ -12,7 +12,7 @@
#include "components/viz/service/surfaces/surface_manager.h"
#include "components/viz/service/surfaces/surface_observer.h"
#include "components/viz/service/viz_service_export.h"
-#include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom.h"
+#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom.h"
namespace viz {
diff --git a/components/viz/test/DEPS b/components/viz/test/DEPS
index 37e2952..a34483a 100644
--- a/components/viz/test/DEPS
+++ b/components/viz/test/DEPS
@@ -25,7 +25,7 @@
"+mojo/public/cpp/bindings",
"+mojo/public/cpp/system",
"+services/viz/privileged/interfaces",
- "+services/viz/public/interfaces",
+ "+services/viz/public/mojom",
"+third_party/khronos/GLES2/gl2.h",
"+third_party/khronos/GLES2/gl2ext.h",
"+third_party/skia/include",
diff --git a/components/viz/test/fake_compositor_frame_sink_client.h b/components/viz/test/fake_compositor_frame_sink_client.h
index 29fb4ba..982061e 100644
--- a/components/viz/test/fake_compositor_frame_sink_client.h
+++ b/components/viz/test/fake_compositor_frame_sink_client.h
@@ -10,7 +10,7 @@
#include "components/viz/common/frame_timing_details_map.h"
#include "components/viz/common/surfaces/local_surface_id.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
namespace viz {
diff --git a/components/viz/test/mock_compositor_frame_sink_client.h b/components/viz/test/mock_compositor_frame_sink_client.h
index caf0a016..f3e8308 100644
--- a/components/viz/test/mock_compositor_frame_sink_client.h
+++ b/components/viz/test/mock_compositor_frame_sink_client.h
@@ -8,7 +8,7 @@
#include "base/callback.h"
#include "components/viz/common/frame_timing_details_map.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
#include "testing/gmock/include/gmock/gmock.h"
namespace viz {
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 5df548c..c89189b 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -188,7 +188,7 @@
"//services/video_capture/public/uma",
"//services/viz/privileged/interfaces",
"//services/viz/public/cpp/gpu",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia",
"//sql",
"//storage/browser",
diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h
index 7377a25..efaf2ce 100644
--- a/content/browser/browser_main_loop.h
+++ b/content/browser/browser_main_loop.h
@@ -17,7 +17,7 @@
#include "content/public/browser/browser_main_runner.h"
#include "media/media_buildflags.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/viz/public/interfaces/compositing/compositing_mode_watcher.mojom.h"
+#include "services/viz/public/mojom/compositing/compositing_mode_watcher.mojom.h"
#include "ui/base/buildflags.h"
#if defined(OS_CHROMEOS)
diff --git a/content/browser/compositor/viz_process_transport_factory.h b/content/browser/compositor/viz_process_transport_factory.h
index 28770e8..64ff214 100644
--- a/content/browser/compositor/viz_process_transport_factory.h
+++ b/content/browser/compositor/viz_process_transport_factory.h
@@ -15,7 +15,7 @@
#include "gpu/command_buffer/common/context_result.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
#include "ui/compositor/compositor.h"
#include "ui/compositor/host/host_context_factory_private.h"
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 09fffef..6752b4e0 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -67,7 +67,7 @@
#include "services/device/public/mojom/wake_lock_context.mojom.h"
#include "services/service_manager/public/cpp/binder_registry.h"
#include "services/service_manager/public/mojom/interface_provider.mojom.h"
-#include "services/viz/public/interfaces/hit_test/input_target_client.mojom.h"
+#include "services/viz/public/mojom/hit_test/input_target_client.mojom.h"
#include "third_party/blink/public/common/feature_policy/feature_policy.h"
#include "third_party/blink/public/common/frame/blocked_navigation_types.h"
#include "third_party/blink/public/common/frame/frame_owner_element_type.h"
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc
index b85e3e6..a5965e4 100644
--- a/content/browser/renderer_host/compositor_impl_android.cc
+++ b/content/browser/renderer_host/compositor_impl_android.cc
@@ -71,7 +71,7 @@
#include "gpu/ipc/client/gpu_channel_host.h"
#include "gpu/ipc/common/gpu_surface_tracker.h"
#include "services/viz/public/cpp/gpu/context_provider_command_buffer.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/khronos/GLES2/gl2ext.h"
#include "third_party/skia/include/core/SkMallocPixelRef.h"
diff --git a/content/browser/renderer_host/delegated_frame_host.h b/content/browser/renderer_host/delegated_frame_host.h
index 3368e61..c01fba1 100644
--- a/content/browser/renderer_host/delegated_frame_host.h
+++ b/content/browser/renderer_host/delegated_frame_host.h
@@ -23,8 +23,8 @@
#include "content/browser/renderer_host/dip_util.h"
#include "content/common/content_export.h"
#include "content/common/tab_switch_time_recorder.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
-#include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom.h"
#include "ui/compositor/compositor.h"
#include "ui/compositor/compositor_observer.h"
#include "ui/compositor/layer.h"
diff --git a/content/browser/renderer_host/embedded_frame_sink_provider_impl_unittest.cc b/content/browser/renderer_host/embedded_frame_sink_provider_impl_unittest.cc
index da7b4e6..0d1d4e4 100644
--- a/content/browser/renderer_host/embedded_frame_sink_provider_impl_unittest.cc
+++ b/content/browser/renderer_host/embedded_frame_sink_provider_impl_unittest.cc
@@ -21,7 +21,7 @@
#include "components/viz/test/mock_compositor_frame_sink_client.h"
#include "content/browser/compositor/surface_utils.h"
#include "content/browser/renderer_host/embedded_frame_sink_impl.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom.h"
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h
index b07ea3a2..2bf5bcb 100644
--- a/content/browser/renderer_host/render_process_host_impl.h
+++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -58,8 +58,8 @@
#include "services/network/public/mojom/url_loader_factory.mojom.h"
#include "services/service_manager/public/cpp/binder_registry.h"
#include "services/service_manager/public/mojom/service.mojom.h"
-#include "services/viz/public/interfaces/compositing/compositing_mode_watcher.mojom.h"
-#include "services/viz/public/interfaces/gpu.mojom.h"
+#include "services/viz/public/mojom/compositing/compositing_mode_watcher.mojom.h"
+#include "services/viz/public/mojom/gpu.mojom.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
#include "third_party/blink/public/mojom/associated_interfaces/associated_interfaces.mojom.h"
#include "third_party/blink/public/mojom/broadcastchannel/broadcast_channel.mojom.h"
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index 3507700..9583543 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -59,8 +59,8 @@
#include "mojo/public/cpp/bindings/associated_remote.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/remote.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
-#include "services/viz/public/interfaces/hit_test/input_target_client.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/hit_test/input_target_client.mojom.h"
#include "third_party/blink/public/common/manifest/web_display_mode.h"
#include "ui/base/ime/text_input_mode.h"
#include "ui/base/ime/text_input_type.h"
diff --git a/content/browser/renderer_host/render_widget_host_input_event_router_unittest.cc b/content/browser/renderer_host/render_widget_host_input_event_router_unittest.cc
index bc81adb..21920184 100644
--- a/content/browser/renderer_host/render_widget_host_input_event_router_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_input_event_router_unittest.cc
@@ -22,7 +22,7 @@
#include "content/test/mock_render_widget_host_delegate.h"
#include "content/test/mock_widget_impl.h"
#include "content/test/test_render_view_host.h"
-#include "services/viz/public/interfaces/hit_test/input_target_client.mojom.h"
+#include "services/viz/public/mojom/hit_test/input_target_client.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace content {
diff --git a/content/browser/renderer_host/render_widget_host_view_base.h b/content/browser/renderer_host/render_widget_host_view_base.h
index 8e523d78e..1381c94 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.h
+++ b/content/browser/renderer_host/render_widget_host_view_base.h
@@ -31,8 +31,8 @@
#include "content/public/common/input_event_ack_state.h"
#include "content/public/common/screen_info.h"
#include "content/public/common/widget_type.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
-#include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom.h"
#include "third_party/blink/public/common/screen_orientation/web_screen_orientation_type.h"
#include "third_party/blink/public/platform/web_intrinsic_sizing_info.h"
#include "third_party/blink/public/web/web_text_direction.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_child_frame.h b/content/browser/renderer_host/render_widget_host_view_child_frame.h
index 963a056..b88f2c73 100644
--- a/content/browser/renderer_host/render_widget_host_view_child_frame.h
+++ b/content/browser/renderer_host/render_widget_host_view_child_frame.h
@@ -27,7 +27,7 @@
#include "content/common/content_export.h"
#include "content/public/browser/touch_selection_controller_client_manager.h"
#include "content/public/common/input_event_ack_state.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
#include "third_party/blink/public/common/frame/occlusion_state.h"
#include "third_party/blink/public/platform/web_intrinsic_sizing_info.h"
#include "ui/gfx/geometry/rect.h"
diff --git a/content/browser/service_manager/common_browser_interfaces.cc b/content/browser/service_manager/common_browser_interfaces.cc
index c96fd89..76d973c 100644
--- a/content/browser/service_manager/common_browser_interfaces.cc
+++ b/content/browser/service_manager/common_browser_interfaces.cc
@@ -26,7 +26,7 @@
#include "content/public/common/service_names.mojom.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "services/service_manager/public/cpp/binder_registry.h"
-#include "services/viz/public/interfaces/gpu.mojom.h"
+#include "services/viz/public/mojom/gpu.mojom.h"
#if defined(OS_WIN)
#include "content/browser/renderer_host/dwrite_font_proxy_impl_win.h"
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index f2af9537e..ec494c27 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -317,7 +317,7 @@
"//services/service_manager/public/mojom",
"//services/service_manager/zygote:zygote_buildflags",
"//services/video_capture/public/mojom",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia",
"//storage/common",
"//third_party/angle:angle_gpu_info_util",
@@ -516,7 +516,7 @@
"//services/network/public/mojom",
"//services/service_manager/public/mojom",
"//services/video_capture/public/mojom",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia/public/interfaces",
"//third_party/blink/public/mojom:mojom_core",
"//third_party/blink/public/mojom:web_feature_mojo_bindings",
diff --git a/content/common/DEPS b/content/common/DEPS
index f0157d6b..6a18ca5 100644
--- a/content/common/DEPS
+++ b/content/common/DEPS
@@ -14,7 +14,7 @@
"+services/service_manager/sandbox",
"+services/video_capture/public/mojom",
"+services/viz/public/cpp",
- "+services/viz/public/interfaces",
+ "+services/viz/public/mojom",
# No inclusion of WebKit from the browser, other than the ones in
# WebKit/public/{mojom,common}, or the ones that are strictly enum/POD,
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index b3eb08b..dfc69ef 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -19,7 +19,7 @@
import "services/network/public/mojom/url_loader.mojom";
import "services/network/public/mojom/url_loader_factory.mojom";
import "services/service_manager/public/mojom/interface_provider.mojom";
-import "services/viz/public/interfaces/compositing/surface_id.mojom";
+import "services/viz/public/mojom/compositing/surface_id.mojom";
import "third_party/blink/public/mojom/blob/blob_url_store.mojom";
import "third_party/blink/public/mojom/commit_result/commit_result.mojom";
import "third_party/blink/public/mojom/devtools/console_message.mojom";
diff --git a/content/common/frame_sink_provider.mojom b/content/common/frame_sink_provider.mojom
index 003f761e..f02c482 100644
--- a/content/common/frame_sink_provider.mojom
+++ b/content/common/frame_sink_provider.mojom
@@ -5,7 +5,7 @@
module content.mojom;
import "content/common/render_frame_metadata.mojom";
-import "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom";
+import "services/viz/public/mojom/compositing/compositor_frame_sink.mojom";
// This interface provides CompositorFrameSink and a
// RenderFrameMetadataObserverClient for the renderer. While also
diff --git a/content/common/input/synchronous_compositor.mojom b/content/common/input/synchronous_compositor.mojom
index f1bc91e..a1ff319 100644
--- a/content/common/input/synchronous_compositor.mojom
+++ b/content/common/input/synchronous_compositor.mojom
@@ -6,11 +6,11 @@
import "mojo/public/mojom/base/shared_memory.mojom";
import "mojo/public/mojom/base/time.mojom";
-import "services/viz/public/interfaces/compositing/begin_frame_args.mojom";
-import "services/viz/public/interfaces/compositing/compositor_frame.mojom";
-import "services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom";
-import "services/viz/public/interfaces/compositing/frame_timing_details.mojom";
-import "services/viz/public/interfaces/compositing/returned_resource.mojom";
+import "services/viz/public/mojom/compositing/begin_frame_args.mojom";
+import "services/viz/public/mojom/compositing/compositor_frame.mojom";
+import "services/viz/public/mojom/compositing/compositor_frame_metadata.mojom";
+import "services/viz/public/mojom/compositing/frame_timing_details.mojom";
+import "services/viz/public/mojom/compositing/returned_resource.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
[Native]
diff --git a/content/common/render_frame_metadata.mojom b/content/common/render_frame_metadata.mojom
index cb47c36f..f36d562 100644
--- a/content/common/render_frame_metadata.mojom
+++ b/content/common/render_frame_metadata.mojom
@@ -5,8 +5,8 @@
module content.mojom;
import "mojo/public/mojom/base/time.mojom";
-import "services/viz/public/interfaces/compositing/local_surface_id_allocation.mojom";
-import "services/viz/public/interfaces/compositing/selection.mojom";
+import "services/viz/public/mojom/compositing/local_surface_id_allocation.mojom";
+import "services/viz/public/mojom/compositing/selection.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
// See components/viz/service/quads/render_frame_metadata.h
diff --git a/content/common/render_frame_metadata_struct_traits.cc b/content/common/render_frame_metadata_struct_traits.cc
index 0aa4886..bc68488 100644
--- a/content/common/render_frame_metadata_struct_traits.cc
+++ b/content/common/render_frame_metadata_struct_traits.cc
@@ -6,7 +6,7 @@
#include "build/build_config.h"
#include "mojo/public/cpp/base/time_mojom_traits.h"
-#include "services/viz/public/cpp/compositing/selection_struct_traits.h"
+#include "services/viz/public/cpp/compositing/selection_mojom_traits.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
#include "ui/gfx/mojo/selection_bound_struct_traits.h"
diff --git a/content/common/render_frame_metadata_struct_traits.h b/content/common/render_frame_metadata_struct_traits.h
index c11d448..b066e04a 100644
--- a/content/common/render_frame_metadata_struct_traits.h
+++ b/content/common/render_frame_metadata_struct_traits.h
@@ -10,7 +10,7 @@
#include "build/build_config.h"
#include "cc/trees/render_frame_metadata.h"
#include "content/common/render_frame_metadata.mojom-shared.h"
-#include "services/viz/public/cpp/compositing/local_surface_id_allocation_struct_traits.h"
+#include "services/viz/public/cpp/compositing/local_surface_id_allocation_mojom_traits.h"
namespace mojo {
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
index 4a483362..cf6fda85 100644
--- a/content/public/browser/BUILD.gn
+++ b/content/public/browser/BUILD.gn
@@ -403,7 +403,7 @@
"//services/service_manager/public/cpp",
"//services/tracing/public/cpp",
"//services/video_capture/public/mojom",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//third_party/webrtc/modules/desktop_capture",
# We expose skia headers in the public API.
diff --git a/content/public/browser/DEPS b/content/public/browser/DEPS
index 39f1a4a..79cb373 100644
--- a/content/public/browser/DEPS
+++ b/content/public/browser/DEPS
@@ -11,7 +11,7 @@
"+services/network/public/cpp",
"+services/service_manager/sandbox",
"+services/video_capture/public/mojom",
- "+services/viz/public/interfaces",
+ "+services/viz/public/mojom",
]
specific_include_rules = {
diff --git a/content/public/browser/gpu_client.h b/content/public/browser/gpu_client.h
index ab57aeb8..a1758533 100644
--- a/content/public/browser/gpu_client.h
+++ b/content/public/browser/gpu_client.h
@@ -9,7 +9,7 @@
#include "components/viz/host/gpu_client.h"
#include "content/common/content_export.h"
-#include "services/viz/public/interfaces/gpu.mojom.h"
+#include "services/viz/public/mojom/gpu.mojom.h"
namespace content {
diff --git a/content/renderer/android/synchronous_layer_tree_frame_sink.h b/content/renderer/android/synchronous_layer_tree_frame_sink.h
index d4cab9e..d25290b 100644
--- a/content/renderer/android/synchronous_layer_tree_frame_sink.h
+++ b/content/renderer/android/synchronous_layer_tree_frame_sink.h
@@ -27,7 +27,7 @@
#include "components/viz/service/display/display_client.h"
#include "components/viz/service/display_embedder/server_shared_bitmap_manager.h"
#include "ipc/ipc_message.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
#include "ui/gfx/transform.h"
class SkCanvas;
diff --git a/content/renderer/input/input_target_client_impl.h b/content/renderer/input/input_target_client_impl.h
index 459b123..4a9fc70 100644
--- a/content/renderer/input/input_target_client_impl.h
+++ b/content/renderer/input/input_target_client_impl.h
@@ -6,7 +6,7 @@
#define CONTENT_RENDERER_INPUT_INPUT_TARGET_CLIENT_IMPL_H_
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/hit_test/input_target_client.mojom.h"
+#include "services/viz/public/mojom/hit_test/input_target_client.mojom.h"
namespace content {
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index c02382e1..4f7588b6 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -52,7 +52,7 @@
#include "services/network/public/mojom/url_loader_factory.mojom.h"
#include "services/service_manager/public/cpp/bind_source_info.h"
#include "services/service_manager/public/cpp/binder_registry.h"
-#include "services/viz/public/interfaces/compositing/compositing_mode_watcher.mojom.h"
+#include "services/viz/public/mojom/compositing/compositing_mode_watcher.mojom.h"
#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
#include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
#include "third_party/blink/public/platform/scheduler/web_rail_mode_observer.h"
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 889c170ab..9f32c80b 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -396,7 +396,7 @@
"//services/proxy_resolver:lib",
"//services/service_manager/public/cpp",
"//services/viz/public/cpp/gpu",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia",
"//storage/browser",
"//storage/browser:test_support",
diff --git a/content/test/DEPS b/content/test/DEPS
index e133e65..620c0fac 100644
--- a/content/test/DEPS
+++ b/content/test/DEPS
@@ -9,7 +9,7 @@
"+components/viz/host",
"+components/viz/service",
"+components/viz/test",
- "+services/viz/public/interfaces",
+ "+services/viz/public/mojom",
# For WebRTC tests.
"+chromeos/audio",
diff --git a/content/test/fake_renderer_compositor_frame_sink.h b/content/test/fake_renderer_compositor_frame_sink.h
index b03770b5..0bffb7a 100644
--- a/content/test/fake_renderer_compositor_frame_sink.h
+++ b/content/test/fake_renderer_compositor_frame_sink.h
@@ -7,7 +7,7 @@
#include "components/viz/common/frame_timing_details_map.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
namespace content {
diff --git a/services/viz/privileged/interfaces/BUILD.gn b/services/viz/privileged/interfaces/BUILD.gn
index c43efb5c..1a8c10a0 100644
--- a/services/viz/privileged/interfaces/BUILD.gn
+++ b/services/viz/privileged/interfaces/BUILD.gn
@@ -14,7 +14,7 @@
"//services/network/public/mojom",
"//services/viz/privileged/interfaces/compositing",
"//services/viz/privileged/interfaces/gl",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//ui/gfx/mojo",
]
}
diff --git a/services/viz/privileged/interfaces/compositing/BUILD.gn b/services/viz/privileged/interfaces/compositing/BUILD.gn
index fe2c891..dbb8e3cc 100644
--- a/services/viz/privileged/interfaces/compositing/BUILD.gn
+++ b/services/viz/privileged/interfaces/compositing/BUILD.gn
@@ -22,7 +22,7 @@
"//media/capture/mojom:video_capture",
"//media/mojo/interfaces:interfaces",
"//mojo/public/mojom/base",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia/public/interfaces",
"//ui/gfx/geometry/mojom",
"//ui/gfx/mojo",
diff --git a/services/viz/privileged/interfaces/compositing/external_begin_frame_controller.mojom b/services/viz/privileged/interfaces/compositing/external_begin_frame_controller.mojom
index bc05e5d..408fd57 100644
--- a/services/viz/privileged/interfaces/compositing/external_begin_frame_controller.mojom
+++ b/services/viz/privileged/interfaces/compositing/external_begin_frame_controller.mojom
@@ -4,7 +4,7 @@
module viz.mojom;
-import "services/viz/public/interfaces/compositing/begin_frame_args.mojom";
+import "services/viz/public/mojom/compositing/begin_frame_args.mojom";
// Exposes a way to manually issue BeginFrames to a Display. The client is
// notified when BeginFrames are needed and completed.
diff --git a/services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom b/services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom
index 0efdfdd..dc7a5c8 100644
--- a/services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom
+++ b/services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom
@@ -10,15 +10,15 @@
import "services/viz/privileged/interfaces/compositing/external_begin_frame_controller.mojom";
import "services/viz/privileged/interfaces/compositing/frame_sink_video_capture.mojom";
import "services/viz/privileged/interfaces/compositing/renderer_settings.mojom";
-import "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom";
-import "services/viz/public/interfaces/compositing/copy_output_request.mojom";
-import "services/viz/public/interfaces/compositing/frame_sink_id.mojom";
-import "services/viz/public/interfaces/compositing/local_surface_id.mojom";
-import "services/viz/public/interfaces/compositing/surface_id.mojom";
-import "services/viz/public/interfaces/compositing/surface_info.mojom";
-import "services/viz/public/interfaces/hit_test/aggregated_hit_test_region.mojom";
+import "services/viz/public/mojom/compositing/compositor_frame_sink.mojom";
+import "services/viz/public/mojom/compositing/copy_output_request.mojom";
+import "services/viz/public/mojom/compositing/frame_sink_id.mojom";
+import "services/viz/public/mojom/compositing/local_surface_id.mojom";
+import "services/viz/public/mojom/compositing/surface_id.mojom";
+import "services/viz/public/mojom/compositing/surface_info.mojom";
+import "services/viz/public/mojom/hit_test/aggregated_hit_test_region.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
-import "services/viz/public/interfaces/compositing/video_detector_observer.mojom";
+import "services/viz/public/mojom/compositing/video_detector_observer.mojom";
// Initialization parameters for a RootCompositorFrameSink.
struct RootCompositorFrameSinkParams {
diff --git a/services/viz/privileged/interfaces/compositing/frame_sink_video_capture.mojom b/services/viz/privileged/interfaces/compositing/frame_sink_video_capture.mojom
index d2975f3..1ea3653 100644
--- a/services/viz/privileged/interfaces/compositing/frame_sink_video_capture.mojom
+++ b/services/viz/privileged/interfaces/compositing/frame_sink_video_capture.mojom
@@ -8,7 +8,7 @@
import "media/mojo/interfaces/media_types.mojom";
import "mojo/public/mojom/base/time.mojom";
import "mojo/public/mojom/base/shared_memory.mojom";
-import "services/viz/public/interfaces/compositing/frame_sink_id.mojom";
+import "services/viz/public/mojom/compositing/frame_sink_id.mojom";
import "skia/public/interfaces/bitmap.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "ui/gfx/mojo/color_space.mojom";
diff --git a/services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.cc b/services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.cc
index e4dea1fa..dac14d6c 100644
--- a/services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.cc
+++ b/services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.cc
@@ -4,7 +4,7 @@
#include "services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.h"
-#include "services/viz/public/cpp/compositing/resource_settings_struct_traits.h"
+#include "services/viz/public/cpp/compositing/resource_settings_mojom_traits.h"
#if defined(OS_ANDROID)
#include "ui/gfx/mojo/color_space_mojom_traits.h"
diff --git a/services/viz/privileged/interfaces/viz_main.mojom b/services/viz/privileged/interfaces/viz_main.mojom
index 9fbbf8a..a7fd52f0 100644
--- a/services/viz/privileged/interfaces/viz_main.mojom
+++ b/services/viz/privileged/interfaces/viz_main.mojom
@@ -6,7 +6,7 @@
import "components/discardable_memory/public/mojom/discardable_shared_memory_manager.mojom";
import "services/network/public/mojom/tcp_socket.mojom";
-import "services/viz/public/interfaces/compositing/compositing_mode_watcher.mojom";
+import "services/viz/public/mojom/compositing/compositing_mode_watcher.mojom";
import "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom";
import "services/viz/privileged/interfaces/gl/gpu_host.mojom";
import "services/viz/privileged/interfaces/gl/gpu_service.mojom";
diff --git a/services/viz/public/cpp/compositing/BUILD.gn b/services/viz/public/cpp/compositing/BUILD.gn
index 9218738..5a6dfdf6 100644
--- a/services/viz/public/cpp/compositing/BUILD.gn
+++ b/services/viz/public/cpp/compositing/BUILD.gn
@@ -6,7 +6,7 @@
testonly = true
sources = [
- "struct_traits_unittest.cc",
+ "mojom_traits_unittest.cc",
]
deps = [
@@ -18,7 +18,7 @@
"//media/capture/mojom:video_capture",
"//mojo/public/cpp/test_support:test_utils",
"//services/service_manager/public/cpp",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia/public/interfaces",
"//testing/gtest",
"//ui/gfx:test_support",
@@ -31,7 +31,7 @@
testonly = true
sources = [
- "struct_traits_perftest.cc",
+ "mojom_traits_perftest.cc",
]
deps = [
@@ -41,7 +41,7 @@
"//components/viz/test:test_support",
"//gpu/ipc/common:struct_traits",
"//mojo/public/cpp/bindings",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia",
"//testing/perf",
"//ui/gfx",
diff --git a/services/viz/public/cpp/compositing/OWNERS b/services/viz/public/cpp/compositing/OWNERS
index 4df0c71..7aebc8abb 100644
--- a/services/viz/public/cpp/compositing/OWNERS
+++ b/services/viz/public/cpp/compositing/OWNERS
@@ -1,4 +1,4 @@
-per-file *_struct_traits*.*=set noparent
-per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
+per-file *_mojom_traits*.*=set noparent
+per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
per-file *.typemap=set noparent
per-file *.typemap=file://ipc/SECURITY_OWNERS
diff --git a/services/viz/public/cpp/compositing/begin_frame_args.typemap b/services/viz/public/cpp/compositing/begin_frame_args.typemap
index 3d9feecda9..3c5007c 100644
--- a/services/viz/public/cpp/compositing/begin_frame_args.typemap
+++ b/services/viz/public/cpp/compositing/begin_frame_args.typemap
@@ -2,15 +2,15 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/begin_frame_args.mojom"
+mojom = "//services/viz/public/mojom/compositing/begin_frame_args.mojom"
public_headers = [ "//components/viz/common/frame_sinks/begin_frame_args.h" ]
traits_headers =
- [ "//services/viz/public/cpp/compositing/begin_frame_args_struct_traits.h" ]
+ [ "//services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.h" ]
deps = [
"//components/viz/common",
]
sources = [
- "//services/viz/public/cpp/compositing/begin_frame_args_struct_traits.cc",
+ "//services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.cc",
]
type_mappings = [
"viz.mojom.BeginFrameArgs=viz::BeginFrameArgs",
diff --git a/services/viz/public/cpp/compositing/begin_frame_args_for_blink.typemap b/services/viz/public/cpp/compositing/begin_frame_args_for_blink.typemap
index 57f42ce..892fde7 100644
--- a/services/viz/public/cpp/compositing/begin_frame_args_for_blink.typemap
+++ b/services/viz/public/cpp/compositing/begin_frame_args_for_blink.typemap
@@ -2,13 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/begin_frame_args.mojom"
+mojom = "//services/viz/public/mojom/compositing/begin_frame_args.mojom"
deps = [
"//components/viz/common",
]
public_headers = [ "//components/viz/common/frame_sinks/begin_frame_args.h" ]
traits_headers =
- [ "//services/viz/public/cpp/compositing/begin_frame_args_struct_traits.h" ]
+ [ "//services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.h" ]
type_mappings = [
"viz.mojom.BeginFrameArgs=viz::BeginFrameArgs",
"viz.mojom.BeginFrameAck=viz::BeginFrameAck",
diff --git a/services/viz/public/cpp/compositing/begin_frame_args_struct_traits.cc b/services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.cc
similarity index 96%
rename from services/viz/public/cpp/compositing/begin_frame_args_struct_traits.cc
rename to services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.cc
index 2cda379..f295e72 100644
--- a/services/viz/public/cpp/compositing/begin_frame_args_struct_traits.cc
+++ b/services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/compositing/begin_frame_args_struct_traits.h"
+#include "services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.h"
#include "mojo/public/cpp/base/time_mojom_traits.h"
diff --git a/services/viz/public/cpp/compositing/begin_frame_args_struct_traits.h b/services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.h
similarity index 89%
rename from services/viz/public/cpp/compositing/begin_frame_args_struct_traits.h
rename to services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.h
index 564c42f..510dfa1 100644
--- a/services/viz/public/cpp/compositing/begin_frame_args_struct_traits.h
+++ b/services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_BEGIN_FRAME_ARGS_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_BEGIN_FRAME_ARGS_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_BEGIN_FRAME_ARGS_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_BEGIN_FRAME_ARGS_MOJOM_TRAITS_H_
#include "components/viz/common/frame_sinks/begin_frame_args.h"
-#include "services/viz/public/interfaces/compositing/begin_frame_args.mojom-shared.h"
+#include "services/viz/public/mojom/compositing/begin_frame_args.mojom-shared.h"
namespace mojo {
@@ -87,4 +87,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_BEGIN_FRAME_ARGS_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_BEGIN_FRAME_ARGS_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/compositor_frame.typemap b/services/viz/public/cpp/compositing/compositor_frame.typemap
index 2da5712..759fc70 100644
--- a/services/viz/public/cpp/compositing/compositor_frame.typemap
+++ b/services/viz/public/cpp/compositing/compositor_frame.typemap
@@ -2,14 +2,14 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/compositor_frame.mojom"
+mojom = "//services/viz/public/mojom/compositing/compositor_frame.mojom"
deps = [
"//components/viz/common",
]
public_headers = [ "//components/viz/common/quads/compositor_frame.h" ]
traits_headers =
- [ "//services/viz/public/cpp/compositing/compositor_frame_struct_traits.h" ]
+ [ "//services/viz/public/cpp/compositing/compositor_frame_mojom_traits.h" ]
sources = [
- "//services/viz/public/cpp/compositing/compositor_frame_struct_traits.cc",
+ "//services/viz/public/cpp/compositing/compositor_frame_mojom_traits.cc",
]
type_mappings = [ "viz.mojom.CompositorFrame=viz::CompositorFrame[move_only]" ]
diff --git a/services/viz/public/cpp/compositing/compositor_frame_for_blink.typemap b/services/viz/public/cpp/compositing/compositor_frame_for_blink.typemap
index e2602ec..441a60ab 100644
--- a/services/viz/public/cpp/compositing/compositor_frame_for_blink.typemap
+++ b/services/viz/public/cpp/compositing/compositor_frame_for_blink.typemap
@@ -2,22 +2,22 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/compositor_frame.mojom"
+mojom = "//services/viz/public/mojom/compositing/compositor_frame.mojom"
public_headers = [ "//components/viz/common/quads/compositor_frame.h" ]
traits_headers = [
"//gpu/ipc/common/mailbox_holder_struct_traits.h",
"//gpu/ipc/common/mailbox_struct_traits.h",
"//gpu/ipc/common/sync_token_struct_traits.h",
"//ipc/ipc_message_utils.h",
- "//services/viz/public/cpp/compositing/compositor_frame_struct_traits.h",
- "//services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.h",
- "//services/viz/public/cpp/compositing/filter_operation_struct_traits.h",
- "//services/viz/public/cpp/compositing/filter_operations_struct_traits.h",
- "//services/viz/public/cpp/compositing/quads_struct_traits.h",
- "//services/viz/public/cpp/compositing/render_pass_struct_traits.h",
- "//services/viz/public/cpp/compositing/selection_struct_traits.h",
- "//services/viz/public/cpp/compositing/shared_quad_state_struct_traits.h",
- "//services/viz/public/cpp/compositing/transferable_resource_struct_traits.h",
+ "//services/viz/public/cpp/compositing/compositor_frame_mojom_traits.h",
+ "//services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h",
+ "//services/viz/public/cpp/compositing/filter_operation_mojom_traits.h",
+ "//services/viz/public/cpp/compositing/filter_operations_mojom_traits.h",
+ "//services/viz/public/cpp/compositing/quads_mojom_traits.h",
+ "//services/viz/public/cpp/compositing/render_pass_mojom_traits.h",
+ "//services/viz/public/cpp/compositing/selection_mojom_traits.h",
+ "//services/viz/public/cpp/compositing/shared_quad_state_mojom_traits.h",
+ "//services/viz/public/cpp/compositing/transferable_resource_mojom_traits.h",
"//ui/gfx/mojo/selection_bound_struct_traits.h",
"//ui/gfx/mojo/transform_struct_traits.h",
"//ui/latency/mojom/latency_info_mojom_traits.h",
@@ -25,7 +25,7 @@
public_deps = [
"//components/viz/common",
"//gpu/ipc/common:interfaces",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia/public/interfaces",
"//ui/gfx/geometry/mojom",
"//ui/gfx/mojo",
diff --git a/services/viz/public/cpp/compositing/compositor_frame_metadata.typemap b/services/viz/public/cpp/compositing/compositor_frame_metadata.typemap
index 1fc9a36..c98c2a2 100644
--- a/services/viz/public/cpp/compositing/compositor_frame_metadata.typemap
+++ b/services/viz/public/cpp/compositing/compositor_frame_metadata.typemap
@@ -2,13 +2,16 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom"
+mojom =
+ "//services/viz/public/mojom/compositing/compositor_frame_metadata.mojom"
public_headers = [ "//components/viz/common/quads/compositor_frame_metadata.h" ]
-traits_headers = [ "//services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.h" ]
+traits_headers = [ "//services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h" ]
deps = [
"//components/viz/common",
]
sources = [
- "//services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.cc",
+ "//services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.cc",
]
-type_mappings = [ "viz.mojom.CompositorFrameMetadata=viz::CompositorFrameMetadata[move_only]" ]
+type_mappings = [
+ "viz.mojom.CompositorFrameMetadata=viz::CompositorFrameMetadata[move_only]",
+]
diff --git a/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.cc b/services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.cc
similarity index 91%
rename from services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.cc
rename to services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.cc
index b29472d8..537c323d 100644
--- a/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.cc
+++ b/services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.h"
+#include "services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h"
#include "build/build_config.h"
-#include "services/viz/public/cpp/compositing/begin_frame_args_struct_traits.h"
-#include "services/viz/public/cpp/compositing/selection_struct_traits.h"
-#include "services/viz/public/cpp/compositing/surface_id_struct_traits.h"
+#include "services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/selection_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/surface_id_mojom_traits.h"
#include "ui/gfx/mojo/selection_bound_struct_traits.h"
#include "ui/latency/mojom/latency_info_mojom_traits.h"
diff --git a/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.h b/services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h
similarity index 91%
rename from services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.h
rename to services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h
index eab31a6..68b37a3 100644
--- a/services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.h
+++ b/services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COMPOSITOR_FRAME_METADATA_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COMPOSITOR_FRAME_METADATA_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COMPOSITOR_FRAME_METADATA_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COMPOSITOR_FRAME_METADATA_MOJOM_TRAITS_H_
#include <vector>
#include "build/build_config.h"
#include "components/viz/common/quads/compositor_frame_metadata.h"
-#include "services/viz/public/cpp/compositing/begin_frame_args_struct_traits.h"
-#include "services/viz/public/cpp/compositing/frame_deadline_struct_traits.h"
-#include "services/viz/public/cpp/compositing/surface_range_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom-shared.h"
+#include "services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/frame_deadline_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/surface_range_mojom_traits.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_metadata.mojom-shared.h"
namespace mojo {
@@ -152,4 +152,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COMPOSITOR_FRAME_METADATA_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COMPOSITOR_FRAME_METADATA_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/compositor_frame_struct_traits.cc b/services/viz/public/cpp/compositing/compositor_frame_mojom_traits.cc
similarity index 88%
rename from services/viz/public/cpp/compositing/compositor_frame_struct_traits.cc
rename to services/viz/public/cpp/compositing/compositor_frame_mojom_traits.cc
index 11e36a46..f3dc02f55 100644
--- a/services/viz/public/cpp/compositing/compositor_frame_struct_traits.cc
+++ b/services/viz/public/cpp/compositing/compositor_frame_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/compositing/compositor_frame_struct_traits.h"
+#include "services/viz/public/cpp/compositing/compositor_frame_mojom_traits.h"
namespace mojo {
diff --git a/services/viz/public/cpp/compositing/compositor_frame_struct_traits.h b/services/viz/public/cpp/compositing/compositor_frame_mojom_traits.h
similarity index 75%
rename from services/viz/public/cpp/compositing/compositor_frame_struct_traits.h
rename to services/viz/public/cpp/compositing/compositor_frame_mojom_traits.h
index 160dd52..511a6756 100644
--- a/services/viz/public/cpp/compositing/compositor_frame_struct_traits.h
+++ b/services/viz/public/cpp/compositing/compositor_frame_mojom_traits.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COMPOSITOR_FRAME_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COMPOSITOR_FRAME_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COMPOSITOR_FRAME_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COMPOSITOR_FRAME_MOJOM_TRAITS_H_
#include <vector>
#include "components/viz/common/quads/compositor_frame.h"
-#include "services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.h"
-#include "services/viz/public/cpp/compositing/render_pass_struct_traits.h"
-#include "services/viz/public/cpp/compositing/transferable_resource_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame.mojom-shared.h"
+#include "services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/render_pass_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/transferable_resource_mojom_traits.h"
+#include "services/viz/public/mojom/compositing/compositor_frame.mojom-shared.h"
namespace mojo {
@@ -39,4 +39,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COMPOSITOR_FRAME_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COMPOSITOR_FRAME_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/copy_output_request.typemap b/services/viz/public/cpp/compositing/copy_output_request.typemap
index 29c9b96f..301d5e6 100644
--- a/services/viz/public/cpp/compositing/copy_output_request.typemap
+++ b/services/viz/public/cpp/compositing/copy_output_request.typemap
@@ -2,15 +2,15 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/copy_output_request.mojom"
+mojom = "//services/viz/public/mojom/compositing/copy_output_request.mojom"
deps = [
"//components/viz/common",
]
public_headers = [ "//components/viz/common/frame_sinks/copy_output_request.h" ]
traits_headers = [
- "//services/viz/public/cpp/compositing/copy_output_request_struct_traits.h",
+ "//services/viz/public/cpp/compositing/copy_output_request_mojom_traits.h",
]
sources = [
- "//services/viz/public/cpp/compositing/copy_output_request_struct_traits.cc",
+ "//services/viz/public/cpp/compositing/copy_output_request_mojom_traits.cc",
]
type_mappings = [ "viz.mojom.CopyOutputRequest=std::unique_ptr<viz::CopyOutputRequest>[move_only]" ]
diff --git a/services/viz/public/cpp/compositing/copy_output_request_struct_traits.cc b/services/viz/public/cpp/compositing/copy_output_request_mojom_traits.cc
similarity index 98%
rename from services/viz/public/cpp/compositing/copy_output_request_struct_traits.cc
rename to services/viz/public/cpp/compositing/copy_output_request_mojom_traits.cc
index 18823c2..563e31af 100644
--- a/services/viz/public/cpp/compositing/copy_output_request_struct_traits.cc
+++ b/services/viz/public/cpp/compositing/copy_output_request_mojom_traits.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/compositing/copy_output_request_struct_traits.h"
+#include "services/viz/public/cpp/compositing/copy_output_request_mojom_traits.h"
#include <utility>
#include "base/bind.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/viz/public/cpp/compositing/copy_output_result_struct_traits.h"
+#include "services/viz/public/cpp/compositing/copy_output_result_mojom_traits.h"
namespace {
diff --git a/services/viz/public/cpp/compositing/copy_output_request_struct_traits.h b/services/viz/public/cpp/compositing/copy_output_request_mojom_traits.h
similarity index 92%
rename from services/viz/public/cpp/compositing/copy_output_request_struct_traits.h
rename to services/viz/public/cpp/compositing/copy_output_request_mojom_traits.h
index 5d608bf..b6907e5 100644
--- a/services/viz/public/cpp/compositing/copy_output_request_struct_traits.h
+++ b/services/viz/public/cpp/compositing/copy_output_request_mojom_traits.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COPY_OUTPUT_REQUEST_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COPY_OUTPUT_REQUEST_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COPY_OUTPUT_REQUEST_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COPY_OUTPUT_REQUEST_MOJOM_TRAITS_H_
#include "components/viz/common/frame_sinks/copy_output_request.h"
#include "mojo/public/cpp/base/unguessable_token_mojom_traits.h"
-#include "services/viz/public/cpp/compositing/copy_output_result_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/copy_output_request.mojom.h"
+#include "services/viz/public/cpp/compositing/copy_output_result_mojom_traits.h"
+#include "services/viz/public/mojom/compositing/copy_output_request.mojom.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
namespace mojo {
@@ -55,4 +55,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COPY_OUTPUT_REQUEST_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COPY_OUTPUT_REQUEST_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/copy_output_result.typemap b/services/viz/public/cpp/compositing/copy_output_result.typemap
index 7b1188ce..8a695ab 100644
--- a/services/viz/public/cpp/compositing/copy_output_result.typemap
+++ b/services/viz/public/cpp/compositing/copy_output_result.typemap
@@ -2,15 +2,15 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/copy_output_result.mojom"
+mojom = "//services/viz/public/mojom/compositing/copy_output_result.mojom"
public_headers = [ "//components/viz/common/frame_sinks/copy_output_result.h" ]
traits_headers = [
- "//services/viz/public/cpp/compositing/copy_output_result_struct_traits.h",
+ "//services/viz/public/cpp/compositing/copy_output_result_mojom_traits.h",
]
deps = [
"//components/viz/common",
]
sources = [
- "//services/viz/public/cpp/compositing/copy_output_result_struct_traits.cc",
+ "//services/viz/public/cpp/compositing/copy_output_result_mojom_traits.cc",
]
type_mappings = [ "viz.mojom.CopyOutputResult=std::unique_ptr<viz::CopyOutputResult>[move_only]" ]
diff --git a/services/viz/public/cpp/compositing/copy_output_result_struct_traits.cc b/services/viz/public/cpp/compositing/copy_output_result_mojom_traits.cc
similarity index 99%
rename from services/viz/public/cpp/compositing/copy_output_result_struct_traits.cc
rename to services/viz/public/cpp/compositing/copy_output_result_mojom_traits.cc
index 6c48f002..69f6c29 100644
--- a/services/viz/public/cpp/compositing/copy_output_result_struct_traits.cc
+++ b/services/viz/public/cpp/compositing/copy_output_result_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/compositing/copy_output_result_struct_traits.h"
+#include "services/viz/public/cpp/compositing/copy_output_result_mojom_traits.h"
#include "base/bind.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
diff --git a/services/viz/public/cpp/compositing/copy_output_result_struct_traits.h b/services/viz/public/cpp/compositing/copy_output_result_mojom_traits.h
similarity index 85%
rename from services/viz/public/cpp/compositing/copy_output_result_struct_traits.h
rename to services/viz/public/cpp/compositing/copy_output_result_mojom_traits.h
index 02ba92a..a780a489 100644
--- a/services/viz/public/cpp/compositing/copy_output_result_struct_traits.h
+++ b/services/viz/public/cpp/compositing/copy_output_result_mojom_traits.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COPY_OUTPUT_RESULT_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COPY_OUTPUT_RESULT_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COPY_OUTPUT_RESULT_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COPY_OUTPUT_RESULT_MOJOM_TRAITS_H_
#include "components/viz/common/frame_sinks/copy_output_result.h"
#include "gpu/ipc/common/mailbox_struct_traits.h"
#include "gpu/ipc/common/sync_token_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/copy_output_result.mojom-shared.h"
-#include "services/viz/public/interfaces/compositing/texture_releaser.mojom.h"
+#include "services/viz/public/mojom/compositing/copy_output_result.mojom-shared.h"
+#include "services/viz/public/mojom/compositing/texture_releaser.mojom.h"
#include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
#include "ui/gfx/ipc/color/gfx_param_traits.h"
@@ -59,4 +59,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COPY_OUTPUT_RESULT_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_COPY_OUTPUT_RESULT_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/filter_operation.typemap b/services/viz/public/cpp/compositing/filter_operation.typemap
index 9e9dd65c..3097b60 100644
--- a/services/viz/public/cpp/compositing/filter_operation.typemap
+++ b/services/viz/public/cpp/compositing/filter_operation.typemap
@@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/filter_operation.mojom"
+mojom = "//services/viz/public/mojom/compositing/filter_operation.mojom"
deps = [
"//cc/paint",
]
public_headers = [ "//cc/paint/filter_operation.h" ]
traits_headers =
- [ "//services/viz/public/cpp/compositing/filter_operation_struct_traits.h" ]
+ [ "//services/viz/public/cpp/compositing/filter_operation_mojom_traits.h" ]
type_mappings = [ "viz.mojom.FilterOperation=cc::FilterOperation" ]
diff --git a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h b/services/viz/public/cpp/compositing/filter_operation_mojom_traits.h
similarity index 95%
rename from services/viz/public/cpp/compositing/filter_operation_struct_traits.h
rename to services/viz/public/cpp/compositing/filter_operation_mojom_traits.h
index 29277ef..c87291c 100644
--- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h
+++ b/services/viz/public/cpp/compositing/filter_operation_mojom_traits.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FILTER_OPERATION_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FILTER_OPERATION_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FILTER_OPERATION_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FILTER_OPERATION_MOJOM_TRAITS_H_
#include "base/containers/span.h"
#include "base/memory/aligned_memory.h"
#include "base/optional.h"
#include "cc/paint/filter_operation.h"
#include "cc/paint/paint_filter.h"
-#include "services/viz/public/cpp/compositing/paint_filter_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/filter_operation.mojom-shared.h"
+#include "services/viz/public/cpp/compositing/paint_filter_mojom_traits.h"
+#include "services/viz/public/mojom/compositing/filter_operation.mojom-shared.h"
#include "skia/public/interfaces/blur_image_filter_tile_mode_struct_traits.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
@@ -235,4 +235,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FILTER_OPERATION_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FILTER_OPERATION_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/filter_operations.typemap b/services/viz/public/cpp/compositing/filter_operations.typemap
index b85b129..c7dc510 100644
--- a/services/viz/public/cpp/compositing/filter_operations.typemap
+++ b/services/viz/public/cpp/compositing/filter_operations.typemap
@@ -2,15 +2,14 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/filter_operations.mojom"
+mojom = "//services/viz/public/mojom/compositing/filter_operations.mojom"
deps = [
"//cc/paint",
]
public_headers = [ "//cc/paint/filter_operations.h" ]
-traits_headers = [
- "//services/viz/public/cpp/compositing/filter_operations_struct_traits.h",
-]
+traits_headers =
+ [ "//services/viz/public/cpp/compositing/filter_operations_mojom_traits.h" ]
sources = [
- "//services/viz/public/cpp/compositing/filter_operations_struct_traits.cc",
+ "//services/viz/public/cpp/compositing/filter_operations_mojom_traits.cc",
]
type_mappings = [ "viz.mojom.FilterOperations=cc::FilterOperations" ]
diff --git a/services/viz/public/cpp/compositing/filter_operations_struct_traits.cc b/services/viz/public/cpp/compositing/filter_operations_mojom_traits.cc
similarity index 89%
rename from services/viz/public/cpp/compositing/filter_operations_struct_traits.cc
rename to services/viz/public/cpp/compositing/filter_operations_mojom_traits.cc
index a95213a..1f5b859d 100644
--- a/services/viz/public/cpp/compositing/filter_operations_struct_traits.cc
+++ b/services/viz/public/cpp/compositing/filter_operations_mojom_traits.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/compositing/filter_operations_struct_traits.h"
+#include "services/viz/public/cpp/compositing/filter_operations_mojom_traits.h"
#include "cc/paint/filter_operations.h"
-#include "services/viz/public/cpp/compositing/filter_operation_struct_traits.h"
+#include "services/viz/public/cpp/compositing/filter_operation_mojom_traits.h"
namespace mojo {
diff --git a/services/viz/public/cpp/compositing/filter_operations_struct_traits.h b/services/viz/public/cpp/compositing/filter_operations_mojom_traits.h
similarity index 72%
rename from services/viz/public/cpp/compositing/filter_operations_struct_traits.h
rename to services/viz/public/cpp/compositing/filter_operations_mojom_traits.h
index fefa9a0..95d3d4d0 100644
--- a/services/viz/public/cpp/compositing/filter_operations_struct_traits.h
+++ b/services/viz/public/cpp/compositing/filter_operations_mojom_traits.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FILTER_OPERATIONS_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FILTER_OPERATIONS_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FILTER_OPERATIONS_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FILTER_OPERATIONS_MOJOM_TRAITS_H_
-#include "services/viz/public/interfaces/compositing/filter_operations.mojom-shared.h"
+#include "services/viz/public/mojom/compositing/filter_operations.mojom-shared.h"
namespace cc {
class FilterOperation;
@@ -26,4 +26,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FILTER_OPERATIONS_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FILTER_OPERATIONS_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/frame_deadline.typemap b/services/viz/public/cpp/compositing/frame_deadline.typemap
index 4cd7c7a8..b3787ed3 100644
--- a/services/viz/public/cpp/compositing/frame_deadline.typemap
+++ b/services/viz/public/cpp/compositing/frame_deadline.typemap
@@ -2,13 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/frame_deadline.mojom"
+mojom = "//services/viz/public/mojom/compositing/frame_deadline.mojom"
traits_headers =
- [ "//services/viz/public/cpp/compositing/frame_deadline_struct_traits.h" ]
+ [ "//services/viz/public/cpp/compositing/frame_deadline_mojom_traits.h" ]
deps = [
"//components/viz/common",
]
sources = [
- "//services/viz/public/cpp/compositing/frame_deadline_struct_traits.cc",
+ "//services/viz/public/cpp/compositing/frame_deadline_mojom_traits.cc",
]
type_mappings = [ "viz.mojom.FrameDeadline=viz::FrameDeadline" ]
diff --git a/services/viz/public/cpp/compositing/frame_deadline_struct_traits.cc b/services/viz/public/cpp/compositing/frame_deadline_mojom_traits.cc
similarity index 90%
rename from services/viz/public/cpp/compositing/frame_deadline_struct_traits.cc
rename to services/viz/public/cpp/compositing/frame_deadline_mojom_traits.cc
index d3fbf1e..16c04910 100644
--- a/services/viz/public/cpp/compositing/frame_deadline_struct_traits.cc
+++ b/services/viz/public/cpp/compositing/frame_deadline_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/compositing/frame_deadline_struct_traits.h"
+#include "services/viz/public/cpp/compositing/frame_deadline_mojom_traits.h"
namespace mojo {
diff --git a/services/viz/public/cpp/compositing/frame_deadline_struct_traits.h b/services/viz/public/cpp/compositing/frame_deadline_mojom_traits.h
similarity index 76%
rename from services/viz/public/cpp/compositing/frame_deadline_struct_traits.h
rename to services/viz/public/cpp/compositing/frame_deadline_mojom_traits.h
index 2945a61..1a5d2bcc 100644
--- a/services/viz/public/cpp/compositing/frame_deadline_struct_traits.h
+++ b/services/viz/public/cpp/compositing/frame_deadline_mojom_traits.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_DEADLINE_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_DEADLINE_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_DEADLINE_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_DEADLINE_MOJOM_TRAITS_H_
-#include "services/viz/public/interfaces/compositing/frame_deadline.mojom.h"
+#include "services/viz/public/mojom/compositing/frame_deadline.mojom.h"
#include "components/viz/common/quads/frame_deadline.h"
#include "mojo/public/cpp/base/time_mojom_traits.h"
@@ -37,4 +37,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_DEADLINE_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_DEADLINE_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/frame_sink_id.typemap b/services/viz/public/cpp/compositing/frame_sink_id.typemap
index 76c92fb..40ec4c3 100644
--- a/services/viz/public/cpp/compositing/frame_sink_id.typemap
+++ b/services/viz/public/cpp/compositing/frame_sink_id.typemap
@@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/frame_sink_id.mojom"
+mojom = "//services/viz/public/mojom/compositing/frame_sink_id.mojom"
public_headers = [ "//components/viz/common/surfaces/frame_sink_id.h" ]
deps = [
"//components/viz/common",
]
traits_headers =
- [ "//services/viz/public/cpp/compositing/frame_sink_id_struct_traits.h" ]
+ [ "//services/viz/public/cpp/compositing/frame_sink_id_mojom_traits.h" ]
type_mappings = [ "viz.mojom.FrameSinkId=viz::FrameSinkId" ]
diff --git a/services/viz/public/cpp/compositing/frame_sink_id_struct_traits.h b/services/viz/public/cpp/compositing/frame_sink_id_mojom_traits.h
similarity index 71%
rename from services/viz/public/cpp/compositing/frame_sink_id_struct_traits.h
rename to services/viz/public/cpp/compositing/frame_sink_id_mojom_traits.h
index b69cdf9..1d18581e 100644
--- a/services/viz/public/cpp/compositing/frame_sink_id_struct_traits.h
+++ b/services/viz/public/cpp/compositing/frame_sink_id_mojom_traits.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_SINK_ID_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_SINK_ID_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_SINK_ID_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_SINK_ID_MOJOM_TRAITS_H_
#include "components/viz/common/surfaces/frame_sink_id.h"
-#include "services/viz/public/interfaces/compositing/frame_sink_id.mojom-shared.h"
+#include "services/viz/public/mojom/compositing/frame_sink_id.mojom-shared.h"
namespace mojo {
@@ -29,4 +29,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_SINK_ID_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_SINK_ID_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/frame_timing_details.typemap b/services/viz/public/cpp/compositing/frame_timing_details.typemap
index ad11150..aba9ed0 100644
--- a/services/viz/public/cpp/compositing/frame_timing_details.typemap
+++ b/services/viz/public/cpp/compositing/frame_timing_details.typemap
@@ -2,13 +2,12 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom =
- "//services/viz/public/interfaces/compositing/frame_timing_details.mojom"
+mojom = "//services/viz/public/mojom/compositing/frame_timing_details.mojom"
public_headers = [ "//components/viz/common/frame_timing_details.h" ]
deps = [
"//components/viz/common",
]
traits_headers = [
- "//services/viz/public/cpp/compositing/frame_timing_details_struct_traits.h",
+ "//services/viz/public/cpp/compositing/frame_timing_details_mojom_traits.h",
]
type_mappings = [ "viz.mojom.FrameTimingDetails=viz::FrameTimingDetails" ]
diff --git a/services/viz/public/cpp/compositing/frame_timing_details_struct_traits.h b/services/viz/public/cpp/compositing/frame_timing_details_mojom_traits.h
similarity index 86%
rename from services/viz/public/cpp/compositing/frame_timing_details_struct_traits.h
rename to services/viz/public/cpp/compositing/frame_timing_details_mojom_traits.h
index ab11278..24274a7 100644
--- a/services/viz/public/cpp/compositing/frame_timing_details_struct_traits.h
+++ b/services/viz/public/cpp/compositing/frame_timing_details_mojom_traits.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_TIMING_DETAILS_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_TIMING_DETAILS_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_TIMING_DETAILS_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_TIMING_DETAILS_MOJOM_TRAITS_H_
#include "components/viz/common/frame_timing_details.h"
-#include "services/viz/public/interfaces/compositing/frame_timing_details.mojom-shared.h"
+#include "services/viz/public/mojom/compositing/frame_timing_details.mojom-shared.h"
#include "ui/gfx/presentation_feedback.h"
@@ -28,4 +28,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_TIMING_DETAILS_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_FRAME_TIMING_DETAILS_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/local_surface_id.typemap b/services/viz/public/cpp/compositing/local_surface_id.typemap
index 1ad7b2c..ebc73b5 100644
--- a/services/viz/public/cpp/compositing/local_surface_id.typemap
+++ b/services/viz/public/cpp/compositing/local_surface_id.typemap
@@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/local_surface_id.mojom"
+mojom = "//services/viz/public/mojom/compositing/local_surface_id.mojom"
public_headers = [ "//components/viz/common/surfaces/local_surface_id.h" ]
deps = [
"//components/viz/common",
]
traits_headers =
- [ "//services/viz/public/cpp/compositing/local_surface_id_struct_traits.h" ]
+ [ "//services/viz/public/cpp/compositing/local_surface_id_mojom_traits.h" ]
type_mappings = [ "viz.mojom.LocalSurfaceId=viz::LocalSurfaceId" ]
diff --git a/services/viz/public/cpp/compositing/local_surface_id_allocation.typemap b/services/viz/public/cpp/compositing/local_surface_id_allocation.typemap
index 44c257c..3ac3d904 100644
--- a/services/viz/public/cpp/compositing/local_surface_id_allocation.typemap
+++ b/services/viz/public/cpp/compositing/local_surface_id_allocation.typemap
@@ -2,12 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/local_surface_id_allocation.mojom"
+mojom =
+ "//services/viz/public/mojom/compositing/local_surface_id_allocation.mojom"
public_headers =
[ "//components/viz/common/surfaces/local_surface_id_allocation.h" ]
deps = [
"//components/viz/common",
]
-traits_headers = [ "//services/viz/public/cpp/compositing/local_surface_id_allocation_struct_traits.h" ]
+traits_headers = [ "//services/viz/public/cpp/compositing/local_surface_id_allocation_mojom_traits.h" ]
type_mappings =
[ "viz.mojom.LocalSurfaceIdAllocation=viz::LocalSurfaceIdAllocation" ]
diff --git a/services/viz/public/cpp/compositing/local_surface_id_allocation_struct_traits.h b/services/viz/public/cpp/compositing/local_surface_id_allocation_mojom_traits.h
similarity index 84%
rename from services/viz/public/cpp/compositing/local_surface_id_allocation_struct_traits.h
rename to services/viz/public/cpp/compositing/local_surface_id_allocation_mojom_traits.h
index 5771135..f375bb5e 100644
--- a/services/viz/public/cpp/compositing/local_surface_id_allocation_struct_traits.h
+++ b/services/viz/public/cpp/compositing/local_surface_id_allocation_mojom_traits.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_LOCAL_SURFACE_ID_ALLOCATION_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_LOCAL_SURFACE_ID_ALLOCATION_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_LOCAL_SURFACE_ID_ALLOCATION_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_LOCAL_SURFACE_ID_ALLOCATION_MOJOM_TRAITS_H_
#include "components/viz/common/surfaces/local_surface_id_allocation.h"
#include "mojo/public/cpp/base/time_mojom_traits.h"
-#include "services/viz/public/cpp/compositing/local_surface_id_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/local_surface_id_allocation.mojom-shared.h"
+#include "services/viz/public/cpp/compositing/local_surface_id_mojom_traits.h"
+#include "services/viz/public/mojom/compositing/local_surface_id_allocation.mojom-shared.h"
namespace mojo {
@@ -36,4 +36,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_LOCAL_SURFACE_ID_ALLOCATION_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_LOCAL_SURFACE_ID_ALLOCATION_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/local_surface_id_struct_traits.h b/services/viz/public/cpp/compositing/local_surface_id_mojom_traits.h
similarity index 82%
rename from services/viz/public/cpp/compositing/local_surface_id_struct_traits.h
rename to services/viz/public/cpp/compositing/local_surface_id_mojom_traits.h
index 0d16236..7bcc38d 100644
--- a/services/viz/public/cpp/compositing/local_surface_id_struct_traits.h
+++ b/services/viz/public/cpp/compositing/local_surface_id_mojom_traits.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_LOCAL_SURFACE_ID_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_LOCAL_SURFACE_ID_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_LOCAL_SURFACE_ID_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_LOCAL_SURFACE_ID_MOJOM_TRAITS_H_
#include "components/viz/common/surfaces/local_surface_id.h"
#include "mojo/public/cpp/base/unguessable_token_mojom_traits.h"
-#include "services/viz/public/interfaces/compositing/local_surface_id.mojom-shared.h"
+#include "services/viz/public/mojom/compositing/local_surface_id.mojom-shared.h"
namespace mojo {
@@ -38,4 +38,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_LOCAL_SURFACE_ID_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_LOCAL_SURFACE_ID_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/struct_traits_perftest.cc b/services/viz/public/cpp/compositing/mojom_traits_perftest.cc
similarity index 97%
rename from services/viz/public/cpp/compositing/struct_traits_perftest.cc
rename to services/viz/public/cpp/compositing/mojom_traits_perftest.cc
index aee4b54..38acf37 100644
--- a/services/viz/public/cpp/compositing/struct_traits_perftest.cc
+++ b/services/viz/public/cpp/compositing/mojom_traits_perftest.cc
@@ -14,11 +14,11 @@
#include "gpu/ipc/common/mailbox_holder_struct_traits.h"
#include "gpu/ipc/common/mailbox_struct_traits.h"
#include "mojo/public/cpp/bindings/message.h"
-#include "services/viz/public/cpp/compositing/compositor_frame_struct_traits.h"
-#include "services/viz/public/cpp/compositing/selection_struct_traits.h"
-#include "services/viz/public/cpp/compositing/shared_quad_state_struct_traits.h"
-#include "services/viz/public/cpp/compositing/surface_id_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame.mojom.h"
+#include "services/viz/public/cpp/compositing/compositor_frame_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/selection_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/shared_quad_state_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/surface_id_mojom_traits.h"
+#include "services/viz/public/mojom/compositing/compositor_frame.mojom.h"
#include "testing/perf/perf_test.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
#include "ui/gfx/mojo/selection_bound_struct_traits.h"
diff --git a/services/viz/public/cpp/compositing/struct_traits_unittest.cc b/services/viz/public/cpp/compositing/mojom_traits_unittest.cc
similarity index 97%
rename from services/viz/public/cpp/compositing/struct_traits_unittest.cc
rename to services/viz/public/cpp/compositing/mojom_traits_unittest.cc
index 25d6726..4a01edfe 100644
--- a/services/viz/public/cpp/compositing/struct_traits_unittest.cc
+++ b/services/viz/public/cpp/compositing/mojom_traits_unittest.cc
@@ -27,31 +27,31 @@
#include "mojo/public/cpp/base/time_mojom_traits.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/test_support/test_utils.h"
-#include "services/viz/public/cpp/compositing/begin_frame_args_struct_traits.h"
-#include "services/viz/public/cpp/compositing/compositor_frame_metadata_struct_traits.h"
-#include "services/viz/public/cpp/compositing/compositor_frame_struct_traits.h"
-#include "services/viz/public/cpp/compositing/copy_output_request_struct_traits.h"
-#include "services/viz/public/cpp/compositing/copy_output_result_struct_traits.h"
-#include "services/viz/public/cpp/compositing/filter_operation_struct_traits.h"
-#include "services/viz/public/cpp/compositing/filter_operations_struct_traits.h"
-#include "services/viz/public/cpp/compositing/frame_sink_id_struct_traits.h"
-#include "services/viz/public/cpp/compositing/local_surface_id_struct_traits.h"
-#include "services/viz/public/cpp/compositing/render_pass_struct_traits.h"
-#include "services/viz/public/cpp/compositing/resource_settings_struct_traits.h"
-#include "services/viz/public/cpp/compositing/returned_resource_struct_traits.h"
-#include "services/viz/public/cpp/compositing/selection_struct_traits.h"
-#include "services/viz/public/cpp/compositing/shared_quad_state_struct_traits.h"
-#include "services/viz/public/cpp/compositing/surface_id_struct_traits.h"
-#include "services/viz/public/cpp/compositing/surface_info_struct_traits.h"
-#include "services/viz/public/cpp/compositing/transferable_resource_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/begin_frame_args.mojom.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame.mojom.h"
-#include "services/viz/public/interfaces/compositing/filter_operation.mojom.h"
-#include "services/viz/public/interfaces/compositing/filter_operations.mojom.h"
-#include "services/viz/public/interfaces/compositing/returned_resource.mojom.h"
-#include "services/viz/public/interfaces/compositing/surface_info.mojom.h"
-#include "services/viz/public/interfaces/compositing/surface_range.mojom.h"
-#include "services/viz/public/interfaces/compositing/transferable_resource.mojom.h"
+#include "services/viz/public/cpp/compositing/begin_frame_args_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/compositor_frame_metadata_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/compositor_frame_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/copy_output_request_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/copy_output_result_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/filter_operation_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/filter_operations_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/frame_sink_id_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/local_surface_id_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/render_pass_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/resource_settings_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/returned_resource_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/selection_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/shared_quad_state_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/surface_id_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/surface_info_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/transferable_resource_mojom_traits.h"
+#include "services/viz/public/mojom/compositing/begin_frame_args.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame.mojom.h"
+#include "services/viz/public/mojom/compositing/filter_operation.mojom.h"
+#include "services/viz/public/mojom/compositing/filter_operations.mojom.h"
+#include "services/viz/public/mojom/compositing/returned_resource.mojom.h"
+#include "services/viz/public/mojom/compositing/surface_info.mojom.h"
+#include "services/viz/public/mojom/compositing/surface_range.mojom.h"
+#include "services/viz/public/mojom/compositing/transferable_resource.mojom.h"
#include "skia/public/interfaces/bitmap_skbitmap_struct_traits.h"
#include "skia/public/interfaces/blur_image_filter_tile_mode_struct_traits.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/services/viz/public/cpp/compositing/paint_filter.typemap b/services/viz/public/cpp/compositing/paint_filter.typemap
index 610e620b..d3fea6cf 100644
--- a/services/viz/public/cpp/compositing/paint_filter.typemap
+++ b/services/viz/public/cpp/compositing/paint_filter.typemap
@@ -2,14 +2,14 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/paint_filter.mojom"
+mojom = "//services/viz/public/mojom/compositing/paint_filter.mojom"
public_headers = [ "//cc/paint/paint_filter.h" ]
traits_headers =
- [ "//services/viz/public/cpp/compositing/paint_filter_struct_traits.h" ]
+ [ "//services/viz/public/cpp/compositing/paint_filter_mojom_traits.h" ]
deps = [
"//cc/paint",
]
sources = [
- "//services/viz/public/cpp/compositing/paint_filter_struct_traits.cc",
+ "//services/viz/public/cpp/compositing/paint_filter_mojom_traits.cc",
]
type_mappings = [ "viz.mojom.PaintFilter=sk_sp<cc::PaintFilter>" ]
diff --git a/services/viz/public/cpp/compositing/paint_filter_struct_traits.cc b/services/viz/public/cpp/compositing/paint_filter_mojom_traits.cc
similarity index 96%
rename from services/viz/public/cpp/compositing/paint_filter_struct_traits.cc
rename to services/viz/public/cpp/compositing/paint_filter_mojom_traits.cc
index 214c36a..d5dba27 100644
--- a/services/viz/public/cpp/compositing/paint_filter_struct_traits.cc
+++ b/services/viz/public/cpp/compositing/paint_filter_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/compositing/paint_filter_struct_traits.h"
+#include "services/viz/public/cpp/compositing/paint_filter_mojom_traits.h"
#include "cc/paint/paint_filter.h"
diff --git a/services/viz/public/cpp/compositing/paint_filter_struct_traits.h b/services/viz/public/cpp/compositing/paint_filter_mojom_traits.h
similarity index 67%
rename from services/viz/public/cpp/compositing/paint_filter_struct_traits.h
rename to services/viz/public/cpp/compositing/paint_filter_mojom_traits.h
index de2e8bd..239a672 100644
--- a/services/viz/public/cpp/compositing/paint_filter_struct_traits.h
+++ b/services/viz/public/cpp/compositing/paint_filter_mojom_traits.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_PAINT_FILTER_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_PAINT_FILTER_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_PAINT_FILTER_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_PAINT_FILTER_MOJOM_TRAITS_H_
#include <vector>
#include "cc/paint/paint_op_reader.h"
#include "cc/paint/paint_op_writer.h"
-#include "services/viz/public/interfaces/compositing/paint_filter.mojom-shared.h"
+#include "services/viz/public/mojom/compositing/paint_filter.mojom-shared.h"
namespace cc {
class PaintFilter;
@@ -28,4 +28,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_PAINT_FILTER_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_PAINT_FILTER_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/quads_struct_traits.cc b/services/viz/public/cpp/compositing/quads_mojom_traits.cc
similarity index 98%
rename from services/viz/public/cpp/compositing/quads_struct_traits.cc
rename to services/viz/public/cpp/compositing/quads_mojom_traits.cc
index 80b406b..3c2c55d7 100644
--- a/services/viz/public/cpp/compositing/quads_struct_traits.cc
+++ b/services/viz/public/cpp/compositing/quads_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/compositing/quads_struct_traits.h"
+#include "services/viz/public/cpp/compositing/quads_mojom_traits.h"
#include "ui/gfx/mojo/color_space_mojom_traits.h"
#include "ui/gfx/mojo/transform_struct_traits.h"
diff --git a/services/viz/public/cpp/compositing/quads_struct_traits.h b/services/viz/public/cpp/compositing/quads_mojom_traits.h
similarity index 97%
rename from services/viz/public/cpp/compositing/quads_struct_traits.h
rename to services/viz/public/cpp/compositing/quads_mojom_traits.h
index 6cf1de57d..5cfb6fd 100644
--- a/services/viz/public/cpp/compositing/quads_struct_traits.h
+++ b/services/viz/public/cpp/compositing/quads_mojom_traits.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_QUADS_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_QUADS_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_QUADS_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_QUADS_MOJOM_TRAITS_H_
#include "base/containers/span.h"
#include "base/logging.h"
@@ -20,11 +20,11 @@
#include "components/viz/common/quads/yuv_video_draw_quad.h"
#include "gpu/ipc/common/vulkan_ycbcr_info.h"
#include "gpu/ipc/common/vulkan_ycbcr_info_mojom_traits.h"
-#include "services/viz/public/cpp/compositing/filter_operation_struct_traits.h"
-#include "services/viz/public/cpp/compositing/filter_operations_struct_traits.h"
-#include "services/viz/public/cpp/compositing/shared_quad_state_struct_traits.h"
-#include "services/viz/public/cpp/compositing/surface_range_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/quads.mojom-shared.h"
+#include "services/viz/public/cpp/compositing/filter_operation_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/filter_operations_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/shared_quad_state_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/surface_range_mojom_traits.h"
+#include "services/viz/public/mojom/compositing/quads.mojom-shared.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
#include "ui/gfx/ipc/color/gfx_param_traits.h"
@@ -611,4 +611,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_QUADS_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_QUADS_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/render_pass.typemap b/services/viz/public/cpp/compositing/render_pass.typemap
index aba890f..467fbb8 100644
--- a/services/viz/public/cpp/compositing/render_pass.typemap
+++ b/services/viz/public/cpp/compositing/render_pass.typemap
@@ -2,19 +2,19 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/render_pass.mojom"
+mojom = "//services/viz/public/mojom/compositing/render_pass.mojom"
public_headers = [
"//components/viz/common/quads/draw_quad.h",
"//components/viz/common/quads/render_pass.h",
"//ui/gl/dc_renderer_layer_params.h",
]
traits_headers = [
- "//services/viz/public/cpp/compositing/quads_struct_traits.h",
- "//services/viz/public/cpp/compositing/render_pass_struct_traits.h",
+ "//services/viz/public/cpp/compositing/quads_mojom_traits.h",
+ "//services/viz/public/cpp/compositing/render_pass_mojom_traits.h",
]
sources = [
- "//services/viz/public/cpp/compositing/quads_struct_traits.cc",
- "//services/viz/public/cpp/compositing/render_pass_struct_traits.cc",
+ "//services/viz/public/cpp/compositing/quads_mojom_traits.cc",
+ "//services/viz/public/cpp/compositing/render_pass_mojom_traits.cc",
]
deps = [
"//ui/gl",
diff --git a/services/viz/public/cpp/compositing/render_pass_struct_traits.cc b/services/viz/public/cpp/compositing/render_pass_mojom_traits.cc
similarity index 96%
rename from services/viz/public/cpp/compositing/render_pass_struct_traits.cc
rename to services/viz/public/cpp/compositing/render_pass_mojom_traits.cc
index fb2c1b8b..c40cfffa 100644
--- a/services/viz/public/cpp/compositing/render_pass_struct_traits.cc
+++ b/services/viz/public/cpp/compositing/render_pass_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/compositing/render_pass_struct_traits.h"
+#include "services/viz/public/cpp/compositing/render_pass_mojom_traits.h"
#include "base/numerics/safe_conversions.h"
#include "ui/gfx/mojo/color_space_mojom_traits.h"
diff --git a/services/viz/public/cpp/compositing/render_pass_struct_traits.h b/services/viz/public/cpp/compositing/render_pass_mojom_traits.h
similarity index 87%
rename from services/viz/public/cpp/compositing/render_pass_struct_traits.h
rename to services/viz/public/cpp/compositing/render_pass_mojom_traits.h
index 72b8788..c0e70cf 100644
--- a/services/viz/public/cpp/compositing/render_pass_struct_traits.h
+++ b/services/viz/public/cpp/compositing/render_pass_mojom_traits.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RENDER_PASS_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RENDER_PASS_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RENDER_PASS_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RENDER_PASS_MOJOM_TRAITS_H_
#include <memory>
#include "base/logging.h"
#include "components/viz/common/quads/render_pass.h"
-#include "services/viz/public/cpp/compositing/copy_output_request_struct_traits.h"
-#include "services/viz/public/cpp/compositing/quads_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/render_pass.mojom-shared.h"
+#include "services/viz/public/cpp/compositing/copy_output_request_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/quads_mojom_traits.h"
+#include "services/viz/public/mojom/compositing/render_pass.mojom-shared.h"
#include "ui/gfx/ipc/color/gfx_param_traits.h"
#include "ui/gfx/mojo/rrect_f_struct_traits.h"
#include "ui/gfx/mojo/transform_struct_traits.h"
@@ -95,4 +95,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RENDER_PASS_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RENDER_PASS_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/resource_settings.typemap b/services/viz/public/cpp/compositing/resource_settings.typemap
index d15d93e..ad3fa64 100644
--- a/services/viz/public/cpp/compositing/resource_settings.typemap
+++ b/services/viz/public/cpp/compositing/resource_settings.typemap
@@ -2,17 +2,16 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/resource_settings.mojom"
+mojom = "//services/viz/public/mojom/compositing/resource_settings.mojom"
public_headers = [ "//components/viz/common/resources/resource_settings.h" ]
-traits_headers = [
- "//services/viz/public/cpp/compositing/resource_settings_struct_traits.h",
-]
+traits_headers =
+ [ "//services/viz/public/cpp/compositing/resource_settings_mojom_traits.h" ]
deps = [
"//components/viz/common",
"//ui/gfx/mojo",
]
sources = [
- "//services/viz/public/cpp/compositing/resource_settings_struct_traits.cc",
+ "//services/viz/public/cpp/compositing/resource_settings_mojom_traits.cc",
]
type_mappings = [
"viz.mojom.BufferUsageAndFormat=std::pair<gfx::BufferUsage, gfx::BufferFormat>",
diff --git a/services/viz/public/cpp/compositing/resource_settings_struct_traits.cc b/services/viz/public/cpp/compositing/resource_settings_mojom_traits.cc
similarity index 96%
rename from services/viz/public/cpp/compositing/resource_settings_struct_traits.cc
rename to services/viz/public/cpp/compositing/resource_settings_mojom_traits.cc
index 120e577..ef25cd32 100644
--- a/services/viz/public/cpp/compositing/resource_settings_struct_traits.cc
+++ b/services/viz/public/cpp/compositing/resource_settings_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/compositing/resource_settings_struct_traits.h"
+#include "services/viz/public/cpp/compositing/resource_settings_mojom_traits.h"
namespace mojo {
diff --git a/services/viz/public/cpp/compositing/resource_settings_struct_traits.h b/services/viz/public/cpp/compositing/resource_settings_mojom_traits.h
similarity index 76%
rename from services/viz/public/cpp/compositing/resource_settings_struct_traits.h
rename to services/viz/public/cpp/compositing/resource_settings_mojom_traits.h
index e108439..8720bb3 100644
--- a/services/viz/public/cpp/compositing/resource_settings_struct_traits.h
+++ b/services/viz/public/cpp/compositing/resource_settings_mojom_traits.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RESOURCE_SETTINGS_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RESOURCE_SETTINGS_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RESOURCE_SETTINGS_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RESOURCE_SETTINGS_MOJOM_TRAITS_H_
#include <utility>
#include "components/viz/common/resources/resource_settings.h"
-#include "services/viz/public/interfaces/compositing/resource_settings.mojom.h"
+#include "services/viz/public/mojom/compositing/resource_settings.mojom.h"
#include "ui/gfx/mojo/buffer_types.mojom.h"
#include "ui/gfx/mojo/buffer_types_struct_traits.h"
@@ -28,4 +28,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RESOURCE_SETTINGS_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RESOURCE_SETTINGS_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/returned_resource.typemap b/services/viz/public/cpp/compositing/returned_resource.typemap
index ec2faf2..811e5cf8 100644
--- a/services/viz/public/cpp/compositing/returned_resource.typemap
+++ b/services/viz/public/cpp/compositing/returned_resource.typemap
@@ -2,9 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/returned_resource.mojom"
+mojom = "//services/viz/public/mojom/compositing/returned_resource.mojom"
public_headers = [ "//components/viz/common/resources/returned_resource.h" ]
-traits_headers = [ "//services/viz/public/cpp/compositing/returned_resource_struct_traits.h" ]
+traits_headers =
+ [ "//services/viz/public/cpp/compositing/returned_resource_mojom_traits.h" ]
deps = [
"//components/viz/common",
"//gpu/command_buffer/common",
diff --git a/services/viz/public/cpp/compositing/returned_resource_struct_traits.h b/services/viz/public/cpp/compositing/returned_resource_mojom_traits.h
similarity index 81%
rename from services/viz/public/cpp/compositing/returned_resource_struct_traits.h
rename to services/viz/public/cpp/compositing/returned_resource_mojom_traits.h
index 7f217fa..ef82e1a 100644
--- a/services/viz/public/cpp/compositing/returned_resource_struct_traits.h
+++ b/services/viz/public/cpp/compositing/returned_resource_mojom_traits.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RETURNED_RESOURCE_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RETURNED_RESOURCE_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RETURNED_RESOURCE_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RETURNED_RESOURCE_MOJOM_TRAITS_H_
#include "components/viz/common/resources/returned_resource.h"
#include "gpu/ipc/common/sync_token_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/returned_resource.mojom-shared.h"
+#include "services/viz/public/mojom/compositing/returned_resource.mojom-shared.h"
namespace mojo {
@@ -44,4 +44,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RETURNED_RESOURCE_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_RETURNED_RESOURCE_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/selection.typemap b/services/viz/public/cpp/compositing/selection.typemap
index 61bef1ff..24897fc 100644
--- a/services/viz/public/cpp/compositing/selection.typemap
+++ b/services/viz/public/cpp/compositing/selection.typemap
@@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/selection.mojom"
+mojom = "//services/viz/public/mojom/compositing/selection.mojom"
public_headers = [
"//components/viz/common/quads/selection.h",
"//ui/gfx/selection_bound.h",
]
traits_headers =
- [ "//services/viz/public/cpp/compositing/selection_struct_traits.h" ]
+ [ "//services/viz/public/cpp/compositing/selection_mojom_traits.h" ]
type_mappings = [ "viz.mojom.Selection=viz::Selection<gfx::SelectionBound>" ]
diff --git a/services/viz/public/cpp/compositing/selection_struct_traits.h b/services/viz/public/cpp/compositing/selection_mojom_traits.h
similarity index 74%
rename from services/viz/public/cpp/compositing/selection_struct_traits.h
rename to services/viz/public/cpp/compositing/selection_mojom_traits.h
index d02efb6..6adb26ea 100644
--- a/services/viz/public/cpp/compositing/selection_struct_traits.h
+++ b/services/viz/public/cpp/compositing/selection_mojom_traits.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SELECTION_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SELECTION_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SELECTION_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SELECTION_MOJOM_TRAITS_H_
#include "components/viz/common/quads/selection.h"
-#include "services/viz/public/interfaces/compositing/selection.mojom-shared.h"
+#include "services/viz/public/mojom/compositing/selection.mojom-shared.h"
#include "ui/gfx/selection_bound.h"
namespace mojo {
@@ -32,4 +32,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SELECTION_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SELECTION_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/shared_quad_state.typemap b/services/viz/public/cpp/compositing/shared_quad_state.typemap
index f031422..59293b3b 100644
--- a/services/viz/public/cpp/compositing/shared_quad_state.typemap
+++ b/services/viz/public/cpp/compositing/shared_quad_state.typemap
@@ -2,7 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/shared_quad_state.mojom"
+mojom = "//services/viz/public/mojom/compositing/shared_quad_state.mojom"
public_headers = [ "//components/viz/common/quads/shared_quad_state.h" ]
-traits_headers = [ "//services/viz/public/cpp/compositing/shared_quad_state_struct_traits.h" ]
+traits_headers =
+ [ "//services/viz/public/cpp/compositing/shared_quad_state_mojom_traits.h" ]
type_mappings = [ "viz.mojom.SharedQuadState=viz::SharedQuadState" ]
diff --git a/services/viz/public/cpp/compositing/shared_quad_state_struct_traits.h b/services/viz/public/cpp/compositing/shared_quad_state_mojom_traits.h
similarity index 93%
rename from services/viz/public/cpp/compositing/shared_quad_state_struct_traits.h
rename to services/viz/public/cpp/compositing/shared_quad_state_mojom_traits.h
index fe9ba92..f4b0d3d 100644
--- a/services/viz/public/cpp/compositing/shared_quad_state_struct_traits.h
+++ b/services/viz/public/cpp/compositing/shared_quad_state_mojom_traits.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SHARED_QUAD_STATE_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SHARED_QUAD_STATE_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SHARED_QUAD_STATE_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SHARED_QUAD_STATE_MOJOM_TRAITS_H_
#include "components/viz/common/quads/shared_quad_state.h"
-#include "services/viz/public/interfaces/compositing/shared_quad_state.mojom-shared.h"
+#include "services/viz/public/mojom/compositing/shared_quad_state.mojom-shared.h"
#include "ui/gfx/mojo/rrect_f_struct_traits.h"
namespace mojo {
@@ -131,4 +131,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SHARED_QUAD_STATE_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SHARED_QUAD_STATE_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/surface_id.typemap b/services/viz/public/cpp/compositing/surface_id.typemap
index 219396a..f61de54 100644
--- a/services/viz/public/cpp/compositing/surface_id.typemap
+++ b/services/viz/public/cpp/compositing/surface_id.typemap
@@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/surface_id.mojom"
+mojom = "//services/viz/public/mojom/compositing/surface_id.mojom"
public_headers = [ "//components/viz/common/surfaces/surface_id.h" ]
deps = [
"//components/viz/common",
]
traits_headers =
- [ "//services/viz/public/cpp/compositing/surface_id_struct_traits.h" ]
+ [ "//services/viz/public/cpp/compositing/surface_id_mojom_traits.h" ]
type_mappings = [ "viz.mojom.SurfaceId=viz::SurfaceId" ]
diff --git a/services/viz/public/cpp/compositing/surface_id_struct_traits.h b/services/viz/public/cpp/compositing/surface_id_mojom_traits.h
similarity index 66%
rename from services/viz/public/cpp/compositing/surface_id_struct_traits.h
rename to services/viz/public/cpp/compositing/surface_id_mojom_traits.h
index 8d9bfc40..3c91d2e0 100644
--- a/services/viz/public/cpp/compositing/surface_id_struct_traits.h
+++ b/services/viz/public/cpp/compositing/surface_id_mojom_traits.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_ID_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_ID_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_ID_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_ID_MOJOM_TRAITS_H_
#include "components/viz/common/surfaces/frame_sink_id.h"
#include "components/viz/common/surfaces/local_surface_id.h"
#include "components/viz/common/surfaces/surface_id.h"
-#include "services/viz/public/cpp/compositing/frame_sink_id_struct_traits.h"
-#include "services/viz/public/cpp/compositing/local_surface_id_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/surface_id.mojom-shared.h"
+#include "services/viz/public/cpp/compositing/frame_sink_id_mojom_traits.h"
+#include "services/viz/public/cpp/compositing/local_surface_id_mojom_traits.h"
+#include "services/viz/public/mojom/compositing/surface_id.mojom-shared.h"
namespace mojo {
@@ -32,4 +32,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_ID_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_ID_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/surface_info.typemap b/services/viz/public/cpp/compositing/surface_info.typemap
index aaf163f..6a016d2 100644
--- a/services/viz/public/cpp/compositing/surface_info.typemap
+++ b/services/viz/public/cpp/compositing/surface_info.typemap
@@ -2,10 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/surface_info.mojom"
+mojom = "//services/viz/public/mojom/compositing/surface_info.mojom"
public_headers = [ "//components/viz/common/surfaces/surface_info.h" ]
traits_headers =
- [ "//services/viz/public/cpp/compositing/surface_info_struct_traits.h" ]
+ [ "//services/viz/public/cpp/compositing/surface_info_mojom_traits.h" ]
deps = [
"//components/viz/common",
]
diff --git a/services/viz/public/cpp/compositing/surface_info_struct_traits.h b/services/viz/public/cpp/compositing/surface_info_mojom_traits.h
similarity index 76%
rename from services/viz/public/cpp/compositing/surface_info_struct_traits.h
rename to services/viz/public/cpp/compositing/surface_info_mojom_traits.h
index b7ca003..28534b2 100644
--- a/services/viz/public/cpp/compositing/surface_info_struct_traits.h
+++ b/services/viz/public/cpp/compositing/surface_info_mojom_traits.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_INFO_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_INFO_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_INFO_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_INFO_MOJOM_TRAITS_H_
#include "components/viz/common/surfaces/surface_info.h"
-#include "services/viz/public/interfaces/compositing/surface_info.mojom-shared.h"
+#include "services/viz/public/mojom/compositing/surface_info.mojom-shared.h"
namespace mojo {
@@ -35,4 +35,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_INFO_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_INFO_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/surface_range.typemap b/services/viz/public/cpp/compositing/surface_range.typemap
index c3309ea..730e1d93 100644
--- a/services/viz/public/cpp/compositing/surface_range.typemap
+++ b/services/viz/public/cpp/compositing/surface_range.typemap
@@ -2,11 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/compositing/surface_range.mojom"
+mojom = "//services/viz/public/mojom/compositing/surface_range.mojom"
public_headers = [ "//components/viz/common/surfaces/surface_range.h" ]
deps = [
"//components/viz/common",
]
traits_headers =
- [ "//services/viz/public/cpp/compositing/surface_range_struct_traits.h" ]
+ [ "//services/viz/public/cpp/compositing/surface_range_mojom_traits.h" ]
type_mappings = [ "viz.mojom.SurfaceRange=viz::SurfaceRange" ]
diff --git a/services/viz/public/cpp/compositing/surface_range_struct_traits.h b/services/viz/public/cpp/compositing/surface_range_mojom_traits.h
similarity index 69%
rename from services/viz/public/cpp/compositing/surface_range_struct_traits.h
rename to services/viz/public/cpp/compositing/surface_range_mojom_traits.h
index eac9651..00d46b5 100644
--- a/services/viz/public/cpp/compositing/surface_range_struct_traits.h
+++ b/services/viz/public/cpp/compositing/surface_range_mojom_traits.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_RANGE_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_RANGE_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_RANGE_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_RANGE_MOJOM_TRAITS_H_
#include "components/viz/common/surfaces/surface_id.h"
#include "components/viz/common/surfaces/surface_range.h"
-#include "services/viz/public/cpp/compositing/surface_id_struct_traits.h"
-#include "services/viz/public/interfaces/compositing/surface_range.mojom-shared.h"
+#include "services/viz/public/cpp/compositing/surface_id_mojom_traits.h"
+#include "services/viz/public/mojom/compositing/surface_range.mojom-shared.h"
namespace mojo {
@@ -34,4 +34,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_RANGE_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_SURFACE_RANGE_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/compositing/transferable_resource.typemap b/services/viz/public/cpp/compositing/transferable_resource.typemap
index 74cf3a8..19162818 100644
--- a/services/viz/public/cpp/compositing/transferable_resource.typemap
+++ b/services/viz/public/cpp/compositing/transferable_resource.typemap
@@ -2,14 +2,13 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom =
- "//services/viz/public/interfaces/compositing/transferable_resource.mojom"
+mojom = "//services/viz/public/mojom/compositing/transferable_resource.mojom"
public_headers = [ "//components/viz/common/resources/transferable_resource.h" ]
traits_headers = [
- "//services/viz/public/cpp/compositing/transferable_resource_struct_traits.h",
+ "//services/viz/public/cpp/compositing/transferable_resource_mojom_traits.h",
]
sources = [
- "//services/viz/public/cpp/compositing/transferable_resource_struct_traits.cc",
+ "//services/viz/public/cpp/compositing/transferable_resource_mojom_traits.cc",
]
type_mappings = [ "viz.mojom.TransferableResource=viz::TransferableResource" ]
deps = [
diff --git a/services/viz/public/cpp/compositing/transferable_resource_struct_traits.cc b/services/viz/public/cpp/compositing/transferable_resource_mojom_traits.cc
similarity index 98%
rename from services/viz/public/cpp/compositing/transferable_resource_struct_traits.cc
rename to services/viz/public/cpp/compositing/transferable_resource_mojom_traits.cc
index 7b0b21ad..900cf07f 100644
--- a/services/viz/public/cpp/compositing/transferable_resource_struct_traits.cc
+++ b/services/viz/public/cpp/compositing/transferable_resource_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/compositing/transferable_resource_struct_traits.h"
+#include "services/viz/public/cpp/compositing/transferable_resource_mojom_traits.h"
#include "gpu/ipc/common/mailbox_holder_struct_traits.h"
#include "gpu/ipc/common/mailbox_struct_traits.h"
diff --git a/services/viz/public/cpp/compositing/transferable_resource_struct_traits.h b/services/viz/public/cpp/compositing/transferable_resource_mojom_traits.h
similarity index 94%
rename from services/viz/public/cpp/compositing/transferable_resource_struct_traits.h
rename to services/viz/public/cpp/compositing/transferable_resource_mojom_traits.h
index 57238e81..df58fa1 100644
--- a/services/viz/public/cpp/compositing/transferable_resource_struct_traits.h
+++ b/services/viz/public/cpp/compositing/transferable_resource_mojom_traits.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_TRANSFERABLE_RESOURCE_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_TRANSFERABLE_RESOURCE_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_TRANSFERABLE_RESOURCE_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_TRANSFERABLE_RESOURCE_MOJOM_TRAITS_H_
#include "build/build_config.h"
#include "components/viz/common/resources/transferable_resource.h"
-#include "services/viz/public/interfaces/compositing/transferable_resource.mojom-shared.h"
+#include "services/viz/public/mojom/compositing/transferable_resource.mojom-shared.h"
#include "ui/gfx/ipc/color/gfx_param_traits.h"
namespace mojo {
@@ -82,4 +82,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_TRANSFERABLE_RESOURCE_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_COMPOSITING_TRANSFERABLE_RESOURCE_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/gpu/BUILD.gn b/services/viz/public/cpp/gpu/BUILD.gn
index 1f225f4d..3abda1c 100644
--- a/services/viz/public/cpp/gpu/BUILD.gn
+++ b/services/viz/public/cpp/gpu/BUILD.gn
@@ -24,7 +24,7 @@
"//gpu/command_buffer/common",
"//gpu/ipc/client",
"//gpu/ipc/common",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//url",
]
@@ -41,7 +41,7 @@
"//gpu/skia_bindings",
"//mojo/public/cpp/system",
"//services/service_manager/public/cpp",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//ui/base:features",
"//ui/gl",
]
diff --git a/services/viz/public/cpp/gpu/client_gpu_memory_buffer_manager.h b/services/viz/public/cpp/gpu/client_gpu_memory_buffer_manager.h
index 4cbb6e6..bddfb58 100644
--- a/services/viz/public/cpp/gpu/client_gpu_memory_buffer_manager.h
+++ b/services/viz/public/cpp/gpu/client_gpu_memory_buffer_manager.h
@@ -14,7 +14,7 @@
#include "base/memory/weak_ptr.h"
#include "base/threading/thread.h"
#include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
-#include "services/viz/public/interfaces/gpu.mojom.h"
+#include "services/viz/public/mojom/gpu.mojom.h"
namespace base {
class WaitableEvent;
diff --git a/services/viz/public/cpp/gpu/gpu.cc b/services/viz/public/cpp/gpu/gpu.cc
index 004ee42..ac31199 100644
--- a/services/viz/public/cpp/gpu/gpu.cc
+++ b/services/viz/public/cpp/gpu/gpu.cc
@@ -17,7 +17,7 @@
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/viz/public/cpp/gpu/client_gpu_memory_buffer_manager.h"
-#include "services/viz/public/interfaces/gpu.mojom.h"
+#include "services/viz/public/mojom/gpu.mojom.h"
namespace viz {
diff --git a/services/viz/public/cpp/gpu/gpu.h b/services/viz/public/cpp/gpu/gpu.h
index a6c1447..a9458c44 100644
--- a/services/viz/public/cpp/gpu/gpu.h
+++ b/services/viz/public/cpp/gpu/gpu.h
@@ -14,7 +14,7 @@
#include "components/viz/common/gpu/context_provider.h"
#include "gpu/ipc/client/gpu_channel_host.h"
#include "services/viz/public/cpp/gpu/client_gpu_memory_buffer_manager.h"
-#include "services/viz/public/interfaces/gpu.mojom.h"
+#include "services/viz/public/mojom/gpu.mojom.h"
namespace service_manager {
class Connector;
diff --git a/services/viz/public/cpp/hit_test/BUILD.gn b/services/viz/public/cpp/hit_test/BUILD.gn
index 62e5a2f..fbb9801 100644
--- a/services/viz/public/cpp/hit_test/BUILD.gn
+++ b/services/viz/public/cpp/hit_test/BUILD.gn
@@ -6,7 +6,7 @@
testonly = true
sources = [
- "struct_traits_unittest.cc",
+ "mojom_traits_unittest.cc",
]
deps = [
@@ -14,7 +14,7 @@
"//components/viz/common:common",
"//components/viz/test:test_support",
"//mojo/public/cpp/test_support:test_utils",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//testing/gtest",
"//ui/gfx:test_support",
"//ui/gfx/geometry/mojom:mojom_traits",
diff --git a/services/viz/public/cpp/hit_test/OWNERS b/services/viz/public/cpp/hit_test/OWNERS
index 4df0c71..7aebc8abb 100644
--- a/services/viz/public/cpp/hit_test/OWNERS
+++ b/services/viz/public/cpp/hit_test/OWNERS
@@ -1,4 +1,4 @@
-per-file *_struct_traits*.*=set noparent
-per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS
+per-file *_mojom_traits*.*=set noparent
+per-file *_mojom_traits*.*=file://ipc/SECURITY_OWNERS
per-file *.typemap=set noparent
per-file *.typemap=file://ipc/SECURITY_OWNERS
diff --git a/services/viz/public/cpp/hit_test/aggregated_hit_test_region.typemap b/services/viz/public/cpp/hit_test/aggregated_hit_test_region.typemap
index b16a808..cdba4bd 100644
--- a/services/viz/public/cpp/hit_test/aggregated_hit_test_region.typemap
+++ b/services/viz/public/cpp/hit_test/aggregated_hit_test_region.typemap
@@ -2,16 +2,15 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom =
- "//services/viz/public/interfaces/hit_test/aggregated_hit_test_region.mojom"
+mojom = "//services/viz/public/mojom/hit_test/aggregated_hit_test_region.mojom"
public_headers =
[ "//components/viz/common/hit_test/aggregated_hit_test_region.h" ]
deps = [
"//components/viz/common",
]
-traits_headers = [ "//services/viz/public/cpp/hit_test/aggregated_hit_test_region_struct_traits.h" ]
+traits_headers = [ "//services/viz/public/cpp/hit_test/aggregated_hit_test_region_mojom_traits.h" ]
sources = [
- "//services/viz/public/cpp/hit_test/aggregated_hit_test_region_struct_traits.cc",
+ "//services/viz/public/cpp/hit_test/aggregated_hit_test_region_mojom_traits.cc",
]
type_mappings =
[ "viz.mojom.AggregatedHitTestRegion=viz::AggregatedHitTestRegion" ]
diff --git a/services/viz/public/cpp/hit_test/aggregated_hit_test_region_struct_traits.cc b/services/viz/public/cpp/hit_test/aggregated_hit_test_region_mojom_traits.cc
similarity index 96%
rename from services/viz/public/cpp/hit_test/aggregated_hit_test_region_struct_traits.cc
rename to services/viz/public/cpp/hit_test/aggregated_hit_test_region_mojom_traits.cc
index 70d4124..d972d4c 100644
--- a/services/viz/public/cpp/hit_test/aggregated_hit_test_region_struct_traits.cc
+++ b/services/viz/public/cpp/hit_test/aggregated_hit_test_region_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/hit_test/aggregated_hit_test_region_struct_traits.h"
+#include "services/viz/public/cpp/hit_test/aggregated_hit_test_region_mojom_traits.h"
namespace mojo {
diff --git a/services/viz/public/cpp/hit_test/aggregated_hit_test_region_struct_traits.h b/services/viz/public/cpp/hit_test/aggregated_hit_test_region_mojom_traits.h
similarity index 86%
rename from services/viz/public/cpp/hit_test/aggregated_hit_test_region_struct_traits.h
rename to services/viz/public/cpp/hit_test/aggregated_hit_test_region_mojom_traits.h
index b63a6111..d1e5eac 100644
--- a/services/viz/public/cpp/hit_test/aggregated_hit_test_region_struct_traits.h
+++ b/services/viz/public/cpp/hit_test/aggregated_hit_test_region_mojom_traits.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_HIT_TEST_AGGREGATED_HIT_TEST_REGION_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_HIT_TEST_AGGREGATED_HIT_TEST_REGION_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_HIT_TEST_AGGREGATED_HIT_TEST_REGION_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_HIT_TEST_AGGREGATED_HIT_TEST_REGION_MOJOM_TRAITS_H_
#include "components/viz/common/hit_test/aggregated_hit_test_region.h"
-#include "services/viz/public/cpp/compositing/frame_sink_id_struct_traits.h"
-#include "services/viz/public/interfaces/hit_test/aggregated_hit_test_region.mojom-shared.h"
+#include "services/viz/public/cpp/compositing/frame_sink_id_mojom_traits.h"
+#include "services/viz/public/mojom/hit_test/aggregated_hit_test_region.mojom-shared.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
#include "ui/gfx/mojo/transform_struct_traits.h"
@@ -48,4 +48,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_HIT_TEST_AGGREGATED_HIT_TEST_REGION_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_HIT_TEST_AGGREGATED_HIT_TEST_REGION_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/hit_test/hit_test_region_list.typemap b/services/viz/public/cpp/hit_test/hit_test_region_list.typemap
index 76e129c..5bb1b56d 100644
--- a/services/viz/public/cpp/hit_test/hit_test_region_list.typemap
+++ b/services/viz/public/cpp/hit_test/hit_test_region_list.typemap
@@ -2,16 +2,15 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/viz/public/interfaces/hit_test/hit_test_region_list.mojom"
+mojom = "//services/viz/public/mojom/hit_test/hit_test_region_list.mojom"
public_headers = [ "//components/viz/common/hit_test/hit_test_region_list.h" ]
deps = [
"//components/viz/common",
]
-traits_headers = [
- "//services/viz/public/cpp/hit_test/hit_test_region_list_struct_traits.h",
-]
+traits_headers =
+ [ "//services/viz/public/cpp/hit_test/hit_test_region_list_mojom_traits.h" ]
sources = [
- "//services/viz/public/cpp/hit_test/hit_test_region_list_struct_traits.cc",
+ "//services/viz/public/cpp/hit_test/hit_test_region_list_mojom_traits.cc",
]
type_mappings = [
"viz.mojom.HitTestRegion=viz::HitTestRegion",
diff --git a/services/viz/public/cpp/hit_test/hit_test_region_list_struct_traits.cc b/services/viz/public/cpp/hit_test/hit_test_region_list_mojom_traits.cc
similarity index 98%
rename from services/viz/public/cpp/hit_test/hit_test_region_list_struct_traits.cc
rename to services/viz/public/cpp/hit_test/hit_test_region_list_mojom_traits.cc
index 9739bd7..a15ba4b4 100644
--- a/services/viz/public/cpp/hit_test/hit_test_region_list_struct_traits.cc
+++ b/services/viz/public/cpp/hit_test/hit_test_region_list_mojom_traits.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/viz/public/cpp/hit_test/hit_test_region_list_struct_traits.h"
+#include "services/viz/public/cpp/hit_test/hit_test_region_list_mojom_traits.h"
namespace mojo {
diff --git a/services/viz/public/cpp/hit_test/hit_test_region_list_struct_traits.h b/services/viz/public/cpp/hit_test/hit_test_region_list_mojom_traits.h
similarity index 85%
rename from services/viz/public/cpp/hit_test/hit_test_region_list_struct_traits.h
rename to services/viz/public/cpp/hit_test/hit_test_region_list_mojom_traits.h
index f27d85c..6fdb2361 100644
--- a/services/viz/public/cpp/hit_test/hit_test_region_list_struct_traits.h
+++ b/services/viz/public/cpp/hit_test/hit_test_region_list_mojom_traits.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_VIZ_PUBLIC_CPP_HIT_TEST_HIT_TEST_REGION_LIST_STRUCT_TRAITS_H_
-#define SERVICES_VIZ_PUBLIC_CPP_HIT_TEST_HIT_TEST_REGION_LIST_STRUCT_TRAITS_H_
+#ifndef SERVICES_VIZ_PUBLIC_CPP_HIT_TEST_HIT_TEST_REGION_LIST_MOJOM_TRAITS_H_
+#define SERVICES_VIZ_PUBLIC_CPP_HIT_TEST_HIT_TEST_REGION_LIST_MOJOM_TRAITS_H_
#include "components/viz/common/hit_test/hit_test_region_list.h"
-#include "services/viz/public/cpp/compositing/frame_sink_id_struct_traits.h"
-#include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom-shared.h"
+#include "services/viz/public/cpp/compositing/frame_sink_id_mojom_traits.h"
+#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom-shared.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
#include "ui/gfx/mojo/transform_struct_traits.h"
@@ -62,4 +62,4 @@
} // namespace mojo
-#endif // SERVICES_VIZ_PUBLIC_CPP_HIT_TEST_HIT_TEST_REGION_LIST_STRUCT_TRAITS_H_
+#endif // SERVICES_VIZ_PUBLIC_CPP_HIT_TEST_HIT_TEST_REGION_LIST_MOJOM_TRAITS_H_
diff --git a/services/viz/public/cpp/hit_test/struct_traits_unittest.cc b/services/viz/public/cpp/hit_test/mojom_traits_unittest.cc
similarity index 93%
rename from services/viz/public/cpp/hit_test/struct_traits_unittest.cc
rename to services/viz/public/cpp/hit_test/mojom_traits_unittest.cc
index 2f4a8c4..a348405 100644
--- a/services/viz/public/cpp/hit_test/struct_traits_unittest.cc
+++ b/services/viz/public/cpp/hit_test/mojom_traits_unittest.cc
@@ -5,10 +5,10 @@
#include "components/viz/common/hit_test/aggregated_hit_test_region.h"
#include "components/viz/common/hit_test/hit_test_region_list.h"
#include "mojo/public/cpp/test_support/test_utils.h"
-#include "services/viz/public/cpp/hit_test/aggregated_hit_test_region_struct_traits.h"
-#include "services/viz/public/cpp/hit_test/hit_test_region_list_struct_traits.h"
-#include "services/viz/public/interfaces/hit_test/aggregated_hit_test_region.mojom.h"
-#include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom.h"
+#include "services/viz/public/cpp/hit_test/aggregated_hit_test_region_mojom_traits.h"
+#include "services/viz/public/cpp/hit_test/hit_test_region_list_mojom_traits.h"
+#include "services/viz/public/mojom/hit_test/aggregated_hit_test_region.mojom.h"
+#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
#include "ui/gfx/mojo/transform_struct_traits.h"
diff --git a/services/viz/public/interfaces/BUILD.gn b/services/viz/public/mojom/BUILD.gn
similarity index 98%
rename from services/viz/public/interfaces/BUILD.gn
rename to services/viz/public/mojom/BUILD.gn
index 772fa1c..78d2bd1 100644
--- a/services/viz/public/interfaces/BUILD.gn
+++ b/services/viz/public/mojom/BUILD.gn
@@ -4,7 +4,7 @@
import("//mojo/public/tools/bindings/mojom.gni")
-mojom("interfaces") {
+mojom("mojom") {
sources = [
"compositing/begin_frame_args.mojom",
"compositing/compositing_mode_watcher.mojom",
diff --git a/services/viz/public/interfaces/OWNERS b/services/viz/public/mojom/OWNERS
similarity index 100%
rename from services/viz/public/interfaces/OWNERS
rename to services/viz/public/mojom/OWNERS
diff --git a/services/viz/public/interfaces/compositing/OWNERS b/services/viz/public/mojom/compositing/OWNERS
similarity index 100%
rename from services/viz/public/interfaces/compositing/OWNERS
rename to services/viz/public/mojom/compositing/OWNERS
diff --git a/services/viz/public/interfaces/compositing/begin_frame_args.mojom b/services/viz/public/mojom/compositing/begin_frame_args.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/begin_frame_args.mojom
rename to services/viz/public/mojom/compositing/begin_frame_args.mojom
diff --git a/services/viz/public/interfaces/compositing/compositing_mode_watcher.mojom b/services/viz/public/mojom/compositing/compositing_mode_watcher.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/compositing_mode_watcher.mojom
rename to services/viz/public/mojom/compositing/compositing_mode_watcher.mojom
diff --git a/services/viz/public/interfaces/compositing/compositor_frame.mojom b/services/viz/public/mojom/compositing/compositor_frame.mojom
similarity index 61%
rename from services/viz/public/interfaces/compositing/compositor_frame.mojom
rename to services/viz/public/mojom/compositing/compositor_frame.mojom
index 6b37fe6..c707db1 100644
--- a/services/viz/public/interfaces/compositing/compositor_frame.mojom
+++ b/services/viz/public/mojom/compositing/compositor_frame.mojom
@@ -4,9 +4,9 @@
module viz.mojom;
-import "services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom";
-import "services/viz/public/interfaces/compositing/render_pass.mojom";
-import "services/viz/public/interfaces/compositing/transferable_resource.mojom";
+import "services/viz/public/mojom/compositing/compositor_frame_metadata.mojom";
+import "services/viz/public/mojom/compositing/render_pass.mojom";
+import "services/viz/public/mojom/compositing/transferable_resource.mojom";
// See src/components/viz/common/quads/compositor_frame.h.
struct CompositorFrame {
diff --git a/services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom b/services/viz/public/mojom/compositing/compositor_frame_metadata.mojom
similarity index 83%
rename from services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom
rename to services/viz/public/mojom/compositing/compositor_frame_metadata.mojom
index cff2aef..5feaa2c 100644
--- a/services/viz/public/interfaces/compositing/compositor_frame_metadata.mojom
+++ b/services/viz/public/mojom/compositing/compositor_frame_metadata.mojom
@@ -5,11 +5,11 @@
module viz.mojom;
import "mojo/public/mojom/base/time.mojom";
-import "services/viz/public/interfaces/compositing/begin_frame_args.mojom";
-import "services/viz/public/interfaces/compositing/frame_deadline.mojom";
-import "services/viz/public/interfaces/compositing/selection.mojom";
-import "services/viz/public/interfaces/compositing/surface_id.mojom";
-import "services/viz/public/interfaces/compositing/surface_range.mojom";
+import "services/viz/public/mojom/compositing/begin_frame_args.mojom";
+import "services/viz/public/mojom/compositing/frame_deadline.mojom";
+import "services/viz/public/mojom/compositing/selection.mojom";
+import "services/viz/public/mojom/compositing/surface_id.mojom";
+import "services/viz/public/mojom/compositing/surface_range.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "ui/latency/mojom/latency_info.mojom";
diff --git a/services/viz/public/interfaces/compositing/compositor_frame_sink.mojom b/services/viz/public/mojom/compositing/compositor_frame_sink.mojom
similarity index 90%
rename from services/viz/public/interfaces/compositing/compositor_frame_sink.mojom
rename to services/viz/public/mojom/compositing/compositor_frame_sink.mojom
index 15f44089..521e595 100644
--- a/services/viz/public/interfaces/compositing/compositor_frame_sink.mojom
+++ b/services/viz/public/mojom/compositing/compositor_frame_sink.mojom
@@ -6,12 +6,12 @@
import "mojo/public/mojom/base/time.mojom";
import "mojo/public/mojom/base/shared_memory.mojom";
-import "services/viz/public/interfaces/compositing/begin_frame_args.mojom";
-import "services/viz/public/interfaces/compositing/compositor_frame.mojom";
-import "services/viz/public/interfaces/compositing/local_surface_id.mojom";
-import "services/viz/public/interfaces/compositing/frame_timing_details.mojom";
-import "services/viz/public/interfaces/compositing/returned_resource.mojom";
-import "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom";
+import "services/viz/public/mojom/compositing/begin_frame_args.mojom";
+import "services/viz/public/mojom/compositing/compositor_frame.mojom";
+import "services/viz/public/mojom/compositing/local_surface_id.mojom";
+import "services/viz/public/mojom/compositing/frame_timing_details.mojom";
+import "services/viz/public/mojom/compositing/returned_resource.mojom";
+import "services/viz/public/mojom/hit_test/hit_test_region_list.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "gpu/ipc/common/mailbox.mojom";
diff --git a/services/viz/public/interfaces/compositing/copy_output_request.mojom b/services/viz/public/mojom/compositing/copy_output_request.mojom
similarity index 92%
rename from services/viz/public/interfaces/compositing/copy_output_request.mojom
rename to services/viz/public/mojom/compositing/copy_output_request.mojom
index 68d8f81..ecf0058d 100644
--- a/services/viz/public/interfaces/compositing/copy_output_request.mojom
+++ b/services/viz/public/mojom/compositing/copy_output_request.mojom
@@ -6,7 +6,7 @@
import "gpu/ipc/common/mailbox.mojom";
import "gpu/ipc/common/sync_token.mojom";
-import "services/viz/public/interfaces/compositing/copy_output_result.mojom";
+import "services/viz/public/mojom/compositing/copy_output_result.mojom";
import "mojo/public/mojom/base/unguessable_token.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
diff --git a/services/viz/public/interfaces/compositing/copy_output_result.mojom b/services/viz/public/mojom/compositing/copy_output_result.mojom
similarity index 93%
rename from services/viz/public/interfaces/compositing/copy_output_result.mojom
rename to services/viz/public/mojom/compositing/copy_output_result.mojom
index 31f0cc6..c3a440b 100644
--- a/services/viz/public/interfaces/compositing/copy_output_result.mojom
+++ b/services/viz/public/mojom/compositing/copy_output_result.mojom
@@ -6,7 +6,7 @@
import "gpu/ipc/common/mailbox.mojom";
import "gpu/ipc/common/sync_token.mojom";
-import "services/viz/public/interfaces/compositing/texture_releaser.mojom";
+import "services/viz/public/mojom/compositing/texture_releaser.mojom";
import "skia/public/interfaces/bitmap.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "ui/gfx/mojo/color_space.mojom";
diff --git a/services/viz/public/interfaces/compositing/filter_operation.mojom b/services/viz/public/mojom/compositing/filter_operation.mojom
similarity index 92%
rename from services/viz/public/interfaces/compositing/filter_operation.mojom
rename to services/viz/public/mojom/compositing/filter_operation.mojom
index c46247c2..9ce1e26 100644
--- a/services/viz/public/interfaces/compositing/filter_operation.mojom
+++ b/services/viz/public/mojom/compositing/filter_operation.mojom
@@ -4,7 +4,7 @@
module viz.mojom;
-import "services/viz/public/interfaces/compositing/paint_filter.mojom";
+import "services/viz/public/mojom/compositing/paint_filter.mojom";
import "skia/public/interfaces/blur_image_filter_tile_mode.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
diff --git a/services/viz/public/interfaces/compositing/filter_operations.mojom b/services/viz/public/mojom/compositing/filter_operations.mojom
similarity index 79%
rename from services/viz/public/interfaces/compositing/filter_operations.mojom
rename to services/viz/public/mojom/compositing/filter_operations.mojom
index d2b514f..a4f6d015 100644
--- a/services/viz/public/interfaces/compositing/filter_operations.mojom
+++ b/services/viz/public/mojom/compositing/filter_operations.mojom
@@ -4,7 +4,7 @@
module viz.mojom;
-import "services/viz/public/interfaces/compositing/filter_operation.mojom";
+import "services/viz/public/mojom/compositing/filter_operation.mojom";
// See cc/paint/filter_operations.h.
struct FilterOperations {
diff --git a/services/viz/public/interfaces/compositing/frame_deadline.mojom b/services/viz/public/mojom/compositing/frame_deadline.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/frame_deadline.mojom
rename to services/viz/public/mojom/compositing/frame_deadline.mojom
diff --git a/services/viz/public/interfaces/compositing/frame_sink_id.mojom b/services/viz/public/mojom/compositing/frame_sink_id.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/frame_sink_id.mojom
rename to services/viz/public/mojom/compositing/frame_sink_id.mojom
diff --git a/services/viz/public/interfaces/compositing/frame_timing_details.mojom b/services/viz/public/mojom/compositing/frame_timing_details.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/frame_timing_details.mojom
rename to services/viz/public/mojom/compositing/frame_timing_details.mojom
diff --git a/services/viz/public/interfaces/compositing/local_surface_id.mojom b/services/viz/public/mojom/compositing/local_surface_id.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/local_surface_id.mojom
rename to services/viz/public/mojom/compositing/local_surface_id.mojom
diff --git a/services/viz/public/interfaces/compositing/local_surface_id_allocation.mojom b/services/viz/public/mojom/compositing/local_surface_id_allocation.mojom
similarity index 81%
rename from services/viz/public/interfaces/compositing/local_surface_id_allocation.mojom
rename to services/viz/public/mojom/compositing/local_surface_id_allocation.mojom
index 2634041..31bee71 100644
--- a/services/viz/public/interfaces/compositing/local_surface_id_allocation.mojom
+++ b/services/viz/public/mojom/compositing/local_surface_id_allocation.mojom
@@ -5,7 +5,7 @@
module viz.mojom;
import "mojo/public/mojom/base/time.mojom";
-import "services/viz/public/interfaces/compositing/local_surface_id.mojom";
+import "services/viz/public/mojom/compositing/local_surface_id.mojom";
struct LocalSurfaceIdAllocation {
LocalSurfaceId local_surface_id;
diff --git a/services/viz/public/interfaces/compositing/paint_filter.mojom b/services/viz/public/mojom/compositing/paint_filter.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/paint_filter.mojom
rename to services/viz/public/mojom/compositing/paint_filter.mojom
diff --git a/services/viz/public/interfaces/compositing/quads.mojom b/services/viz/public/mojom/compositing/quads.mojom
similarity index 96%
rename from services/viz/public/interfaces/compositing/quads.mojom
rename to services/viz/public/mojom/compositing/quads.mojom
index e49ba47..64d4e15 100644
--- a/services/viz/public/interfaces/compositing/quads.mojom
+++ b/services/viz/public/mojom/compositing/quads.mojom
@@ -6,8 +6,8 @@
import "gpu/ipc/common/vulkan_ycbcr_info.mojom";
import "mojo/public/mojom/base/unguessable_token.mojom";
-import "services/viz/public/interfaces/compositing/surface_range.mojom";
-import "services/viz/public/interfaces/compositing/shared_quad_state.mojom";
+import "services/viz/public/mojom/compositing/surface_range.mojom";
+import "services/viz/public/mojom/compositing/shared_quad_state.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "ui/gfx/mojo/color_space.mojom";
import "ui/gfx/mojo/transform.mojom";
diff --git a/services/viz/public/interfaces/compositing/render_pass.mojom b/services/viz/public/mojom/compositing/render_pass.mojom
similarity index 81%
rename from services/viz/public/interfaces/compositing/render_pass.mojom
rename to services/viz/public/mojom/compositing/render_pass.mojom
index 2151c1ab..8bd1557 100644
--- a/services/viz/public/interfaces/compositing/render_pass.mojom
+++ b/services/viz/public/mojom/compositing/render_pass.mojom
@@ -4,9 +4,9 @@
module viz.mojom;
-import "services/viz/public/interfaces/compositing/copy_output_request.mojom";
-import "services/viz/public/interfaces/compositing/filter_operations.mojom";
-import "services/viz/public/interfaces/compositing/quads.mojom";
+import "services/viz/public/mojom/compositing/copy_output_request.mojom";
+import "services/viz/public/mojom/compositing/filter_operations.mojom";
+import "services/viz/public/mojom/compositing/quads.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "ui/gfx/mojo/color_space.mojom";
import "ui/gfx/mojo/rrect_f.mojom";
diff --git a/services/viz/public/interfaces/compositing/resource_settings.mojom b/services/viz/public/mojom/compositing/resource_settings.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/resource_settings.mojom
rename to services/viz/public/mojom/compositing/resource_settings.mojom
diff --git a/services/viz/public/interfaces/compositing/returned_resource.mojom b/services/viz/public/mojom/compositing/returned_resource.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/returned_resource.mojom
rename to services/viz/public/mojom/compositing/returned_resource.mojom
diff --git a/services/viz/public/interfaces/compositing/selection.mojom b/services/viz/public/mojom/compositing/selection.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/selection.mojom
rename to services/viz/public/mojom/compositing/selection.mojom
diff --git a/services/viz/public/interfaces/compositing/shared_quad_state.mojom b/services/viz/public/mojom/compositing/shared_quad_state.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/shared_quad_state.mojom
rename to services/viz/public/mojom/compositing/shared_quad_state.mojom
diff --git a/services/viz/public/interfaces/compositing/surface_id.mojom b/services/viz/public/mojom/compositing/surface_id.mojom
similarity index 83%
rename from services/viz/public/interfaces/compositing/surface_id.mojom
rename to services/viz/public/mojom/compositing/surface_id.mojom
index 56a4125..6893397 100644
--- a/services/viz/public/interfaces/compositing/surface_id.mojom
+++ b/services/viz/public/mojom/compositing/surface_id.mojom
@@ -4,8 +4,8 @@
module viz.mojom;
-import "services/viz/public/interfaces/compositing/frame_sink_id.mojom";
-import "services/viz/public/interfaces/compositing/local_surface_id.mojom";
+import "services/viz/public/mojom/compositing/frame_sink_id.mojom";
+import "services/viz/public/mojom/compositing/local_surface_id.mojom";
// A surface ID is composed of two parts: a FrameSinkID, and a LocalSurfaceId.
// The FrameSinkId uniquely identifies the FrameSink associated with the
diff --git a/services/viz/public/interfaces/compositing/surface_info.mojom b/services/viz/public/mojom/compositing/surface_info.mojom
similarity index 87%
rename from services/viz/public/interfaces/compositing/surface_info.mojom
rename to services/viz/public/mojom/compositing/surface_info.mojom
index d74d13d6f..d53c313 100644
--- a/services/viz/public/interfaces/compositing/surface_info.mojom
+++ b/services/viz/public/mojom/compositing/surface_info.mojom
@@ -4,7 +4,7 @@
module viz.mojom;
-import "services/viz/public/interfaces/compositing/surface_id.mojom";
+import "services/viz/public/mojom/compositing/surface_id.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
// Holds information about an embeddable surface. This data can be passed
diff --git a/services/viz/public/interfaces/compositing/surface_range.mojom b/services/viz/public/mojom/compositing/surface_range.mojom
similarity index 77%
rename from services/viz/public/interfaces/compositing/surface_range.mojom
rename to services/viz/public/mojom/compositing/surface_range.mojom
index 56be346..0da73d7d 100644
--- a/services/viz/public/interfaces/compositing/surface_range.mojom
+++ b/services/viz/public/mojom/compositing/surface_range.mojom
@@ -4,7 +4,7 @@
module viz.mojom;
-import "services/viz/public/interfaces/compositing/surface_id.mojom";
+import "services/viz/public/mojom/compositing/surface_id.mojom";
struct SurfaceRange {
SurfaceId? start;
diff --git a/services/viz/public/interfaces/compositing/texture_releaser.mojom b/services/viz/public/mojom/compositing/texture_releaser.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/texture_releaser.mojom
rename to services/viz/public/mojom/compositing/texture_releaser.mojom
diff --git a/services/viz/public/interfaces/compositing/transferable_resource.mojom b/services/viz/public/mojom/compositing/transferable_resource.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/transferable_resource.mojom
rename to services/viz/public/mojom/compositing/transferable_resource.mojom
diff --git a/services/viz/public/interfaces/compositing/video_detector_observer.mojom b/services/viz/public/mojom/compositing/video_detector_observer.mojom
similarity index 100%
rename from services/viz/public/interfaces/compositing/video_detector_observer.mojom
rename to services/viz/public/mojom/compositing/video_detector_observer.mojom
diff --git a/services/viz/public/interfaces/gpu.mojom b/services/viz/public/mojom/gpu.mojom
similarity index 100%
rename from services/viz/public/interfaces/gpu.mojom
rename to services/viz/public/mojom/gpu.mojom
diff --git a/services/viz/public/interfaces/hit_test/OWNERS b/services/viz/public/mojom/hit_test/OWNERS
similarity index 100%
rename from services/viz/public/interfaces/hit_test/OWNERS
rename to services/viz/public/mojom/hit_test/OWNERS
diff --git a/services/viz/public/interfaces/hit_test/aggregated_hit_test_region.mojom b/services/viz/public/mojom/hit_test/aggregated_hit_test_region.mojom
similarity index 87%
rename from services/viz/public/interfaces/hit_test/aggregated_hit_test_region.mojom
rename to services/viz/public/mojom/hit_test/aggregated_hit_test_region.mojom
index d75d3576..db5ae7c 100644
--- a/services/viz/public/interfaces/hit_test/aggregated_hit_test_region.mojom
+++ b/services/viz/public/mojom/hit_test/aggregated_hit_test_region.mojom
@@ -4,7 +4,7 @@
module viz.mojom;
-import "services/viz/public/interfaces/compositing/frame_sink_id.mojom";
+import "services/viz/public/mojom/compositing/frame_sink_id.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "ui/gfx/mojo/transform.mojom";
diff --git a/services/viz/public/interfaces/hit_test/hit_test_region_list.mojom b/services/viz/public/mojom/hit_test/hit_test_region_list.mojom
similarity index 83%
rename from services/viz/public/interfaces/hit_test/hit_test_region_list.mojom
rename to services/viz/public/mojom/hit_test/hit_test_region_list.mojom
index 4a789f3..8976cb0 100644
--- a/services/viz/public/interfaces/hit_test/hit_test_region_list.mojom
+++ b/services/viz/public/mojom/hit_test/hit_test_region_list.mojom
@@ -4,8 +4,8 @@
module viz.mojom;
-import "services/viz/public/interfaces/compositing/frame_sink_id.mojom";
-import "services/viz/public/interfaces/compositing/surface_id.mojom";
+import "services/viz/public/mojom/compositing/frame_sink_id.mojom";
+import "services/viz/public/mojom/compositing/surface_id.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
import "ui/gfx/mojo/transform.mojom";
diff --git a/services/viz/public/interfaces/hit_test/input_target_client.mojom b/services/viz/public/mojom/hit_test/input_target_client.mojom
similarity index 93%
rename from services/viz/public/interfaces/hit_test/input_target_client.mojom
rename to services/viz/public/mojom/hit_test/input_target_client.mojom
index c56962b0c..ab55b580 100644
--- a/services/viz/public/interfaces/hit_test/input_target_client.mojom
+++ b/services/viz/public/mojom/hit_test/input_target_client.mojom
@@ -4,7 +4,7 @@
module viz.mojom;
-import "services/viz/public/interfaces/compositing/frame_sink_id.mojom";
+import "services/viz/public/mojom/compositing/frame_sink_id.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
// Returns the hit-tested frame sink id for the given coordinates.
diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn
index dffea95..f42396e 100644
--- a/third_party/blink/public/mojom/BUILD.gn
+++ b/third_party/blink/public/mojom/BUILD.gn
@@ -165,7 +165,7 @@
"//services/network/public/mojom:data_pipe_interfaces",
"//services/network/public/mojom:websocket_mojom",
"//services/service_manager/public/mojom",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia/public/interfaces",
"//third_party/blink/public/mojom/usb",
"//ui/base/ime/mojom",
@@ -451,7 +451,7 @@
"frame_sinks/embedded_frame_sink.mojom",
]
deps = [
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
]
component_output_prefix = "blink_embedded_frame_sink_mojo_bindings"
diff --git a/third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom b/third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom
index ec975114..fdb5f1a 100644
--- a/third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom
+++ b/third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom
@@ -4,10 +4,10 @@
module blink.mojom;
-import "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom";
-import "services/viz/public/interfaces/compositing/frame_sink_id.mojom";
-import "services/viz/public/interfaces/compositing/surface_info.mojom";
-import "services/viz/public/interfaces/compositing/local_surface_id.mojom";
+import "services/viz/public/mojom/compositing/compositor_frame_sink.mojom";
+import "services/viz/public/mojom/compositing/frame_sink_id.mojom";
+import "services/viz/public/mojom/compositing/surface_info.mojom";
+import "services/viz/public/mojom/compositing/local_surface_id.mojom";
// Interface from the the submitter to the embedder.
interface SurfaceEmbedder {
diff --git a/third_party/blink/public/mojom/picture_in_picture/picture_in_picture.mojom b/third_party/blink/public/mojom/picture_in_picture/picture_in_picture.mojom
index 99bd987..8a1d0a5 100644
--- a/third_party/blink/public/mojom/picture_in_picture/picture_in_picture.mojom
+++ b/third_party/blink/public/mojom/picture_in_picture/picture_in_picture.mojom
@@ -4,7 +4,7 @@
module blink.mojom;
-import "services/viz/public/interfaces/compositing/surface_id.mojom";
+import "services/viz/public/mojom/compositing/surface_id.mojom";
import "ui/gfx/geometry/mojom/geometry.mojom";
// PictureInPictureSessionObserver is associated to a PictureInPictureSession at
diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn
index a502582ae..c8d6620 100644
--- a/third_party/blink/renderer/modules/BUILD.gn
+++ b/third_party/blink/renderer/modules/BUILD.gn
@@ -444,7 +444,7 @@
"//media:test_support",
"//net:quic_test_tools",
"//services/device/public/cpp:test_support",
- "//services/viz/public/interfaces:interfaces_blink",
+ "//services/viz/public/mojom:mojom_blink",
"//skia",
"//testing/gmock",
"//testing/gtest",
diff --git a/third_party/blink/renderer/modules/DEPS b/third_party/blink/renderer/modules/DEPS
index c4366b29..01c7bc15 100644
--- a/third_party/blink/renderer/modules/DEPS
+++ b/third_party/blink/renderer/modules/DEPS
@@ -5,7 +5,7 @@
"+mojo/public/cpp/bindings",
"+services/network/public/cpp/shared_url_loader_factory.h",
"+services/service_manager/public/mojom/interface_provider.mojom-blink.h",
- "+services/viz/public/interfaces/hit_test/hit_test_region_list.mojom-blink.h",
+ "+services/viz/public/mojom/hit_test/hit_test_region_list.mojom-blink.h",
"+third_party/blink/public/common",
"+third_party/blink/public/web",
"+third_party/blink/renderer/bindings",
diff --git a/third_party/blink/renderer/modules/canvas/htmlcanvas/html_canvas_element_module_test.cc b/third_party/blink/renderer/modules/canvas/htmlcanvas/html_canvas_element_module_test.cc
index d4392bf..f6f9d78 100644
--- a/third_party/blink/renderer/modules/canvas/htmlcanvas/html_canvas_element_module_test.cc
+++ b/third_party/blink/renderer/modules/canvas/htmlcanvas/html_canvas_element_module_test.cc
@@ -7,7 +7,7 @@
#include <memory>
#include "build/build_config.h"
-#include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom-blink.h"
+#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom-blink.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas/offscreen_canvas_test.cc b/third_party/blink/renderer/modules/canvas/offscreencanvas/offscreen_canvas_test.cc
index 4ee8ea89..f2cb656 100644
--- a/third_party/blink/renderer/modules/canvas/offscreencanvas/offscreen_canvas_test.cc
+++ b/third_party/blink/renderer/modules/canvas/offscreencanvas/offscreen_canvas_test.cc
@@ -4,7 +4,7 @@
#include "third_party/blink/renderer/core/offscreencanvas/offscreen_canvas.h"
-#include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom-blink.h"
+#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom-blink.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/renderer/core/dom/document.h"
diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn
index 00aefd807..eb5e2bf 100644
--- a/third_party/blink/renderer/platform/BUILD.gn
+++ b/third_party/blink/renderer/platform/BUILD.gn
@@ -1820,8 +1820,8 @@
"//mojo/public/cpp/bindings/tests:for_blink_tests",
"//mojo/public/cpp/test_support:test_utils",
"//mojo/public/interfaces/bindings/tests:test_interfaces_blink",
- "//services/viz/public/interfaces",
- "//services/viz/public/interfaces:interfaces_blink",
+ "//services/viz/public/mojom",
+ "//services/viz/public/mojom:mojom_blink",
"//skia",
"//skia:skcms",
"//skia:test_fonts",
@@ -2126,7 +2126,7 @@
deps = [
":test_support",
- "//services/viz/public/interfaces:interfaces_blink",
+ "//services/viz/public/mojom:mojom_blink",
"//testing/gmock",
"//testing/gtest",
]
diff --git a/third_party/blink/renderer/platform/DEPS b/third_party/blink/renderer/platform/DEPS
index 3d5e665..359c31c 100644
--- a/third_party/blink/renderer/platform/DEPS
+++ b/third_party/blink/renderer/platform/DEPS
@@ -57,7 +57,7 @@
"+mozilla",
"+services/metrics/public/cpp/ukm_entry_builder.h",
"+services/metrics/public/cpp/ukm_recorder.h",
- "+services/viz/public/interfaces/compositing/compositor_frame_sink.mojom-blink.h",
+ "+services/viz/public/mojom/compositing/compositor_frame_sink.mojom-blink.h",
"+skia/ext",
#TODO(nverne): remove this
"+third_party/blink/public/web/blink.h",
diff --git a/third_party/blink/renderer/platform/graphics/DEPS b/third_party/blink/renderer/platform/graphics/DEPS
index b9a8d18..55f6849 100644
--- a/third_party/blink/renderer/platform/graphics/DEPS
+++ b/third_party/blink/renderer/platform/graphics/DEPS
@@ -27,7 +27,7 @@
"+media/base/video_frame.h",
"+media/base/video_types.h",
"+media/renderers/video_resource_updater.h",
- "+services/viz/public/interfaces",
+ "+services/viz/public/mojom",
"+services/viz/public/cpp/gpu/context_provider_command_buffer.h",
"+third_party/blink/renderer/platform/cpu/mips/common_macros_msa.h",
"+third_party/blink/renderer/platform/fonts",
diff --git a/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc b/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc
index 1fa8d1d2..77aaf11 100644
--- a/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc
+++ b/third_party/blink/renderer/platform/graphics/begin_frame_provider.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/single_thread_task_runner.h"
-#include "services/viz/public/interfaces/compositing/frame_timing_details.mojom-blink.h"
+#include "services/viz/public/mojom/compositing/frame_timing_details.mojom-blink.h"
#include "third_party/blink/public/platform/interface_provider.h"
#include "third_party/blink/public/platform/platform.h"
#include "third_party/blink/renderer/platform/scheduler/public/thread_scheduler.h"
diff --git a/third_party/blink/renderer/platform/graphics/begin_frame_provider.h b/third_party/blink/renderer/platform/graphics/begin_frame_provider.h
index f424332..e29feeb 100644
--- a/third_party/blink/renderer/platform/graphics/begin_frame_provider.h
+++ b/third_party/blink/renderer/platform/graphics/begin_frame_provider.h
@@ -6,7 +6,7 @@
#define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_BEGIN_FRAME_PROVIDER_H_
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom-blink.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom-blink.h"
#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
#include "third_party/blink/renderer/platform/graphics/begin_frame_provider.h"
#include "third_party/blink/renderer/platform/platform_export.h"
diff --git a/third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher.cc b/third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher.cc
index c07b968d..0a410d9 100644
--- a/third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher.cc
+++ b/third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher.cc
@@ -11,8 +11,8 @@
#include "components/viz/common/quads/texture_draw_quad.h"
#include "components/viz/common/resources/resource_format.h"
#include "components/viz/common/resources/single_release_callback.h"
-#include "services/viz/public/interfaces/compositing/frame_timing_details.mojom-blink.h"
-#include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom-blink.h"
+#include "services/viz/public/mojom/compositing/frame_timing_details.mojom-blink.h"
+#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom-blink.h"
#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
#include "third_party/blink/public/platform/interface_provider.h"
#include "third_party/blink/public/platform/platform.h"
diff --git a/third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher.h b/third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher.h
index 0f49e06..90b3cf0 100644
--- a/third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher.h
+++ b/third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher.h
@@ -11,7 +11,7 @@
#include "components/viz/common/resources/resource_id.h"
#include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom-blink.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom-blink.h"
#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
namespace blink {
diff --git a/third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher_test.cc b/third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher_test.cc
index a1817c1..bee5eb1 100644
--- a/third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher_test.cc
+++ b/third_party/blink/renderer/platform/graphics/canvas_resource_dispatcher_test.cc
@@ -7,7 +7,7 @@
#include <memory>
#include "components/viz/common/quads/texture_draw_quad.h"
-#include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom-blink.h"
+#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom-blink.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
diff --git a/third_party/blink/renderer/platform/graphics/test/mock_compositor_frame_sink.h b/third_party/blink/renderer/platform/graphics/test/mock_compositor_frame_sink.h
index c764ddf..3cca9de 100644
--- a/third_party/blink/renderer/platform/graphics/test/mock_compositor_frame_sink.h
+++ b/third_party/blink/renderer/platform/graphics/test/mock_compositor_frame_sink.h
@@ -8,7 +8,7 @@
#include "base/memory/read_only_shared_memory_region.h"
#include "components/viz/common/quads/compositor_frame.h"
#include "gpu/ipc/common/mailbox.mojom-blink.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom-blink.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom-blink.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
diff --git a/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc b/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
index f7c9228..af4d39fb 100644
--- a/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
+++ b/third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
@@ -14,8 +14,8 @@
#include "media/base/video_frame.h"
#include "media/base/video_types.h"
#include "services/viz/public/cpp/gpu/context_provider_command_buffer.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom-blink.h"
-#include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom-blink.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom-blink.h"
+#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom-blink.h"
#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
#include "third_party/blink/public/platform/interface_provider.h"
#include "third_party/blink/public/platform/platform.h"
diff --git a/third_party/blink/renderer/platform/graphics/video_frame_submitter.h b/third_party/blink/renderer/platform/graphics/video_frame_submitter.h
index 5014b61..be8558a 100644
--- a/third_party/blink/renderer/platform/graphics/video_frame_submitter.h
+++ b/third_party/blink/renderer/platform/graphics/video_frame_submitter.h
@@ -19,8 +19,8 @@
#include "components/viz/common/surfaces/child_local_surface_id_allocator.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/system/buffer.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom-blink.h"
-#include "services/viz/public/interfaces/compositing/frame_timing_details.mojom-blink.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom-blink.h"
+#include "services/viz/public/mojom/compositing/frame_timing_details.mojom-blink.h"
#include "third_party/blink/public/mojom/frame_sinks/embedded_frame_sink.mojom-blink.h"
#include "third_party/blink/public/platform/web_video_frame_submitter.h"
#include "third_party/blink/renderer/platform/graphics/video_frame_resource_provider.h"
diff --git a/third_party/blink/renderer/platform/graphics/video_frame_submitter_test.cc b/third_party/blink/renderer/platform/graphics/video_frame_submitter_test.cc
index 2f2e678..cc6c0f4b 100644
--- a/third_party/blink/renderer/platform/graphics/video_frame_submitter_test.cc
+++ b/third_party/blink/renderer/platform/graphics/video_frame_submitter_test.cc
@@ -20,8 +20,8 @@
#include "components/viz/test/test_context_provider.h"
#include "media/base/video_frame.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom-blink.h"
-#include "services/viz/public/interfaces/hit_test/hit_test_region_list.mojom-blink.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom-blink.h"
+#include "services/viz/public/mojom/hit_test/hit_test_region_list.mojom-blink.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/blink/renderer/platform/graphics/test/mock_compositor_frame_sink.h"
diff --git a/ui/android/BUILD.gn b/ui/android/BUILD.gn
index 1c4ffbd..3ad2e81 100644
--- a/ui/android/BUILD.gn
+++ b/ui/android/BUILD.gn
@@ -72,7 +72,7 @@
"//components/viz/common",
"//components/viz/host",
"//components/viz/service",
- "//services/viz/public/interfaces",
+ "//services/viz/public/mojom",
"//skia",
"//third_party/blink/public:blink_headers",
"//ui/base",
diff --git a/ui/android/DEPS b/ui/android/DEPS
index 25b8b45..7243018 100644
--- a/ui/android/DEPS
+++ b/ui/android/DEPS
@@ -12,7 +12,7 @@
"+components/viz/host",
"+components/viz/service/frame_sinks",
"+components/viz/service/surfaces",
- "+services/viz/public/interfaces",
+ "+services/viz/public/mojom",
"+skia/ext",
"+third_party/blink/public/platform/web_cursor_info.h",
"+third_party/skia",
diff --git a/ui/aura/test/DEPS b/ui/aura/test/DEPS
index 2b3a4d42..91a1a89 100644
--- a/ui/aura/test/DEPS
+++ b/ui/aura/test/DEPS
@@ -2,7 +2,7 @@
"+cc/test",
"+components/viz/test",
"+mojo/core/embedder/embedder.h",
- "+services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h",
+ "+services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h",
"+ui/gl",
"+ui/wm/core/wm_state.h",
]
diff --git a/ui/compositor/host/BUILD.gn b/ui/compositor/host/BUILD.gn
index e84b2c4..bd16f26 100644
--- a/ui/compositor/host/BUILD.gn
+++ b/ui/compositor/host/BUILD.gn
@@ -33,6 +33,6 @@
"//ui/gfx",
]
- public_deps += [ "//services/viz/public/interfaces" ]
+ public_deps += [ "//services/viz/public/mojom" ]
}
}
diff --git a/ui/compositor/host/DEPS b/ui/compositor/host/DEPS
index d34c1d89..7c2cd8d 100644
--- a/ui/compositor/host/DEPS
+++ b/ui/compositor/host/DEPS
@@ -1,6 +1,6 @@
include_rules = [
"+components/viz/client",
"+mojo/public/cpp/bindings",
- "+services/viz/public/interfaces",
+ "+services/viz/public/mojom",
"+services/viz/privileged/interfaces/compositing",
]
diff --git a/ui/compositor/host/host_context_factory_private.cc b/ui/compositor/host/host_context_factory_private.cc
index 1c84de6..bc9906f 100644
--- a/ui/compositor/host/host_context_factory_private.cc
+++ b/ui/compositor/host/host_context_factory_private.cc
@@ -17,7 +17,7 @@
#include "components/viz/host/renderer_settings_creation.h"
#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h"
#include "services/viz/privileged/interfaces/compositing/vsync_parameter_observer.mojom.h"
-#include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h"
+#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
#include "ui/compositor/host/external_begin_frame_controller_client_impl.h"
#include "ui/compositor/reflector.h"
diff --git a/ui/ozone/platform/drm/DEPS b/ui/ozone/platform/drm/DEPS
index 0cf49b437..110e1a7 100644
--- a/ui/ozone/platform/drm/DEPS
+++ b/ui/ozone/platform/drm/DEPS
@@ -1,7 +1,7 @@
include_rules = [
"+mojo/public",
"+services/service_manager",
- "+services/viz/public/interfaces",
+ "+services/viz/public/mojom",
"+ui/base/buildflags.h", # Doesn't bring in all of ui/base.
"+ui/base/ui_base_features.h",
"+ui/base/ui_base_switches.h",