From 975217fb06d0b4368cfad708c0c8b84fccec7c73 Mon Sep 17 00:00:00 2001 From: kylechar Date: Thu, 17 Aug 2017 18:49:58 +0000 Subject: [PATCH] Fix privileged services/viz paths. The README file for services/viz paths is not consistent with where privileged things should go. It uses the following contradictory locations: services/viz/{gl, compositing, hit_test}/privileged/interfaces services/viz/privileged/interfaces/{gl, compositing, hit_test} Offline discussion with servizes/viz/OWNERS concluded we should use the second one. This CL fixes the README to be consistent and fixes paths appropriately. Bug: 722935 Change-Id: I6c63f4d4f1f3c464a456d607419f307912fec593 Reviewed-on: https://chromium-review.googlesource.com/617882 Commit-Queue: kylechar Reviewed-by: Scott Violet Reviewed-by: Sadrul Chowdhury Reviewed-by: Tom Sepez Cr-Commit-Position: refs/heads/master@{#495257} --- components/viz/host/BUILD.gn | 2 +- components/viz/host/DEPS | 3 +-- components/viz/host/host_frame_sink_manager.h | 2 +- .../host/host_frame_sink_manager_unittests.cc | 2 +- .../host/server_gpu_memory_buffer_manager.cc | 2 +- ...rver_gpu_memory_buffer_manager_unittest.cc | 2 +- components/viz/service/BUILD.gn | 2 +- components/viz/service/DEPS | 2 +- components/viz/service/frame_sinks/DEPS | 1 - .../compositor_frame_sink_support_unittest.cc | 2 +- .../frame_sinks/frame_sink_manager_impl.h | 2 +- .../root_compositor_frame_sink_impl.h | 2 +- components/viz/service/gl/DEPS | 1 - components/viz/service/gl/gpu_service_impl.h | 2 +- content/browser/gpu/gpu_ipc_browsertests.cc | 2 +- content/browser/gpu/gpu_process_host.h | 2 +- content/gpu/DEPS | 2 +- content/gpu/gpu_child_thread.cc | 2 +- .../chromium_bindings_configuration.gni | 2 +- services/BUILD.gn | 2 +- services/ui/gpu/DEPS | 2 +- services/ui/gpu/gpu_main.h | 2 +- services/ui/gpu/interfaces/BUILD.gn | 4 ++-- services/ui/gpu/interfaces/gpu_main.mojom | 4 ++-- services/ui/ws/BUILD.gn | 2 +- services/ui/ws/DEPS | 3 +-- .../ws/compositor_frame_sink_client_binding.h | 2 +- .../ui/ws/frame_sink_manager_client_binding.h | 2 +- services/ui/ws/gpu_client.cc | 2 +- services/ui/ws/gpu_host.h | 2 +- services/ui/ws/server_window.h | 2 +- ...ver_window_compositor_frame_sink_manager.h | 2 +- services/ui/ws/test_frame_sink_manager.h | 2 +- services/ui/ws/window_server.h | 2 +- services/viz/README.md | 10 ++++----- services/viz/gl/privileged/interfaces/OWNERS | 2 -- .../privileged/interfaces/BUILD.gn | 22 ++----------------- .../privileged/interfaces/DEPS | 0 .../privileged/interfaces/OWNERS | 0 .../interfaces/compositing/BUILD.gn | 21 ++++++++++++++++++ .../privileged/interfaces/compositing/OWNERS | 6 +++++ .../compositing}/frame_sink_manager.mojom | 2 +- .../compositing}/renderer_settings.mojom | 0 .../compositing}/renderer_settings.typemap | 4 ++-- .../renderer_settings_struct_traits.cc | 2 +- .../renderer_settings_struct_traits.h | 10 ++++----- .../interfaces/compositing}/typemaps.gni | 2 +- .../interfaces/gl}/BUILD.gn | 2 +- services/viz/privileged/interfaces/gl/OWNERS | 6 +++++ .../interfaces/gl}/gpu_service.mojom | 0 .../interfaces/struct_traits_unittest.cc | 2 +- third_party/WebKit/public/BUILD.gn | 1 - 52 files changed, 86 insertions(+), 78 deletions(-) delete mode 100644 services/viz/gl/privileged/interfaces/OWNERS rename services/viz/{compositing => }/privileged/interfaces/BUILD.gn (55%) rename services/viz/{compositing => }/privileged/interfaces/DEPS (100%) rename services/viz/{compositing => }/privileged/interfaces/OWNERS (100%) create mode 100644 services/viz/privileged/interfaces/compositing/BUILD.gn create mode 100644 services/viz/privileged/interfaces/compositing/OWNERS rename services/viz/{compositing/privileged/interfaces => privileged/interfaces/compositing}/frame_sink_manager.mojom (98%) rename services/viz/{compositing/privileged/interfaces => privileged/interfaces/compositing}/renderer_settings.mojom (100%) rename services/viz/{compositing/privileged/interfaces => privileged/interfaces/compositing}/renderer_settings.typemap (72%) rename services/viz/{compositing/privileged/interfaces => privileged/interfaces/compositing}/renderer_settings_struct_traits.cc (95%) rename services/viz/{compositing/privileged/interfaces => privileged/interfaces/compositing}/renderer_settings_struct_traits.h (88%) rename services/viz/{compositing/privileged/interfaces => privileged/interfaces/compositing}/typemaps.gni (74%) rename services/viz/{gl/privileged/interfaces => privileged/interfaces/gl}/BUILD.gn (95%) create mode 100644 services/viz/privileged/interfaces/gl/OWNERS rename services/viz/{gl/privileged/interfaces => privileged/interfaces/gl}/gpu_service.mojom (100%) rename services/viz/{compositing => }/privileged/interfaces/struct_traits_unittest.cc (98%) diff --git a/components/viz/host/BUILD.gn b/components/viz/host/BUILD.gn index be3dc76560c1de..9cdc75be6875a3 100644 --- a/components/viz/host/BUILD.gn +++ b/components/viz/host/BUILD.gn @@ -38,7 +38,7 @@ viz_component("host") { public_deps = [ "//gpu/command_buffer/client", "//gpu/ipc/host", - "//services/viz/compositing/privileged/interfaces", + "//services/viz/privileged/interfaces/compositing", "//services/viz/public/interfaces/hit_test", "//ui/gfx/geometry", ] diff --git a/components/viz/host/DEPS b/components/viz/host/DEPS index 36fe05de4d81cf..e49476dd9406ff 100644 --- a/components/viz/host/DEPS +++ b/components/viz/host/DEPS @@ -8,8 +8,7 @@ include_rules = [ "+gpu/ipc/common", "+gpu/ipc/host", "+mojo/public/cpp", - "+services/viz/compositing/privileged/interfaces", - "+services/viz/gl/privileged", + "+services/viz/privileged/interfaces", "+services/viz/public/interfaces/compositing", "+ui/gfx", ] diff --git a/components/viz/host/host_frame_sink_manager.h b/components/viz/host/host_frame_sink_manager.h index 07881a5c4281a9..e02da871d29134 100644 --- a/components/viz/host/host_frame_sink_manager.h +++ b/components/viz/host/host_frame_sink_manager.h @@ -20,7 +20,7 @@ #include "components/viz/host/viz_host_export.h" #include "components/viz/service/frame_sinks/compositor_frame_sink_support_manager.h" #include "mojo/public/cpp/bindings/binding.h" -#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h" +#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h" namespace base { class SingleThreadTaskRunner; diff --git a/components/viz/host/host_frame_sink_manager_unittests.cc b/components/viz/host/host_frame_sink_manager_unittests.cc index 1571f910062382..0028e8a800e4cb 100644 --- a/components/viz/host/host_frame_sink_manager_unittests.cc +++ b/components/viz/host/host_frame_sink_manager_unittests.cc @@ -14,7 +14,7 @@ #include "components/viz/service/frame_sinks/compositor_frame_sink_support.h" #include "components/viz/service/frame_sinks/frame_sink_manager_impl.h" #include "components/viz/service/surfaces/surface_manager.h" -#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h" +#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/components/viz/host/server_gpu_memory_buffer_manager.cc b/components/viz/host/server_gpu_memory_buffer_manager.cc index e2b2079e18d6e3..c90add6b40ed28 100644 --- a/components/viz/host/server_gpu_memory_buffer_manager.cc +++ b/components/viz/host/server_gpu_memory_buffer_manager.cc @@ -12,7 +12,7 @@ #include "gpu/ipc/client/gpu_memory_buffer_impl.h" #include "gpu/ipc/client/gpu_memory_buffer_impl_shared_memory.h" #include "gpu/ipc/common/gpu_memory_buffer_support.h" -#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h" +#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h" #include "ui/gfx/buffer_format_util.h" namespace viz { diff --git a/components/viz/host/server_gpu_memory_buffer_manager_unittest.cc b/components/viz/host/server_gpu_memory_buffer_manager_unittest.cc index 5960a69fcfe2ac..f3e03590d06721 100644 --- a/components/viz/host/server_gpu_memory_buffer_manager_unittest.cc +++ b/components/viz/host/server_gpu_memory_buffer_manager_unittest.cc @@ -7,7 +7,7 @@ #include "base/run_loop.h" #include "base/threading/thread.h" #include "gpu/ipc/host/gpu_memory_buffer_support.h" -#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h" +#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/client_native_pixmap_factory.h" diff --git a/components/viz/service/BUILD.gn b/components/viz/service/BUILD.gn index 5dc37aa57a91f2..d4bc284a0a76f3 100644 --- a/components/viz/service/BUILD.gn +++ b/components/viz/service/BUILD.gn @@ -125,7 +125,7 @@ viz_component("service") { "//cc/ipc:interfaces", "//gpu/command_buffer/client:gles2_interface", "//gpu/ipc:command_buffer", - "//services/viz/compositing/privileged/interfaces", + "//services/viz/privileged/interfaces/compositing", "//services/viz/public/interfaces/compositing", "//services/viz/public/interfaces/hit_test", "//ui/gfx", diff --git a/components/viz/service/DEPS b/components/viz/service/DEPS index d840a1135a8e7f..d8bcc72e109ff3 100644 --- a/components/viz/service/DEPS +++ b/components/viz/service/DEPS @@ -2,6 +2,7 @@ include_rules = [ "+cc", "-components/viz/common/switches.h", "+components/viz/service", + "+services/viz/privileged/interfaces", "+services/viz/public/interfaces", "+third_party/skia", "+ui/gfx", @@ -12,6 +13,5 @@ include_rules = [ specific_include_rules = { ".*_unittest\.cc": [ "+components/viz/test", - "+services/compositing/privileged/interfaces", ] } diff --git a/components/viz/service/frame_sinks/DEPS b/components/viz/service/frame_sinks/DEPS index d878155c7366af..7b7b9b0af3808d 100644 --- a/components/viz/service/frame_sinks/DEPS +++ b/components/viz/service/frame_sinks/DEPS @@ -5,5 +5,4 @@ include_rules = [ "+components/viz/service/surfaces", "+gpu/ipc/common", "+mojo/public/cpp/bindings", - "+services/viz/compositing/privileged/interfaces", ] 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 1c683328abb809..7b9f8cf17da65d 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 @@ -19,7 +19,7 @@ #include "components/viz/test/fake_external_begin_frame_source.h" #include "components/viz/test/fake_surface_observer.h" #include "components/viz/test/mock_compositor_frame_sink_support_client.h" -#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h" +#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" 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 7c5a314913511f..de1e2fb8e12343 100644 --- a/components/viz/service/frame_sinks/frame_sink_manager_impl.h +++ b/components/viz/service/frame_sinks/frame_sink_manager_impl.h @@ -21,7 +21,7 @@ #include "components/viz/service/viz_service_export.h" #include "gpu/ipc/common/surface_handle.h" #include "mojo/public/cpp/bindings/binding.h" -#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h" +#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h" namespace cc { 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 13f3a3f11f3d33..14c8ebb4eb4b3e 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 @@ -15,7 +15,7 @@ #include "components/viz/service/hit_test/hit_test_aggregator_delegate.h" #include "mojo/public/cpp/bindings/associated_binding.h" #include "mojo/public/cpp/bindings/binding.h" -#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h" +#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h" #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h" namespace viz { diff --git a/components/viz/service/gl/DEPS b/components/viz/service/gl/DEPS index 39bc345a3f5dab..22ddce6eb8b8ab 100644 --- a/components/viz/service/gl/DEPS +++ b/components/viz/service/gl/DEPS @@ -9,7 +9,6 @@ include_rules = [ "+media/mojo", "+mojo/public/cpp", "+services/ui/gpu/interfaces", - "+services/viz/gl/privileged/interfaces", "+ui/gl", ] diff --git a/components/viz/service/gl/gpu_service_impl.h b/components/viz/service/gl/gpu_service_impl.h index bd537e54d5acf3..9dd03c38c0730b 100644 --- a/components/viz/service/gl/gpu_service_impl.h +++ b/components/viz/service/gl/gpu_service_impl.h @@ -25,7 +25,7 @@ #include "gpu/ipc/service/x_util.h" #include "mojo/public/cpp/bindings/binding_set.h" #include "services/ui/gpu/interfaces/gpu_host.mojom.h" -#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h" +#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h" #include "ui/gfx/native_widget_types.h" namespace gpu { diff --git a/content/browser/gpu/gpu_ipc_browsertests.cc b/content/browser/gpu/gpu_ipc_browsertests.cc index 2a72b251d8dfc2..afdc687046a454 100644 --- a/content/browser/gpu/gpu_ipc_browsertests.cc +++ b/content/browser/gpu/gpu_ipc_browsertests.cc @@ -16,7 +16,7 @@ #include "content/public/test/content_browser_test.h" #include "gpu/ipc/client/gpu_channel_host.h" #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h" -#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h" +#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkPaint.h" #include "third_party/skia/include/core/SkSurface.h" diff --git a/content/browser/gpu/gpu_process_host.h b/content/browser/gpu/gpu_process_host.h index cc72511aebbf52..c9d096fdf2a618 100644 --- a/content/browser/gpu/gpu_process_host.h +++ b/content/browser/gpu/gpu_process_host.h @@ -33,7 +33,7 @@ #include "mojo/public/cpp/bindings/binding.h" #include "services/ui/gpu/interfaces/gpu_host.mojom.h" #include "services/ui/gpu/interfaces/gpu_main.mojom.h" -#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h" +#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" #include "url/gurl.h" diff --git a/content/gpu/DEPS b/content/gpu/DEPS index 577e3b4fe1886f..11a913643f548a 100644 --- a/content/gpu/DEPS +++ b/content/gpu/DEPS @@ -9,7 +9,7 @@ include_rules = [ "+services/shape_detection", "+services/ui/common", "+services/ui/gpu", - "+services/viz/gl/privileged/interfaces", + "+services/viz/privileged/interfaces/gl", "+sandbox", "+skia", ] diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc index 3a729977d7ade1..dad6fc52eeba2c 100644 --- a/content/gpu/gpu_child_thread.cc +++ b/content/gpu/gpu_child_thread.cc @@ -29,7 +29,7 @@ #include "media/gpu/ipc/service/media_gpu_channel_manager.h" #include "services/service_manager/public/cpp/binder_registry.h" #include "services/service_manager/public/cpp/connector.h" -#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h" +#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h" #if defined(USE_OZONE) #include "ui/ozone/public/ozone_platform.h" diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni index 7072eaa76b434d..0632a62423c69f 100644 --- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni +++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni @@ -35,7 +35,7 @@ _typemap_imports = [ "//services/ui/gpu/interfaces/typemaps.gni", "//services/ui/public/interfaces/cursor/typemaps.gni", "//services/ui/public/interfaces/ime/typemaps.gni", - "//services/viz/compositing/privileged/interfaces/typemaps.gni", + "//services/viz/privileged/interfaces/compositing/typemaps.gni", "//services/viz/public/cpp/compositing/typemaps.gni", "//skia/public/interfaces/typemaps.gni", "//third_party/WebKit/public/public_typemaps.gni", diff --git a/services/BUILD.gn b/services/BUILD.gn index 464434e5ef2c98..dfc2c95d50458c 100644 --- a/services/BUILD.gn +++ b/services/BUILD.gn @@ -28,7 +28,7 @@ service_test("services_unittests") { "//services/preferences:tests", "//services/resource_coordinator:tests", "//services/shape_detection:tests", - "//services/viz/compositing/privileged/interfaces:tests", + "//services/viz/privileged/interfaces:unit_tests", "//services/viz/public/cpp/compositing:tests", ] } diff --git a/services/ui/gpu/DEPS b/services/ui/gpu/DEPS index bdc45e7a833375..386f78c7748871 100644 --- a/services/ui/gpu/DEPS +++ b/services/ui/gpu/DEPS @@ -6,7 +6,7 @@ include_rules = [ "+gpu/ipc/common", "+gpu/ipc/service", "-services/ui/common", - "+services/viz/gl/privileged/interfaces", + "+services/viz/privileged/interfaces/gl", ] specific_include_rules = { diff --git a/services/ui/gpu/gpu_main.h b/services/ui/gpu/gpu_main.h index 177ad6be53313c..2e5bc80b5ae9d0 100644 --- a/services/ui/gpu/gpu_main.h +++ b/services/ui/gpu/gpu_main.h @@ -11,7 +11,7 @@ #include "gpu/ipc/service/gpu_init.h" #include "mojo/public/cpp/bindings/binding.h" #include "services/ui/gpu/interfaces/gpu_main.mojom.h" -#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h" +#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h" namespace gpu { class GpuMemoryBufferFactory; diff --git a/services/ui/gpu/interfaces/BUILD.gn b/services/ui/gpu/interfaces/BUILD.gn index ee46c6236a4384..d846084f642064 100644 --- a/services/ui/gpu/interfaces/BUILD.gn +++ b/services/ui/gpu/interfaces/BUILD.gn @@ -17,8 +17,8 @@ mojom("interfaces") { "//media/gpu/mojo:jpeg_decoder", "//media/mojo/interfaces", "//services/ui/public/interfaces", - "//services/viz/compositing/privileged/interfaces", - "//services/viz/gl/privileged/interfaces", + "//services/viz/privileged/interfaces/compositing", + "//services/viz/privileged/interfaces/gl", "//ui/gfx/geometry/mojo", "//ui/gfx/mojo", "//url/mojo:url_mojom_gurl", diff --git a/services/ui/gpu/interfaces/gpu_main.mojom b/services/ui/gpu/interfaces/gpu_main.mojom index 080c9aad274757..ed3f5d159a6d5b 100644 --- a/services/ui/gpu/interfaces/gpu_main.mojom +++ b/services/ui/gpu/interfaces/gpu_main.mojom @@ -6,8 +6,8 @@ module ui.mojom; import "gpu/ipc/common/gpu_preferences.mojom"; import "services/ui/gpu/interfaces/gpu_host.mojom"; -import "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom"; -import "services/viz/gl/privileged/interfaces/gpu_service.mojom"; +import "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom"; +import "services/viz/privileged/interfaces/gl/gpu_service.mojom"; // This is the primordial interface used to (re)start the mus-gpu bundle // of services. diff --git a/services/ui/ws/BUILD.gn b/services/ui/ws/BUILD.gn index 60ccaffccd7a20..4e65e18a5f027f 100644 --- a/services/ui/ws/BUILD.gn +++ b/services/ui/ws/BUILD.gn @@ -146,7 +146,7 @@ static_library("lib") { "//services/ui/common:mus_common", "//services/ui/display", "//services/ui/public/interfaces", - "//services/viz/compositing/privileged/interfaces", + "//services/viz/privileged/interfaces/compositing", "//ui/base", "//ui/display", "//ui/events", diff --git a/services/ui/ws/DEPS b/services/ui/ws/DEPS index 25a594d14b6800..4e891fd8b34ca6 100644 --- a/services/ui/ws/DEPS +++ b/services/ui/ws/DEPS @@ -7,8 +7,7 @@ include_rules = [ "+gpu/ipc/common", "+services/ui/gpu/interfaces", "-services/ui/surfaces", - "+services/viz/compositing/privileged/interfaces", - "+services/viz/gl/privileged/interfaces", + "+services/viz/privileged/interfaces", "+services/viz/public/interfaces/compositing", ] diff --git a/services/ui/ws/compositor_frame_sink_client_binding.h b/services/ui/ws/compositor_frame_sink_client_binding.h index 40d05c0980ca4b..4291d574ede2d0 100644 --- a/services/ui/ws/compositor_frame_sink_client_binding.h +++ b/services/ui/ws/compositor_frame_sink_client_binding.h @@ -8,7 +8,7 @@ #include "base/macros.h" #include "components/viz/common/surfaces/local_surface_id_allocator.h" #include "mojo/public/cpp/bindings/binding.h" -#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h" +#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h" #include "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom.h" namespace ui { diff --git a/services/ui/ws/frame_sink_manager_client_binding.h b/services/ui/ws/frame_sink_manager_client_binding.h index e089a03565d1c2..1a896f2c895bbe 100644 --- a/services/ui/ws/frame_sink_manager_client_binding.h +++ b/services/ui/ws/frame_sink_manager_client_binding.h @@ -7,7 +7,7 @@ #include "base/macros.h" #include "mojo/public/cpp/bindings/binding.h" -#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h" +#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h" namespace ui { namespace ws { diff --git a/services/ui/ws/gpu_client.cc b/services/ui/ws/gpu_client.cc index 2ab4e1c0ac9598..162cbf119b1351 100644 --- a/services/ui/ws/gpu_client.cc +++ b/services/ui/ws/gpu_client.cc @@ -5,7 +5,7 @@ #include "services/ui/ws/gpu_client.h" #include "components/viz/host/server_gpu_memory_buffer_manager.h" -#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h" +#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h" namespace { diff --git a/services/ui/ws/gpu_host.h b/services/ui/ws/gpu_host.h index 13cdc3fdfd4bc5..31e9a390ef0411 100644 --- a/services/ui/ws/gpu_host.h +++ b/services/ui/ws/gpu_host.h @@ -16,7 +16,7 @@ #include "services/ui/gpu/gpu_main.h" #include "services/ui/gpu/interfaces/gpu_host.mojom.h" #include "services/ui/public/interfaces/gpu.mojom.h" -#include "services/viz/gl/privileged/interfaces/gpu_service.mojom.h" +#include "services/viz/privileged/interfaces/gl/gpu_service.mojom.h" namespace viz { class ServerGpuMemoryBufferManager; diff --git a/services/ui/ws/server_window.h b/services/ui/ws/server_window.h index 6163044f1cc8a7..fa492c3c988ca3 100644 --- a/services/ui/ws/server_window.h +++ b/services/ui/ws/server_window.h @@ -18,7 +18,7 @@ #include "services/ui/public/interfaces/window_manager_constants.mojom.h" #include "services/ui/public/interfaces/window_tree.mojom.h" #include "services/ui/ws/ids.h" -#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.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 "ui/base/window_tracker_template.h" #include "ui/gfx/geometry/insets.h" diff --git a/services/ui/ws/server_window_compositor_frame_sink_manager.h b/services/ui/ws/server_window_compositor_frame_sink_manager.h index 7256b1bb0fc308..fd3301888e4db1 100644 --- a/services/ui/ws/server_window_compositor_frame_sink_manager.h +++ b/services/ui/ws/server_window_compositor_frame_sink_manager.h @@ -10,7 +10,7 @@ #include "components/viz/common/surfaces/surface_id.h" #include "mojo/public/cpp/bindings/binding.h" #include "services/ui/public/interfaces/window_tree.mojom.h" -#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h" +#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h" #include "services/viz/public/interfaces/compositing/compositor_frame.mojom.h" namespace ui { diff --git a/services/ui/ws/test_frame_sink_manager.h b/services/ui/ws/test_frame_sink_manager.h index 63ee5a0b8c9a59..9da670c5af5094 100644 --- a/services/ui/ws/test_frame_sink_manager.h +++ b/services/ui/ws/test_frame_sink_manager.h @@ -6,7 +6,7 @@ #define SERVICES_UI_WS_TEST_FRAME_SINK_MANAGER_H_ #include "base/macros.h" -#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h" +#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h" namespace ui { namespace ws { diff --git a/services/ui/ws/window_server.h b/services/ui/ws/window_server.h index 20e2b46fd1e8f8..dcea8137412d8a 100644 --- a/services/ui/ws/window_server.h +++ b/services/ui/ws/window_server.h @@ -28,7 +28,7 @@ #include "services/ui/ws/user_id_tracker.h" #include "services/ui/ws/user_id_tracker_observer.h" #include "services/ui/ws/window_manager_window_tree_factory_set.h" -#include "services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom.h" +#include "services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom.h" namespace ui { namespace ws { diff --git a/services/viz/README.md b/services/viz/README.md index 9113dd162c1094..087ad1cc15275b 100644 --- a/services/viz/README.md +++ b/services/viz/README.md @@ -60,7 +60,7 @@ there are StructTraits with the interfaces that produce/consume data_types for mojo transport. ``` -//services/viz/{compositing, gl, hit_test, media}/private/interfaces +//services/viz/private/interfaces/{compositing, gl, hit_test, media} ``` These interfaces directories contain mojoms that may only be used by going @@ -72,8 +72,8 @@ directories must not. There is no private client library, as these are meant for consumption by the public client library. ``` -//services/viz/{compositing, gl, hit_test, media}/privileged/interfaces -//services/viz/{compositing, gl, hit_test, media}/privileged/ +//services/viz/privileged/interfaces/{compositing, gl, hit_test, media} +//services/viz/privileged//{compositing, gl, hit_test, media} ``` The interfaces directories contains mojoms that may only be used by the @@ -88,7 +88,7 @@ window server serves as the privileged client to Viz. ``` This is the glue code that implements the primordial VizMain interface (in -`//services/viz/main/privileged/interfaces`) that starts up the Viz process +`//services/viz/privileged/interfaces/main`) that starts up the Viz process through the service manager. VizMain is a factory interface that enables the privileged client to instantiate the Viz subservices: compositing, gl, hit_test, and media. @@ -115,7 +115,7 @@ Once the content module has been removed (or no longer depends on appropriate destinations in `//services/viz/public//...`. `//components/viz/service` will move to the appropriate service directories in `//services/viz/...`. `//components/viz/host` will move to -`//services/viz/{compositing, gl, hit_test, media}/privileged`. +`//services/viz/privileged//{compositing, gl, hit_test, media}`. Once the content module is gone, and `//services/ui` is the only privileged client, then perhaps the privileged client library may move to `//services/ui`. diff --git a/services/viz/gl/privileged/interfaces/OWNERS b/services/viz/gl/privileged/interfaces/OWNERS deleted file mode 100644 index 08850f421205f8..00000000000000 --- a/services/viz/gl/privileged/interfaces/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -per-file *.mojom=set noparent -per-file *.mojom=file://ipc/SECURITY_OWNERS diff --git a/services/viz/compositing/privileged/interfaces/BUILD.gn b/services/viz/privileged/interfaces/BUILD.gn similarity index 55% rename from services/viz/compositing/privileged/interfaces/BUILD.gn rename to services/viz/privileged/interfaces/BUILD.gn index 57bfcff3e4d86a..82ea746f5f5a79 100644 --- a/services/viz/compositing/privileged/interfaces/BUILD.gn +++ b/services/viz/privileged/interfaces/BUILD.gn @@ -2,25 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//mojo/public/tools/bindings/mojom.gni") - -mojom("interfaces") { - sources = [ - "frame_sink_manager.mojom", - "renderer_settings.mojom", - ] - - public_deps = [ - "//cc/ipc:interfaces", - "//gpu/ipc/common:interfaces", - "//mojo/common:common_custom_types", - "//services/viz/public/interfaces/compositing", - "//ui/gfx/geometry/mojo", - "//ui/gfx/mojo", - ] -} - -source_set("tests") { +source_set("unit_tests") { testonly = true sources = [ @@ -28,12 +10,12 @@ source_set("tests") { ] deps = [ - ":interfaces", "//base/test:test_support", "//components/viz/common:common", "//media/capture/mojo:capture_types", "//services/service_manager/public/cpp", "//services/service_manager/public/cpp:service_test_support", + "//services/viz/privileged/interfaces/compositing", "//testing/gtest", "//ui/gfx:test_support", ] diff --git a/services/viz/compositing/privileged/interfaces/DEPS b/services/viz/privileged/interfaces/DEPS similarity index 100% rename from services/viz/compositing/privileged/interfaces/DEPS rename to services/viz/privileged/interfaces/DEPS diff --git a/services/viz/compositing/privileged/interfaces/OWNERS b/services/viz/privileged/interfaces/OWNERS similarity index 100% rename from services/viz/compositing/privileged/interfaces/OWNERS rename to services/viz/privileged/interfaces/OWNERS diff --git a/services/viz/privileged/interfaces/compositing/BUILD.gn b/services/viz/privileged/interfaces/compositing/BUILD.gn new file mode 100644 index 00000000000000..4e1f8bcc015581 --- /dev/null +++ b/services/viz/privileged/interfaces/compositing/BUILD.gn @@ -0,0 +1,21 @@ +# Copyright 2017 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//mojo/public/tools/bindings/mojom.gni") + +mojom("compositing") { + sources = [ + "frame_sink_manager.mojom", + "renderer_settings.mojom", + ] + + public_deps = [ + "//cc/ipc:interfaces", + "//gpu/ipc/common:interfaces", + "//mojo/common:common_custom_types", + "//services/viz/public/interfaces/compositing", + "//ui/gfx/geometry/mojo", + "//ui/gfx/mojo", + ] +} diff --git a/services/viz/privileged/interfaces/compositing/OWNERS b/services/viz/privileged/interfaces/compositing/OWNERS new file mode 100644 index 00000000000000..2c44a463856dd1 --- /dev/null +++ b/services/viz/privileged/interfaces/compositing/OWNERS @@ -0,0 +1,6 @@ +per-file *.mojom=set noparent +per-file *.mojom=file://ipc/SECURITY_OWNERS +per-file *_struct_traits*.*=set noparent +per-file *_struct_traits*.*=file://ipc/SECURITY_OWNERS +per-file *.typemap=set noparent +per-file *.typemap=file://ipc/SECURITY_OWNERS diff --git a/services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom b/services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom similarity index 98% rename from services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom rename to services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom index 8cb3e73f260fbd..6baf5a0b08f9cb 100644 --- a/services/viz/compositing/privileged/interfaces/frame_sink_manager.mojom +++ b/services/viz/privileged/interfaces/compositing/frame_sink_manager.mojom @@ -13,7 +13,7 @@ import "services/viz/public/interfaces/compositing/compositor_frame_sink.mojom"; import "services/viz/public/interfaces/compositing/surface_info.mojom"; import "ui/gfx/geometry/mojo/geometry.mojom"; import "ui/gfx/mojo/color_space.mojom"; -import "services/viz/compositing/privileged/interfaces/renderer_settings.mojom"; +import "services/viz/privileged/interfaces/compositing/renderer_settings.mojom"; // See ui/compositor/compositor.h: ContextFactoryPrivate. // The DisplayPrivate is used by privileged clients to talk to Display. diff --git a/services/viz/compositing/privileged/interfaces/renderer_settings.mojom b/services/viz/privileged/interfaces/compositing/renderer_settings.mojom similarity index 100% rename from services/viz/compositing/privileged/interfaces/renderer_settings.mojom rename to services/viz/privileged/interfaces/compositing/renderer_settings.mojom diff --git a/services/viz/compositing/privileged/interfaces/renderer_settings.typemap b/services/viz/privileged/interfaces/compositing/renderer_settings.typemap similarity index 72% rename from services/viz/compositing/privileged/interfaces/renderer_settings.typemap rename to services/viz/privileged/interfaces/compositing/renderer_settings.typemap index 0d19d3a3aed19d..2d5796fdb002ad 100644 --- a/services/viz/compositing/privileged/interfaces/renderer_settings.typemap +++ b/services/viz/privileged/interfaces/compositing/renderer_settings.typemap @@ -3,9 +3,9 @@ # found in the LICENSE file. mojom = - "//services/viz/compositing/privileged/interfaces/renderer_settings.mojom" + "//services/viz/privileged/interfaces/compositing/renderer_settings.mojom" public_headers = [ "//components/viz/common/display/renderer_settings.h" ] -traits_headers = [ "//services/viz/compositing/privileged/interfaces/renderer_settings_struct_traits.h" ] +traits_headers = [ "//services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.h" ] deps = [ "//cc", "//mojo/common:struct_traits", diff --git a/services/viz/compositing/privileged/interfaces/renderer_settings_struct_traits.cc b/services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.cc similarity index 95% rename from services/viz/compositing/privileged/interfaces/renderer_settings_struct_traits.cc rename to services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.cc index dcf093e583df5f..3a0538e5efb4f3 100644 --- a/services/viz/compositing/privileged/interfaces/renderer_settings_struct_traits.cc +++ b/services/viz/privileged/interfaces/compositing/renderer_settings_struct_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/compositing/privileged/interfaces/renderer_settings_struct_traits.h" +#include "services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.h" #include "services/viz/public/cpp/compositing/resource_settings_struct_traits.h" namespace mojo { diff --git a/services/viz/compositing/privileged/interfaces/renderer_settings_struct_traits.h b/services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.h similarity index 88% rename from services/viz/compositing/privileged/interfaces/renderer_settings_struct_traits.h rename to services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.h index 2f79631627f6b9..807050d6dbbea6 100644 --- a/services/viz/compositing/privileged/interfaces/renderer_settings_struct_traits.h +++ b/services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.h @@ -1,12 +1,12 @@ // Copyright 2017 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef SERVICES_VIZ_COMPOSITING_PRIVILEGED_INTERFACES_RENDERER_SETTINGS_STRUCT_TRAITS_H_ -#define SERVICES_VIZ_COMPOSITING_PRIVILEGED_INTERFACES_RENDERER_SETTINGS_STRUCT_TRAITS_H_ +#ifndef SERVICES_VIZ_PRIVILEGED_INTERFACES_COMPOSITING_RENDERER_SETTINGS_STRUCT_TRAITS_H_ +#define SERVICES_VIZ_PRIVILEGED_INTERFACES_COMPOSITING_RENDERER_SETTINGS_STRUCT_TRAITS_H_ #include "components/viz/common/display/renderer_settings.h" -#include "services/viz/compositing/privileged/interfaces/renderer_settings.mojom.h" -#include "services/viz/compositing/privileged/interfaces/renderer_settings_struct_traits.h" +#include "services/viz/privileged/interfaces/compositing/renderer_settings.mojom.h" +#include "services/viz/privileged/interfaces/compositing/renderer_settings_struct_traits.h" namespace mojo { template <> @@ -76,4 +76,4 @@ struct StructTraits