diff --git a/ash/mus/BUILD.gn b/ash/mus/BUILD.gn index da25a6e595f84e..92459bf7a260a0 100644 --- a/ash/mus/BUILD.gn +++ b/ash/mus/BUILD.gn @@ -42,7 +42,6 @@ source_set("lib") { "//mash/shelf/public/interfaces", "//mash/wm/public/interfaces", "//mojo/common:common_base", - "//mojo/converters/geometry", "//mojo/converters/input_events", "//services/catalog/public/cpp", "//services/shell/public/cpp", @@ -55,6 +54,7 @@ source_set("lib") { "//ui/events/devices", "//ui/gfx", "//ui/gfx/geometry", + "//ui/gfx/geometry/mojo", "//ui/keyboard:mojom", "//ui/message_center", "//ui/platform_window/stub", diff --git a/components/bitmap_uploader/bitmap_uploader.cc b/components/bitmap_uploader/bitmap_uploader.cc index 5c255dbf2f8a2b..5d4a836abf4c21 100644 --- a/components/bitmap_uploader/bitmap_uploader.cc +++ b/components/bitmap_uploader/bitmap_uploader.cc @@ -12,10 +12,10 @@ #include "components/mus/public/cpp/gles2_context.h" #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_surface.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" #include "mojo/converters/surfaces/surfaces_utils.h" #include "services/shell/public/cpp/connector.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace bitmap_uploader { namespace { diff --git a/components/mus/gles2/BUILD.gn b/components/mus/gles2/BUILD.gn index c6096c4f10d81b..c7d01652af4941 100644 --- a/components/mus/gles2/BUILD.gn +++ b/components/mus/gles2/BUILD.gn @@ -45,14 +45,14 @@ source_set("gles2") { "//gpu/command_buffer/common:gles2_utils", "//gpu/command_buffer/service", "//gpu/config:config", - "//mojo/converters/geometry", "//mojo/public/cpp/bindings", "//mojo/public/cpp/system", "//ui/gfx", "//ui/gfx/geometry", + "//ui/gfx/geometry/mojo", + "//ui/gfx/geometry/mojo:interfaces", "//ui/gl", "//ui/gl/init", - "//ui/mojo/geometry:interfaces", ] if (use_ozone) { diff --git a/components/mus/gles2/command_buffer_driver.cc b/components/mus/gles2/command_buffer_driver.cc index a8d178293f1475..ec8bf835ffd09d 100644 --- a/components/mus/gles2/command_buffer_driver.cc +++ b/components/mus/gles2/command_buffer_driver.cc @@ -25,9 +25,9 @@ #include "gpu/command_buffer/service/query_manager.h" #include "gpu/command_buffer/service/sync_point_manager.h" #include "gpu/command_buffer/service/transfer_buffer_manager.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/public/cpp/system/platform_handle.h" #include "ui/gfx/buffer_format_util.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gfx/gpu_memory_buffer.h" #include "ui/gfx/vsync_provider.h" #include "ui/gl/gl_context.h" diff --git a/components/mus/gles2/command_buffer_driver.h b/components/mus/gles2/command_buffer_driver.h index 4e54ba10271c5c..265704b31c35d4 100644 --- a/components/mus/gles2/command_buffer_driver.h +++ b/components/mus/gles2/command_buffer_driver.h @@ -22,10 +22,10 @@ #include "mojo/public/cpp/bindings/array.h" #include "mojo/public/cpp/system/buffer.h" #include "ui/gfx/buffer_types.h" +#include "ui/gfx/geometry/mojo/geometry.mojom.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/native_widget_types.h" #include "ui/gfx/swap_result.h" -#include "ui/mojo/geometry/geometry.mojom.h" namespace gfx { class GLContext; diff --git a/components/mus/gles2/gpu_impl.h b/components/mus/gles2/gpu_impl.h index c46b2a968d7ce9..73fb66ed27aeb5 100644 --- a/components/mus/gles2/gpu_impl.h +++ b/components/mus/gles2/gpu_impl.h @@ -13,7 +13,7 @@ #include "components/mus/public/interfaces/gpu.mojom.h" #include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/public/cpp/bindings/strong_binding.h" -#include "ui/mojo/geometry/geometry.mojom.h" +#include "ui/gfx/geometry/mojo/geometry.mojom.h" namespace mus { diff --git a/components/mus/public/cpp/BUILD.gn b/components/mus/public/cpp/BUILD.gn index f785a6feecb806..497f23537f77e1 100644 --- a/components/mus/public/cpp/BUILD.gn +++ b/components/mus/public/cpp/BUILD.gn @@ -57,7 +57,6 @@ source_set("cpp") { "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/client:gles2_interface", "//gpu/command_buffer/common", - "//mojo/converters/geometry", "//mojo/converters/input_events", "//mojo/converters/surfaces", "//mojo/public/cpp/bindings:bindings", @@ -66,7 +65,8 @@ source_set("cpp") { "//services/shell/public/interfaces", "//ui/events", "//ui/gfx/geometry", - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo", + "//ui/gfx/geometry/mojo:interfaces", ] data_deps = [ diff --git a/components/mus/public/cpp/lib/window_tree_client_impl.cc b/components/mus/public/cpp/lib/window_tree_client_impl.cc index 38485f329fe5f6..181b414195b6bd 100644 --- a/components/mus/public/cpp/lib/window_tree_client_impl.cc +++ b/components/mus/public/cpp/lib/window_tree_client_impl.cc @@ -22,11 +22,11 @@ #include "components/mus/public/cpp/window_tree_connection.h" #include "components/mus/public/cpp/window_tree_connection_observer.h" #include "components/mus/public/cpp/window_tree_delegate.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/input_events/input_events_type_converters.h" #include "services/shell/public/cpp/connector.h" #include "ui/events/event.h" #include "ui/gfx/geometry/insets.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gfx/geometry/size.h" namespace mus { diff --git a/components/mus/public/cpp/tests/BUILD.gn b/components/mus/public/cpp/tests/BUILD.gn index b5939b7f07299a..c33c82322143bf 100644 --- a/components/mus/public/cpp/tests/BUILD.gn +++ b/components/mus/public/cpp/tests/BUILD.gn @@ -21,8 +21,8 @@ source_set("unittest_support") { deps = [ "//base", "//components/mus/public/cpp", - "//mojo/converters/geometry", "//testing/gtest", + "//ui/gfx/geometry/mojo", ] } @@ -65,7 +65,6 @@ test("mus_public_unittests") { "//components/mus/common:mus_common", "//components/mus/public/cpp", "//mojo/common:common_base", - "//mojo/converters/geometry", "//mojo/converters/input_events", "//mojo/edk/system", "//mojo/public/cpp/system", @@ -74,7 +73,8 @@ test("mus_public_unittests") { "//ui/events", "//ui/gfx:test_support", "//ui/gfx/geometry", - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo", + "//ui/gfx/geometry/mojo:interfaces", ] if (use_x11) { diff --git a/components/mus/public/cpp/tests/window_tree_client_impl_private.cc b/components/mus/public/cpp/tests/window_tree_client_impl_private.cc index 28f6b0ff101afe..69744fc13bd4a1 100644 --- a/components/mus/public/cpp/tests/window_tree_client_impl_private.cc +++ b/components/mus/public/cpp/tests/window_tree_client_impl_private.cc @@ -6,8 +6,8 @@ #include "components/mus/public/cpp/lib/window_tree_client_impl.h" #include "components/mus/public/cpp/window.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/input_events/input_events_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace mus { diff --git a/components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc b/components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc index fe375f0d93ae6e..4ac66c309f141f 100644 --- a/components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc +++ b/components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc @@ -21,11 +21,11 @@ #include "components/mus/public/cpp/window_tracker.h" #include "components/mus/public/cpp/window_tree_delegate.h" #include "mojo/common/common_type_converters.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/input_events/input_events_type_converters.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gfx/geometry/rect.h" namespace mus { diff --git a/components/mus/public/interfaces/BUILD.gn b/components/mus/public/interfaces/BUILD.gn index 7b2b955624616d..556ea864f6a5e3 100644 --- a/components/mus/public/interfaces/BUILD.gn +++ b/components/mus/public/interfaces/BUILD.gn @@ -39,7 +39,7 @@ mojom("interfaces") { deps = [ "//gpu/ipc/common:interfaces", - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo:interfaces", "//ui/mojo/ime:interfaces", ] } diff --git a/components/mus/public/interfaces/command_buffer.mojom b/components/mus/public/interfaces/command_buffer.mojom index f8c3899bab8c20..dcf1ca67e000f0 100644 --- a/components/mus/public/interfaces/command_buffer.mojom +++ b/components/mus/public/interfaces/command_buffer.mojom @@ -8,7 +8,7 @@ import "gpu/ipc/common/capabilities.mojom"; import "gpu/ipc/common/command_buffer.mojom"; import "gpu/ipc/common/mailbox.mojom"; import "gpu/ipc/common/sync_token.mojom"; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; struct CommandBufferInitializeResult { int32 command_buffer_namespace; diff --git a/components/mus/public/interfaces/compositor_frame.mojom b/components/mus/public/interfaces/compositor_frame.mojom index 014145bed64a43..0779b3a6826298 100644 --- a/components/mus/public/interfaces/compositor_frame.mojom +++ b/components/mus/public/interfaces/compositor_frame.mojom @@ -5,7 +5,7 @@ module mus.mojom; import "components/mus/public/interfaces/quads.mojom"; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; import "gpu/ipc/common/mailbox_holder.mojom"; import "gpu/ipc/common/sync_token.mojom"; diff --git a/components/mus/public/interfaces/event_matcher.mojom b/components/mus/public/interfaces/event_matcher.mojom index d68e2fb0a73e18..6cd88236a6ea96 100644 --- a/components/mus/public/interfaces/event_matcher.mojom +++ b/components/mus/public/interfaces/event_matcher.mojom @@ -6,7 +6,7 @@ module mus.mojom; import "components/mus/public/interfaces/input_event_constants.mojom"; import "components/mus/public/interfaces/input_key_codes.mojom"; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; struct KeyEventMatcher { KeyboardCode keyboard_code; diff --git a/components/mus/public/interfaces/gpu_service.mojom b/components/mus/public/interfaces/gpu_service.mojom index 89f7923dba650a..833ec72573339e 100644 --- a/components/mus/public/interfaces/gpu_service.mojom +++ b/components/mus/public/interfaces/gpu_service.mojom @@ -8,7 +8,7 @@ import "components/mus/public/interfaces/channel_handle.mojom"; import "components/mus/public/interfaces/gpu.mojom"; import "components/mus/public/interfaces/gpu_memory_buffer.mojom"; import "gpu/ipc/common/sync_token.mojom"; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; interface GpuService { // Tells the GPU service to create a new channel for communication with a diff --git a/components/mus/public/interfaces/quads.mojom b/components/mus/public/interfaces/quads.mojom index 38efdebb4fed31..39153b40bc1a9e 100644 --- a/components/mus/public/interfaces/quads.mojom +++ b/components/mus/public/interfaces/quads.mojom @@ -5,7 +5,7 @@ module mus.mojom; import "components/mus/public/interfaces/surface_id.mojom"; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; struct Color { uint32 rgba; diff --git a/components/mus/public/interfaces/window_manager.mojom b/components/mus/public/interfaces/window_manager.mojom index 807b9cf836d3e4..b9b98279c7c9e5 100644 --- a/components/mus/public/interfaces/window_manager.mojom +++ b/components/mus/public/interfaces/window_manager.mojom @@ -8,7 +8,7 @@ import "components/mus/public/interfaces/cursor.mojom"; import "components/mus/public/interfaces/event_matcher.mojom"; import "components/mus/public/interfaces/input_events.mojom"; import "components/mus/public/interfaces/window_manager_constants.mojom"; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; // WindowManager is used when a WindowTreeClient attempts to modify // a property of the embed root. When this happens WindowTree calls the diff --git a/components/mus/public/interfaces/window_manager_constants.mojom b/components/mus/public/interfaces/window_manager_constants.mojom index d0b29b631aebb6..a25f0d9593b2c3 100644 --- a/components/mus/public/interfaces/window_manager_constants.mojom +++ b/components/mus/public/interfaces/window_manager_constants.mojom @@ -4,7 +4,7 @@ module mus.mojom; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; enum WindowManagerErrorCode { SUCCESS, diff --git a/components/mus/public/interfaces/window_tree.mojom b/components/mus/public/interfaces/window_tree.mojom index 045a943623ebdf..a836008f720f2d 100644 --- a/components/mus/public/interfaces/window_tree.mojom +++ b/components/mus/public/interfaces/window_tree.mojom @@ -12,7 +12,7 @@ import "components/mus/public/interfaces/mus_constants.mojom"; import "components/mus/public/interfaces/surface_id.mojom"; import "components/mus/public/interfaces/window_manager.mojom"; import "components/mus/public/interfaces/window_manager_constants.mojom"; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; import "ui/mojo/ime/text_input_state.mojom"; struct ViewportMetrics { diff --git a/components/mus/public/interfaces/window_tree_host.mojom b/components/mus/public/interfaces/window_tree_host.mojom index cf33451bc5cd64..f542b8cbef217f 100644 --- a/components/mus/public/interfaces/window_tree_host.mojom +++ b/components/mus/public/interfaces/window_tree_host.mojom @@ -5,7 +5,7 @@ module mus.mojom; import "components/mus/public/interfaces/window_tree.mojom"; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; // WindowTreeHost encapsulates a unique underlying platform window, with a tree // of windows. diff --git a/components/mus/surfaces/BUILD.gn b/components/mus/surfaces/BUILD.gn index aa5e657c3766db..65807e0865122e 100644 --- a/components/mus/surfaces/BUILD.gn +++ b/components/mus/surfaces/BUILD.gn @@ -31,13 +31,13 @@ source_set("surfaces") { "//gpu/command_buffer/client:gles2_cmd_helper", "//gpu/command_buffer/client:gles2_implementation", "//gpu/command_buffer/client:gles2_interface", - "//mojo/converters/geometry", "//mojo/converters/surfaces", "//services/shell/public/cpp", "//services/tracing/public/cpp", "//ui/gfx", + "//ui/gfx/geometry/mojo", + "//ui/gfx/geometry/mojo:interfaces", "//ui/gl", - "//ui/mojo/geometry:interfaces", ] if (use_ozone) { diff --git a/components/mus/test_wm/BUILD.gn b/components/mus/test_wm/BUILD.gn index 8b054f477bcb00..bdeb236bdf9b39 100644 --- a/components/mus/test_wm/BUILD.gn +++ b/components/mus/test_wm/BUILD.gn @@ -14,8 +14,8 @@ mojo_native_application("test_wm") { "//base", "//components/mus/public/cpp", "//components/mus/public/interfaces", - "//mojo/converters/geometry", "//services/shell/public/cpp", + "//ui/gfx/geometry/mojo", "//ui/mojo/display", ] diff --git a/components/mus/test_wm/test_wm.cc b/components/mus/test_wm/test_wm.cc index ef4748fbe04023..ec87329f9ab67f 100644 --- a/components/mus/test_wm/test_wm.cc +++ b/components/mus/test_wm/test_wm.cc @@ -7,13 +7,13 @@ #include "components/mus/public/cpp/window_tree_connection.h" #include "components/mus/public/cpp/window_tree_delegate.h" #include "components/mus/public/interfaces/window_manager_factory.mojom.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/public/c/system/main.h" #include "mojo/public/cpp/bindings/binding.h" #include "services/shell/public/cpp/application_runner.h" #include "services/shell/public/cpp/connector.h" #include "services/shell/public/cpp/shell_client.h" #include "ui/display/display.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/mojo/display/display_type_converters.h" namespace mus { diff --git a/components/mus/ws/BUILD.gn b/components/mus/ws/BUILD.gn index 0ec414739620ff..c9fce1cc8ac4bf 100644 --- a/components/mus/ws/BUILD.gn +++ b/components/mus/ws/BUILD.gn @@ -99,7 +99,6 @@ source_set("lib") { "//components/mus/public/interfaces", "//components/mus/surfaces", "//mojo/common:common_base", - "//mojo/converters/geometry", "//mojo/converters/ime", "//mojo/converters/input_events", "//mojo/converters/surfaces", @@ -113,8 +112,9 @@ source_set("lib") { "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", + "//ui/gfx/geometry/mojo", + "//ui/gfx/geometry/mojo:interfaces", "//ui/gl", - "//ui/mojo/geometry:interfaces", "//ui/platform_window", "//ui/platform_window:platform_impls", ] @@ -161,7 +161,7 @@ source_set("test_support") { "//components/mus/public/interfaces", "//mojo/common", "//mojo/public/cpp/bindings:bindings", - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo:interfaces", ] } @@ -211,7 +211,6 @@ test("mus_ws_unittests") { "//components/mus/public/cpp/tests:test_support", "//components/mus/public/interfaces", "//components/mus/surfaces", - "//mojo/converters/geometry", "//mojo/converters/input_events", "//mojo/converters/transform", "//mojo/public/cpp/bindings:bindings", @@ -225,9 +224,10 @@ test("mus_ws_unittests") { "//ui/gfx", "//ui/gfx:test_support", "//ui/gfx/geometry", + "//ui/gfx/geometry/mojo", + "//ui/gfx/geometry/mojo:interfaces", + "//ui/gfx/geometry/mojo:util", "//ui/gl", - "//ui/mojo/geometry:interfaces", - "//ui/mojo/geometry:util", ] if (use_x11) { diff --git a/components/mus/ws/display.cc b/components/mus/ws/display.cc index 8a745a6f2ca69d..9f688772aab8c8 100644 --- a/components/mus/ws/display.cc +++ b/components/mus/ws/display.cc @@ -22,9 +22,9 @@ #include "components/mus/ws/window_tree.h" #include "components/mus/ws/window_tree_binding.h" #include "mojo/common/common_type_converters.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "services/shell/public/interfaces/connector.mojom.h" #include "ui/base/cursor/cursor.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace mus { namespace ws { diff --git a/components/mus/ws/event_dispatcher.cc b/components/mus/ws/event_dispatcher.cc index 4a092a6ee9a537..9e4e9745871201 100644 --- a/components/mus/ws/event_dispatcher.cc +++ b/components/mus/ws/event_dispatcher.cc @@ -14,9 +14,9 @@ #include "components/mus/ws/server_window_delegate.h" #include "components/mus/ws/window_coordinate_conversions.h" #include "components/mus/ws/window_finder.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/input_events/input_events_type_converters.h" #include "ui/events/event_utils.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/point_conversions.h" diff --git a/components/mus/ws/event_matcher.cc b/components/mus/ws/event_matcher.cc index bb0659bd53935d..aff01374d651c9 100644 --- a/components/mus/ws/event_matcher.cc +++ b/components/mus/ws/event_matcher.cc @@ -4,8 +4,8 @@ #include "components/mus/ws/event_matcher.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/input_events/input_events_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace mus { namespace ws { diff --git a/components/mus/ws/platform_display.cc b/components/mus/ws/platform_display.cc index 10e6e7bc5bd2ae..0616365a6530cc 100644 --- a/components/mus/ws/platform_display.cc +++ b/components/mus/ws/platform_display.cc @@ -22,7 +22,6 @@ #include "components/mus/ws/server_window_surface.h" #include "components/mus/ws/server_window_surface_manager.h" #include "components/mus/ws/window_coordinate_conversions.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/input_events/input_events_type_converters.h" #include "mojo/converters/input_events/mojo_extended_key_event_data.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" @@ -35,6 +34,7 @@ #include "ui/display/display.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/platform_window/platform_ime_controller.h" #include "ui/platform_window/platform_window.h" diff --git a/components/mus/ws/server_window.cc b/components/mus/ws/server_window.cc index 04a479060a8a0e..8c40f713272861 100644 --- a/components/mus/ws/server_window.cc +++ b/components/mus/ws/server_window.cc @@ -13,7 +13,7 @@ #include "components/mus/ws/server_window_delegate.h" #include "components/mus/ws/server_window_observer.h" #include "components/mus/ws/server_window_surface_manager.h" -#include "mojo/converters/geometry/geometry_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace mus { diff --git a/components/mus/ws/server_window_surface.cc b/components/mus/ws/server_window_surface.cc index 7403512862cbc4..58ff6e4ca68258 100644 --- a/components/mus/ws/server_window_surface.cc +++ b/components/mus/ws/server_window_surface.cc @@ -11,8 +11,8 @@ #include "components/mus/ws/server_window.h" #include "components/mus/ws/server_window_delegate.h" #include "components/mus/ws/server_window_surface_manager.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace mus { namespace ws { diff --git a/components/mus/ws/test_change_tracker.h b/components/mus/ws/test_change_tracker.h index b606800e125276..15bb6383f99cc2 100644 --- a/components/mus/ws/test_change_tracker.h +++ b/components/mus/ws/test_change_tracker.h @@ -14,7 +14,7 @@ #include "components/mus/common/types.h" #include "components/mus/public/interfaces/window_tree.mojom.h" #include "mojo/public/cpp/bindings/array.h" -#include "ui/mojo/geometry/geometry.mojom.h" +#include "ui/gfx/geometry/mojo/geometry.mojom.h" namespace mus { diff --git a/components/mus/ws/test_utils.cc b/components/mus/ws/test_utils.cc index 495a46e72b6b1f..32692b8a627fdc 100644 --- a/components/mus/ws/test_utils.cc +++ b/components/mus/ws/test_utils.cc @@ -11,9 +11,9 @@ #include "components/mus/ws/server_window_surface_manager_test_api.h" #include "components/mus/ws/window_manager_access_policy.h" #include "components/mus/ws/window_manager_factory_service.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "services/shell/public/interfaces/connector.mojom.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace mus { namespace ws { diff --git a/components/mus/ws/window_manager_client_unittest.cc b/components/mus/ws/window_manager_client_unittest.cc index 9cc9afe01235b4..edafe678a6293e 100644 --- a/components/mus/ws/window_manager_client_unittest.cc +++ b/components/mus/ws/window_manager_client_unittest.cc @@ -17,9 +17,9 @@ #include "components/mus/public/cpp/window_tree_connection.h" #include "components/mus/public/cpp/window_tree_connection_observer.h" #include "components/mus/public/cpp/window_tree_delegate.h" -#include "mojo/converters/geometry/geometry_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_util.h" #include "ui/gfx/geometry/rect.h" -#include "ui/mojo/geometry/geometry_util.h" namespace mus { namespace ws { diff --git a/components/mus/ws/window_server.cc b/components/mus/ws/window_server.cc index de480968dbbc60..674dbf207b851f 100644 --- a/components/mus/ws/window_server.cc +++ b/components/mus/ws/window_server.cc @@ -22,10 +22,10 @@ #include "components/mus/ws/window_server_delegate.h" #include "components/mus/ws/window_tree.h" #include "components/mus/ws/window_tree_binding.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/input_events/input_events_type_converters.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" #include "services/shell/public/cpp/connection.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gfx/geometry/size_conversions.h" namespace mus { diff --git a/components/mus/ws/window_tree.cc b/components/mus/ws/window_tree.cc index d213e77dbfefb2..4909ab35f72321 100644 --- a/components/mus/ws/window_tree.cc +++ b/components/mus/ws/window_tree.cc @@ -25,10 +25,10 @@ #include "components/mus/ws/window_manager_state.h" #include "components/mus/ws/window_server.h" #include "components/mus/ws/window_tree_binding.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/ime/ime_type_converters.h" #include "mojo/converters/input_events/input_events_type_converters.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/platform_window/text_input_state.h" using mojo::Array; diff --git a/components/mus/ws/window_tree_client_unittest.cc b/components/mus/ws/window_tree_client_unittest.cc index e5353f873cd63a..1676b81bf39b04 100644 --- a/components/mus/ws/window_tree_client_unittest.cc +++ b/components/mus/ws/window_tree_client_unittest.cc @@ -15,9 +15,9 @@ #include "components/mus/public/interfaces/window_tree_host.mojom.h" #include "components/mus/ws/ids.h" #include "components/mus/ws/test_change_tracker.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/public/cpp/bindings/associated_binding.h" #include "services/shell/public/cpp/shell_test.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" using mojo::Array; using mojo::Callback; diff --git a/components/mus/ws/window_tree_unittest.cc b/components/mus/ws/window_tree_unittest.cc index ab51cb4dd25d32..c2ce51788b187b 100644 --- a/components/mus/ws/window_tree_unittest.cc +++ b/components/mus/ws/window_tree_unittest.cc @@ -31,11 +31,11 @@ #include "components/mus/ws/window_server.h" #include "components/mus/ws/window_server_delegate.h" #include "components/mus/ws/window_tree_binding.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "services/shell/public/interfaces/connector.mojom.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/events/event.h" #include "ui/events/event_utils.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gfx/geometry/rect.h" namespace mus { diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn index 37304695ff60bf..a810ce5a5a93cd 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn @@ -68,7 +68,6 @@ source_set("browser") { "//media/midi", "//mojo/common", "//mojo/common:url_type_converters", - "//mojo/converters/geometry", "//mojo/public/cpp/bindings", "//mojo/public/js", "//net", @@ -107,6 +106,7 @@ source_set("browser") { "//ui/events/blink", "//ui/gfx", "//ui/gfx/geometry", + "//ui/gfx/geometry/mojo", "//ui/gl", "//ui/native_theme", "//ui/resources", diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index dd59a10f8f7b22..321514a587192e 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -115,7 +115,6 @@ #include "content/public/common/url_utils.h" #include "content/public/common/web_preferences.h" #include "mojo/common/url_type_converters.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "net/base/url_util.h" #include "net/http/http_cache.h" #include "net/http/http_transaction_factory.h" @@ -126,6 +125,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "ui/accessibility/ax_tree_combiner.h" #include "ui/base/layout.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gl/gl_switches.h" #if defined(OS_ANDROID) diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn index 602c400af69ec8..9953d2efccac6e 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -239,7 +239,7 @@ mojom("mojo_bindings") { "//services/shell/public/interfaces", "//skia/public/interfaces", "//third_party/WebKit/public:mojo_bindings", - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo:interfaces", "//url/mojo:url_mojom_origin", ] } diff --git a/content/common/image_downloader/image_downloader.mojom b/content/common/image_downloader/image_downloader.mojom index b6ea34edd25267..1dfa0d2d4d7859 100644 --- a/content/common/image_downloader/image_downloader.mojom +++ b/content/common/image_downloader/image_downloader.mojom @@ -5,7 +5,7 @@ module content.mojom; import "skia/public/interfaces/bitmap.mojom"; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; interface ImageDownloader { // Fetch and decode an image from a given URL. diff --git a/content/content.gyp b/content/content.gyp index 5ddc71775468f4..225213e064e5a3 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -484,12 +484,12 @@ '../mojo/mojo_public.gyp:mojo_bindings_java', '../net/net.gyp:net', '../skia/skia.gyp:skia_mojo', + '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib', + '../third_party/WebKit/public/blink_headers.gyp:blink_headers_java', '../ui/android/ui_android.gyp:ui_java', + '../ui/gfx/gfx.gyp:mojo_geometry_bindings', '../ui/touch_selection/ui_touch_selection.gyp:selection_event_type_java', '../ui/touch_selection/ui_touch_selection.gyp:touch_handle_orientation_java', - '../third_party/android_tools/android_tools.gyp:android_support_v13_javalib', - '../third_party/WebKit/public/blink_headers.gyp:blink_headers_java', - '../ui/mojo/geometry/mojo_bindings.gyp:mojo_geometry_bindings', 'common_aidl', 'console_message_level_java', 'content_common', diff --git a/content/content_browser.gypi b/content/content_browser.gypi index 71d766a38a9ffa..edd46d100b80e3 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -25,7 +25,6 @@ '../gpu/gpu.gyp:gpu', '../gpu/gpu.gyp:gpu_ipc_client', '../gpu/gpu.gyp:gpu_ipc_common', - '../mojo/mojo_base.gyp:mojo_geometry_lib', '../mojo/mojo_base.gyp:mojo_url_type_converters', '../mojo/mojo_public.gyp:mojo_cpp_bindings', '../mojo/mojo_public.gyp:mojo_js_bindings', @@ -67,6 +66,7 @@ '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gfx/gfx.gyp:gfx_range', + '../ui/gfx/gfx.gyp:mojo_geometry_lib', '../ui/resources/ui_resources.gyp:ui_resources', '../ui/snapshot/snapshot.gyp:snapshot', '../ui/surface/surface.gyp:surface', diff --git a/content/content_common_mojo_bindings.gyp b/content/content_common_mojo_bindings.gyp index 807c78b9a3d1cd..6ee89513b16b0b 100644 --- a/content/content_common_mojo_bindings.gyp +++ b/content/content_common_mojo_bindings.gyp @@ -30,7 +30,7 @@ '../services/shell/shell_public.gyp:shell_public', '../skia/skia.gyp:skia_mojo', '../third_party/WebKit/public/blink.gyp:mojo_bindings', - '../ui/mojo/geometry/mojo_bindings.gyp:mojo_geometry_bindings', + '../ui/gfx/gfx.gyp:mojo_geometry_bindings', ], 'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ], }, diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 7abf917e9f9e5f..16449e0afa3a82 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -23,7 +23,6 @@ '../media/gpu/ipc/media_ipc.gyp:media_gpu_ipc_common', '../media/media.gyp:media', '../media/media.gyp:media_gpu', - '../mojo/mojo_base.gyp:mojo_geometry_lib', '../mojo/mojo_base.gyp:mojo_url_type_converters', '../mojo/mojo_edk.gyp:mojo_js_lib', '../net/net.gyp:net', @@ -45,6 +44,7 @@ '../ui/gfx/gfx.gyp:gfx', '../ui/gfx/gfx.gyp:gfx_geometry', '../ui/gfx/gfx.gyp:gfx_range', + '../ui/gfx/gfx.gyp:mojo_geometry_lib', '../ui/native_theme/native_theme.gyp:native_theme', '../ui/surface/surface.gyp:surface', '../url/ipc/url_ipc.gyp:url_ipc', diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index 13138ab148ac83..329cac7ac67688 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -63,7 +63,6 @@ source_set("renderer") { "//media/gpu/ipc/common", "//media/midi", "//mojo/common", - "//mojo/converters/geometry", "//mojo/edk/js", "//mojo/public/cpp/bindings", "//mojo/public/js", @@ -89,6 +88,7 @@ source_set("renderer") { "//ui/events:dom_keycode_converter", "//ui/events:events_base", "//ui/events/blink", + "//ui/gfx/geometry/mojo", "//ui/gl", "//ui/native_theme", "//ui/surface", diff --git a/content/renderer/image_downloader/image_downloader_impl.cc b/content/renderer/image_downloader/image_downloader_impl.cc index 0fd476c1ecdc41..774b23477ec826 100644 --- a/content/renderer/image_downloader/image_downloader_impl.cc +++ b/content/renderer/image_downloader/image_downloader_impl.cc @@ -14,7 +14,6 @@ #include "content/public/renderer/render_thread.h" #include "content/renderer/fetchers/multi_resolution_image_resource_fetcher.h" #include "mojo/common/url_type_converters.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "net/base/data_url.h" #include "skia/ext/image_operations.h" #include "skia/public/type_converters.h" @@ -23,6 +22,7 @@ #include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebView.h" #include "ui/gfx/favicon_size.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/skbitmap_operations.h" #include "url/url_constants.h" diff --git a/content/renderer/mus/BUILD.gn b/content/renderer/mus/BUILD.gn index c2d3f93d317d2c..dcf56ae666e2a8 100644 --- a/content/renderer/mus/BUILD.gn +++ b/content/renderer/mus/BUILD.gn @@ -26,12 +26,12 @@ source_set("mus") { "//content/public/common:common_sources", "//mojo/common", "//mojo/converters/blink", - "//mojo/converters/geometry", "//mojo/converters/input_events", "//mojo/converters/surfaces", "//services/shell/public/cpp", "//third_party/WebKit/public:blink", "//ui/events:events", "//ui/events:events_base", + "//ui/gfx/geometry/mojo", ] } diff --git a/content/renderer/mus/render_widget_mus_connection.cc b/content/renderer/mus/render_widget_mus_connection.cc index d1821e8bac0acd..da41c3312bcf87 100644 --- a/content/renderer/mus/render_widget_mus_connection.cc +++ b/content/renderer/mus/render_widget_mus_connection.cc @@ -18,9 +18,9 @@ #include "content/renderer/mus/compositor_mus_connection.h" #include "content/renderer/render_thread_impl.h" #include "content/renderer/render_view_impl.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/surfaces/surfaces_utils.h" #include "services/shell/public/cpp/connector.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace content { diff --git a/mash/browser/BUILD.gn b/mash/browser/BUILD.gn index 844d7d4761ebe9..d1b77e987dd4a1 100644 --- a/mash/browser/BUILD.gn +++ b/mash/browser/BUILD.gn @@ -19,13 +19,13 @@ source_set("lib") { "//base", "//components/mus/public/cpp", "//mash/public/interfaces", - "//mojo/converters/geometry", "//mojo/public/cpp/bindings", "//services/catalog/public/interfaces", "//services/navigation/public/interfaces", "//services/shell/public/cpp", "//services/shell/public/interfaces", "//services/tracing/public/cpp", + "//ui/gfx/geometry/mojo", "//ui/native_theme", "//ui/views", "//ui/views/mus:for_mojo_application", diff --git a/mash/browser/browser.cc b/mash/browser/browser.cc index 01c4ad33d01a28..431569dfe372a0 100644 --- a/mash/browser/browser.cc +++ b/mash/browser/browser.cc @@ -14,7 +14,6 @@ #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_tree_connection.h" #include "mash/public/interfaces/launchable.mojom.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/public/c/system/main.h" #include "services/navigation/public/interfaces/view.mojom.h" #include "services/shell/public/cpp/application_runner.h" @@ -23,6 +22,7 @@ #include "services/tracing/public/cpp/tracing_impl.h" #include "ui/aura/mus/mus_util.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gfx/paint_throbber.h" #include "ui/gfx/text_constants.h" #include "ui/native_theme/native_theme.h" diff --git a/mash/example/views_examples/BUILD.gn b/mash/example/views_examples/BUILD.gn index 0c7a5dfdbaf0d8..df571e9ca15da2 100644 --- a/mash/example/views_examples/BUILD.gn +++ b/mash/example/views_examples/BUILD.gn @@ -21,7 +21,6 @@ mojo_native_application("views_examples") { "//base", "//components/mus/public/interfaces", "//mash/public/interfaces", - "//mojo/converters/geometry", "//mojo/public/cpp/bindings", "//services/shell/public/cpp", "//services/shell/public/cpp:sources", @@ -29,6 +28,7 @@ mojo_native_application("views_examples") { "//skia", "//ui/gfx", "//ui/gfx/geometry", + "//ui/gfx/geometry/mojo", "//ui/views", "//ui/views/examples:views_examples_lib", "//ui/views/mus:for_mojo_application", diff --git a/mash/example/window_type_launcher/BUILD.gn b/mash/example/window_type_launcher/BUILD.gn index 5d94e8ebe93df1..ceb66cdae29772 100644 --- a/mash/example/window_type_launcher/BUILD.gn +++ b/mash/example/window_type_launcher/BUILD.gn @@ -30,7 +30,6 @@ executable("window_type_launcher") { "//mash/public/interfaces", "//mash/session/public/interfaces", "//mojo/common:common_base", - "//mojo/converters/geometry", "//mojo/edk/system", "//mojo/public/cpp/bindings", "//services/shell/public/cpp", @@ -41,6 +40,7 @@ executable("window_type_launcher") { "//ui/aura", "//ui/gfx", "//ui/gfx/geometry", + "//ui/gfx/geometry/mojo", "//ui/views", "//ui/views/mus:for_shared_library", ] diff --git a/mash/example/window_type_launcher/window_type_launcher.cc b/mash/example/window_type_launcher/window_type_launcher.cc index 351c5cf1be106d..1a25f87d121630 100644 --- a/mash/example/window_type_launcher/window_type_launcher.cc +++ b/mash/example/window_type_launcher/window_type_launcher.cc @@ -13,13 +13,13 @@ #include "base/threading/platform_thread.h" #include "components/mus/public/cpp/property_type_converters.h" #include "mash/session/public/interfaces/session.mojom.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "services/shell/public/cpp/connection.h" #include "services/shell/public/cpp/connector.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/compositor/layer.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/views/context_menu_controller.h" #include "ui/views/controls/button/button.h" #include "ui/views/controls/button/label_button.h" diff --git a/mash/webtest/BUILD.gn b/mash/webtest/BUILD.gn index d36a4382e2832f..eac7ab6f2ba3e0 100644 --- a/mash/webtest/BUILD.gn +++ b/mash/webtest/BUILD.gn @@ -19,12 +19,12 @@ source_set("lib") { "//base", "//components/mus/public/cpp", "//mash/public/interfaces", - "//mojo/converters/geometry", "//mojo/public/cpp/bindings", "//services/navigation/public/interfaces", "//services/shell/public/cpp", "//services/shell/public/interfaces", "//services/tracing/public/cpp", + "//ui/gfx/geometry/mojo", "//ui/native_theme", "//ui/views", "//ui/views/mus:for_mojo_application", diff --git a/mash/webtest/webtest.cc b/mash/webtest/webtest.cc index 843a1bc2048463..849963d3d5fa7e 100644 --- a/mash/webtest/webtest.cc +++ b/mash/webtest/webtest.cc @@ -14,7 +14,6 @@ #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_tree_connection.h" #include "mash/public/interfaces/launchable.mojom.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/public/c/system/main.h" #include "services/navigation/public/interfaces/view.mojom.h" #include "services/shell/public/cpp/application_runner.h" @@ -23,6 +22,7 @@ #include "services/tracing/public/cpp/tracing_impl.h" #include "ui/aura/mus/mus_util.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gfx/paint_throbber.h" #include "ui/native_theme/native_theme.h" #include "ui/views/background.h" diff --git a/mash/wm/BUILD.gn b/mash/wm/BUILD.gn index 81a5b8c4072251..abd1412c43fbe2 100644 --- a/mash/wm/BUILD.gn +++ b/mash/wm/BUILD.gn @@ -90,7 +90,6 @@ source_set("lib") { "//mash/wm/public/interfaces", "//mash/wm/resources", "//mojo/common:common_base", - "//mojo/converters/geometry", "//mojo/converters/input_events", "//services/shell/public/cpp", "//services/tracing/public/cpp", @@ -99,6 +98,7 @@ source_set("lib") { "//ui/events", "//ui/gfx", "//ui/gfx/geometry", + "//ui/gfx/geometry/mojo", "//ui/mojo/display", "//ui/resources", "//ui/strings", @@ -184,7 +184,6 @@ source_set("unittests") { "//components/mus/public/cpp/tests:unittest_support", "//components/mus/public/interfaces", "//mash/wm/public/interfaces", - "//mojo/converters/geometry", "//mojo/converters/input_events", "//mojo/edk/system", "//mojo/public/cpp/system", @@ -196,8 +195,9 @@ source_set("unittests") { "//ui/events", "//ui/gfx:test_support", "//ui/gfx/geometry", - "//ui/mojo/geometry:interfaces", - "//ui/mojo/geometry:util", + "//ui/gfx/geometry/mojo", + "//ui/gfx/geometry/mojo:interfaces", + "//ui/gfx/geometry/mojo:util", "//ui/views/mus", ] diff --git a/mash/wm/non_client_frame_controller.cc b/mash/wm/non_client_frame_controller.cc index d2f7da33e3f58a..a4c699807f12c5 100644 --- a/mash/wm/non_client_frame_controller.cc +++ b/mash/wm/non_client_frame_controller.cc @@ -24,11 +24,11 @@ #include "mash/wm/frame/non_client_frame_view_mash.h" #include "mash/wm/property_util.h" #include "mash/wm/shadow.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "ui/aura/layout_manager.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" #include "ui/compositor/layer.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gfx/geometry/vector2d.h" #include "ui/views/mus/native_widget_mus.h" #include "ui/views/widget/widget.h" diff --git a/mash/wm/root_window_controller.cc b/mash/wm/root_window_controller.cc index 6fdca0ebd1afd7..9c2b70c0232219 100644 --- a/mash/wm/root_window_controller.cc +++ b/mash/wm/root_window_controller.cc @@ -40,9 +40,9 @@ #include "mash/wm/status_layout_manager.h" #include "mash/wm/window_manager.h" #include "mash/wm/window_manager_application.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/public/cpp/bindings/type_converter.h" #include "services/shell/public/cpp/connector.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/mojo/display/display_type_converters.h" namespace mash { diff --git a/mash/wm/window_manager.cc b/mash/wm/window_manager.cc index 7c394aaec3c374..5c5be91ce84a1b 100644 --- a/mash/wm/window_manager.cc +++ b/mash/wm/window_manager.cc @@ -22,7 +22,7 @@ #include "mash/wm/property_util.h" #include "mash/wm/public/interfaces/container.mojom.h" #include "mash/wm/root_window_controller.h" -#include "mojo/converters/geometry/geometry_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace mash { namespace wm { diff --git a/media/mojo/common/BUILD.gn b/media/mojo/common/BUILD.gn index b3805fd2a11529..04144cd8dcde56 100644 --- a/media/mojo/common/BUILD.gn +++ b/media/mojo/common/BUILD.gn @@ -20,9 +20,9 @@ source_set("common") { "//media", "//media/mojo/interfaces", "//mojo/common", - "//mojo/converters/geometry", "//mojo/public/c/system:for_component", "//ui/gfx/geometry", - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo", + "//ui/gfx/geometry/mojo:interfaces", ] } diff --git a/media/mojo/common/media_type_converters.cc b/media/mojo/common/media_type_converters.cc index 01f4c5cdafab18..76e11e68da5b88 100644 --- a/media/mojo/common/media_type_converters.cc +++ b/media/mojo/common/media_type_converters.cc @@ -25,8 +25,8 @@ #include "media/base/video_frame.h" #include "media/mojo/common/mojo_shared_buffer_video_frame.h" #include "media/mojo/interfaces/demuxer_stream.mojom.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/public/cpp/system/buffer.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace mojo { diff --git a/media/mojo/interfaces/BUILD.gn b/media/mojo/interfaces/BUILD.gn index 1b154cbc8056e3..9947c0bf1ec56c 100644 --- a/media/mojo/interfaces/BUILD.gn +++ b/media/mojo/interfaces/BUILD.gn @@ -28,6 +28,6 @@ mojom("interfaces") { } deps = [ - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo:interfaces", ] } diff --git a/media/mojo/interfaces/media_types.mojom b/media/mojo/interfaces/media_types.mojom index d40288c0a21a7b..b06b73bcd08642 100644 --- a/media/mojo/interfaces/media_types.mojom +++ b/media/mojo/interfaces/media_types.mojom @@ -4,7 +4,7 @@ module media.mojom; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; // See media/base/buffering_state.h for descriptions. // Kept in sync with media::BufferingState via static_asserts. diff --git a/media/mojo/interfaces/renderer.mojom b/media/mojo/interfaces/renderer.mojom index e3135c8c56b9c9..1318bad6d0c03e 100644 --- a/media/mojo/interfaces/renderer.mojom +++ b/media/mojo/interfaces/renderer.mojom @@ -6,7 +6,7 @@ module media.mojom; import "media/mojo/interfaces/demuxer_stream.mojom"; import "media/mojo/interfaces/media_types.mojom"; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; interface Renderer { // Initializes the Renderer with one or both of an audio and video stream, diff --git a/media/mojo/services/mojo_renderer_impl.cc b/media/mojo/services/mojo_renderer_impl.cc index 6f028c877e71c4..63d7abda2af0c1 100644 --- a/media/mojo/services/mojo_renderer_impl.cc +++ b/media/mojo/services/mojo_renderer_impl.cc @@ -15,7 +15,7 @@ #include "media/base/video_renderer_sink.h" #include "media/mojo/services/mojo_demuxer_stream_impl.h" #include "media/renderers/video_overlay_factory.h" -#include "mojo/converters/geometry/geometry_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace media { diff --git a/media/mojo/services/mojo_renderer_service.cc b/media/mojo/services/mojo_renderer_service.cc index 3d207e896cef0f..f0eaf988929483 100644 --- a/media/mojo/services/mojo_renderer_service.cc +++ b/media/mojo/services/mojo_renderer_service.cc @@ -11,7 +11,7 @@ #include "media/base/renderer.h" #include "media/mojo/services/demuxer_stream_provider_shim.h" #include "media/mojo/services/mojo_cdm_service_context.h" -#include "mojo/converters/geometry/geometry_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace media { diff --git a/mojo/converters/input_events/BUILD.gn b/mojo/converters/input_events/BUILD.gn index b724bbe9678019..2a0a3299b244d3 100644 --- a/mojo/converters/input_events/BUILD.gn +++ b/mojo/converters/input_events/BUILD.gn @@ -16,11 +16,11 @@ component("input_events") { deps = [ "//base", "//components/mus/public/interfaces", - "//mojo/converters/geometry", "//mojo/public/c/system:for_component", "//ui/events", "//ui/events:dom_keycode_converter", "//ui/gfx/geometry", - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo", + "//ui/gfx/geometry/mojo:interfaces", ] } diff --git a/mojo/converters/input_events/DEPS b/mojo/converters/input_events/DEPS index 95ec8297295a77..d725a02da993fe 100644 --- a/mojo/converters/input_events/DEPS +++ b/mojo/converters/input_events/DEPS @@ -1,4 +1,5 @@ include_rules = [ "+components/mus/public/interfaces", "+ui/events", + "+ui/gfx/geometry/mojo", ] diff --git a/mojo/converters/input_events/input_events_type_converters.cc b/mojo/converters/input_events/input_events_type_converters.cc index 3bf8a2799b7322..ce9fec18ec9682 100644 --- a/mojo/converters/input_events/input_events_type_converters.cc +++ b/mojo/converters/input_events/input_events_type_converters.cc @@ -14,11 +14,11 @@ #endif #include "components/mus/public/interfaces/input_events.mojom.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/input_events/mojo_extended_key_event_data.h" #include "ui/events/event_utils.h" #include "ui/events/keycodes/dom/keycode_converter.h" #include "ui/events/keycodes/keyboard_codes.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace mojo { namespace { diff --git a/mojo/converters/surfaces/BUILD.gn b/mojo/converters/surfaces/BUILD.gn index 6609e8ef0b4daf..7fd5c1b3851b8a 100644 --- a/mojo/converters/surfaces/BUILD.gn +++ b/mojo/converters/surfaces/BUILD.gn @@ -18,9 +18,9 @@ component("surfaces") { defines = [ "MOJO_SURFACES_IMPLEMENTATION" ] public_deps = [ - "//mojo/converters/geometry", "//mojo/converters/transform", "//ui/gfx", + "//ui/gfx/geometry/mojo", ] deps = [ diff --git a/mojo/converters/surfaces/surfaces_type_converters.cc b/mojo/converters/surfaces/surfaces_type_converters.cc index 57742a207113d5..cf36039802d8c9 100644 --- a/mojo/converters/surfaces/surfaces_type_converters.cc +++ b/mojo/converters/surfaces/surfaces_type_converters.cc @@ -24,9 +24,9 @@ #include "cc/quads/tile_draw_quad.h" #include "cc/quads/yuv_video_draw_quad.h" #include "cc/surfaces/surface_id_allocator.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/surfaces/custom_surface_converter.h" #include "mojo/converters/transform/transform_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" using mus::mojom::Color; using mus::mojom::ColorPtr; diff --git a/mojo/converters/surfaces/surfaces_utils.cc b/mojo/converters/surfaces/surfaces_utils.cc index 239263ffa6d1c7..ddbe4f528c2fed 100644 --- a/mojo/converters/surfaces/surfaces_utils.cc +++ b/mojo/converters/surfaces/surfaces_utils.cc @@ -4,8 +4,8 @@ #include "mojo/converters/surfaces/surfaces_utils.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/transform/transform_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" #include "ui/gfx/transform.h" diff --git a/mojo/converters/surfaces/tests/BUILD.gn b/mojo/converters/surfaces/tests/BUILD.gn index 4cb915df4155a1..6e5551e60c0239 100644 --- a/mojo/converters/surfaces/tests/BUILD.gn +++ b/mojo/converters/surfaces/tests/BUILD.gn @@ -13,7 +13,6 @@ test("mojo_surfaces_lib_unittests") { "//cc/surfaces", "//components/mus/public/interfaces", "//gpu", - "//mojo/converters/geometry", "//mojo/converters/surfaces", "//mojo/converters/transform", "//mojo/edk/test:run_all_unittests", @@ -22,7 +21,8 @@ test("mojo_surfaces_lib_unittests") { "//ui/gfx", "//ui/gfx:test_support", "//ui/gfx/geometry", - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo", + "//ui/gfx/geometry/mojo:interfaces", ] sources = [ diff --git a/mojo/converters/surfaces/tests/surface_unittest.cc b/mojo/converters/surfaces/tests/surface_unittest.cc index f8fae2d97d06c2..9a15429277235a 100644 --- a/mojo/converters/surfaces/tests/surface_unittest.cc +++ b/mojo/converters/surfaces/tests/surface_unittest.cc @@ -16,12 +16,12 @@ #include "gpu/command_buffer/common/mailbox.h" #include "gpu/command_buffer/common/mailbox_holder.h" #include "gpu/command_buffer/common/sync_token.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" #include "mojo/converters/transform/transform_type_converters.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkColor.h" #include "third_party/skia/include/core/SkXfermode.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" using mus::mojom::Color; using mus::mojom::ColorPtr; diff --git a/mojo/converters/transform/BUILD.gn b/mojo/converters/transform/BUILD.gn index 34da111fd63681..5ff908be307340 100644 --- a/mojo/converters/transform/BUILD.gn +++ b/mojo/converters/transform/BUILD.gn @@ -11,7 +11,7 @@ component("transform") { deps = [ "//mojo/public/c/system:for_component", "//skia", - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo:interfaces", ] defines = [ "MOJO_TRANSFORM_IMPLEMENTATION" ] diff --git a/mojo/converters/transform/DEPS b/mojo/converters/transform/DEPS index ed693dd115d3e8..1474f700bf46e6 100644 --- a/mojo/converters/transform/DEPS +++ b/mojo/converters/transform/DEPS @@ -1,4 +1,4 @@ include_rules = [ "+ui/gfx/transform.h", - "+ui/mojo/geometry", + "+ui/gfx/geometry/mojo", ] diff --git a/mojo/converters/transform/transform_type_converters.h b/mojo/converters/transform/transform_type_converters.h index 372c4730d6f225..d2af06df934326 100644 --- a/mojo/converters/transform/transform_type_converters.h +++ b/mojo/converters/transform/transform_type_converters.h @@ -6,8 +6,8 @@ #define MOJO_CONVERTERS_TRANSFORM_TRANSFORM_TYPE_CONVERTERS_H_ #include "mojo/converters/transform/mojo_transform_export.h" +#include "ui/gfx/geometry/mojo/geometry.mojom.h" #include "ui/gfx/transform.h" -#include "ui/mojo/geometry/geometry.mojom.h" namespace mojo { diff --git a/mojo/mojo_base.gyp b/mojo/mojo_base.gyp index b61cbc8620b6f8..28a4dfb2aaadac 100644 --- a/mojo/mojo_base.gyp +++ b/mojo/mojo_base.gyp @@ -93,24 +93,6 @@ 'common/url_type_converters.h', ], }, - { - # GN version: //mojo/converters/geometry - 'target_name': 'mojo_geometry_lib', - 'type': '<(component)', - 'defines': [ - 'MOJO_GEOMETRY_IMPLEMENTATION', - ], - 'dependencies': [ - '../ui/mojo/geometry/mojo_bindings.gyp:mojo_geometry_bindings', - '../ui/gfx/gfx.gyp:gfx_geometry', - '<(mojo_system_for_component)', - ], - 'sources': [ - 'converters/geometry/geometry_type_converters.cc', - 'converters/geometry/geometry_type_converters.h', - 'converters/geometry/mojo_geometry_export.h', - ], - }, { # GN version: //mojo/common:test_common_custom_types 'target_name': 'mojo_test_common_custom_types', diff --git a/services/navigation/BUILD.gn b/services/navigation/BUILD.gn index 0a70e16e4b6d52..f73b3b351b12a9 100644 --- a/services/navigation/BUILD.gn +++ b/services/navigation/BUILD.gn @@ -62,10 +62,10 @@ static_library("lib") { "//base", "//components/mus/public/cpp", "//content/public/browser", - "//mojo/converters/geometry", "//services/navigation/public/interfaces", "//services/shell/public/cpp", "//skia", + "//ui/gfx/geometry/mojo", "//ui/views", "//ui/views/controls/webview", "//ui/views/mus", diff --git a/services/navigation/public/interfaces/BUILD.gn b/services/navigation/public/interfaces/BUILD.gn index ec88b94b405813..50797892aba7b1 100644 --- a/services/navigation/public/interfaces/BUILD.gn +++ b/services/navigation/public/interfaces/BUILD.gn @@ -11,7 +11,7 @@ mojom("interfaces") { deps = [ "//components/mus/public/interfaces", - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo:interfaces", "//url/mojo:url_mojom_gurl", ] } diff --git a/services/navigation/public/interfaces/view.mojom b/services/navigation/public/interfaces/view.mojom index 0ceead80299b89..e2fb3fa884e3c1 100644 --- a/services/navigation/public/interfaces/view.mojom +++ b/services/navigation/public/interfaces/view.mojom @@ -5,7 +5,7 @@ module navigation.mojom; import "components/mus/public/interfaces/window_tree.mojom"; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; import "url/mojo/url.mojom"; interface ViewFactory { diff --git a/services/navigation/view_impl.cc b/services/navigation/view_impl.cc index 227b3580994fd8..23c9bd5d89165c 100644 --- a/services/navigation/view_impl.cc +++ b/services/navigation/view_impl.cc @@ -8,7 +8,7 @@ #include "components/mus/public/cpp/window_tree_connection.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" -#include "mojo/converters/geometry/geometry_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/views/controls/webview/webview.h" #include "ui/views/mus/native_widget_mus.h" #include "ui/views/widget/widget.h" diff --git a/mojo/converters/geometry/BUILD.gn b/ui/gfx/geometry/mojo/BUILD.gn similarity index 61% rename from mojo/converters/geometry/BUILD.gn rename to ui/gfx/geometry/mojo/BUILD.gn index ce047c371e9a80..543258113fb614 100644 --- a/mojo/converters/geometry/BUILD.gn +++ b/ui/gfx/geometry/mojo/BUILD.gn @@ -1,10 +1,12 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. +# Copyright 2016 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +import("//mojo/public/tools/bindings/mojom.gni") + # This target does NOT depend on skia. One can depend on this target to avoid # picking up a dependency on skia. -component("geometry") { +component("mojo") { output_name = "mojo_geometry_lib" public_deps = [ @@ -12,7 +14,7 @@ component("geometry") { ] deps = [ "//mojo/public/c/system:for_component", - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo:interfaces", ] defines = [ "MOJO_GEOMETRY_IMPLEMENTATION" ] @@ -23,3 +25,19 @@ component("geometry") { "mojo_geometry_export.h", ] } + +mojom("interfaces") { + sources = [ + "geometry.mojom", + ] +} + +source_set("util") { + sources = [ + "geometry_util.h", + ] + + deps = [ + ":interfaces", + ] +} diff --git a/mojo/converters/geometry/DEPS b/ui/gfx/geometry/mojo/DEPS similarity index 100% rename from mojo/converters/geometry/DEPS rename to ui/gfx/geometry/mojo/DEPS diff --git a/ui/mojo/geometry/geometry.mojom b/ui/gfx/geometry/mojo/geometry.mojom similarity index 94% rename from ui/mojo/geometry/geometry.mojom rename to ui/gfx/geometry/mojo/geometry.mojom index 95a43361674921..8621f69ced77c2 100644 --- a/ui/mojo/geometry/geometry.mojom +++ b/ui/gfx/geometry/mojo/geometry.mojom @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +// TODO(beng): should be gfx.mojom; module mojo; struct Point { diff --git a/mojo/converters/geometry/geometry_type_converters.cc b/ui/gfx/geometry/mojo/geometry_type_converters.cc similarity index 96% rename from mojo/converters/geometry/geometry_type_converters.cc rename to ui/gfx/geometry/mojo/geometry_type_converters.cc index 980adbcd5c70c4..842560eaae3701 100644 --- a/mojo/converters/geometry/geometry_type_converters.cc +++ b/ui/gfx/geometry/mojo/geometry_type_converters.cc @@ -1,8 +1,8 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "mojo/converters/geometry/geometry_type_converters.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace mojo { diff --git a/mojo/converters/geometry/geometry_type_converters.h b/ui/gfx/geometry/mojo/geometry_type_converters.h similarity index 88% rename from mojo/converters/geometry/geometry_type_converters.h rename to ui/gfx/geometry/mojo/geometry_type_converters.h index f90aba7a42fa6f..9aedb36a486c7e 100644 --- a/mojo/converters/geometry/geometry_type_converters.h +++ b/ui/gfx/geometry/mojo/geometry_type_converters.h @@ -1,18 +1,18 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_CONVERTERS_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_ -#define MOJO_CONVERTERS_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_ +#ifndef UI_GFX_GEOMETRY_MOJO_GEOMETRY_TYPE_CONVERTERS_H_ +#define UI_GFX_GEOMETRY_MOJO_GEOMETRY_TYPE_CONVERTERS_H_ -#include "mojo/converters/geometry/mojo_geometry_export.h" #include "ui/gfx/geometry/insets.h" +#include "ui/gfx/geometry/mojo/geometry.mojom.h" +#include "ui/gfx/geometry/mojo/mojo_geometry_export.h" #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/point_f.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/rect_f.h" #include "ui/gfx/geometry/size.h" -#include "ui/mojo/geometry/geometry.mojom.h" namespace mojo { @@ -99,4 +99,4 @@ struct MOJO_GEOMETRY_EXPORT TypeConverter { } // namespace mojo -#endif // MOJO_CONVERTERS_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_ +#endif // UI_GFX_GEOMETRY_MOJO_GEOMETRY_TYPE_CONVERTERS_H_ diff --git a/ui/mojo/geometry/geometry_util.h b/ui/gfx/geometry/mojo/geometry_util.h similarity index 75% rename from ui/mojo/geometry/geometry_util.h rename to ui/gfx/geometry/mojo/geometry_util.h index 2606be837dee78..31da559b7b8d30 100644 --- a/ui/mojo/geometry/geometry_util.h +++ b/ui/gfx/geometry/mojo/geometry_util.h @@ -1,11 +1,11 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2016 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef UI_MOJO_GEOMETRY_GEOMETRY_UTIL_H_ -#define UI_MOJO_GEOMETRY_GEOMETRY_UTIL_H_ +#ifndef UI_GFX_GEOMETRY_MOJO_GEOMETRY_UTIL_H_ +#define UI_GFX_GEOMETRY_MOJO_GEOMETRY_UTIL_H_ -#include "ui/mojo/geometry/geometry.mojom.h" +#include "ui/gfx/geometry/mojo/geometry.mojom.h" namespace mojo { @@ -36,4 +36,4 @@ inline bool operator!=(const Point& lhs, const Point& rhs) { } -#endif // UI_MOJO_GEOMETRY_GEOMETRY_UTIL_H_ +#endif // UI_GFX_GEOMETRY_MOJO_GEOMETRY_UTIL_H_ diff --git a/ui/gfx/geometry/mojo/mojo_bindings.gyp b/ui/gfx/geometry/mojo/mojo_bindings.gyp new file mode 100644 index 00000000000000..55759376906ab7 --- /dev/null +++ b/ui/gfx/geometry/mojo/mojo_bindings.gyp @@ -0,0 +1,8 @@ +# Copyright 2015 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. + +{ + 'targets': [ + ], +} diff --git a/mojo/converters/geometry/mojo_geometry_export.h b/ui/gfx/geometry/mojo/mojo_geometry_export.h similarity index 100% rename from mojo/converters/geometry/mojo_geometry_export.h rename to ui/gfx/geometry/mojo/mojo_geometry_export.h diff --git a/ui/gfx/gfx.gyp b/ui/gfx/gfx.gyp index 4e6bf15f6d468f..42a135cd64b0b9 100644 --- a/ui/gfx/gfx.gyp +++ b/ui/gfx/gfx.gyp @@ -3,6 +3,9 @@ # found in the LICENSE file. { + 'includes': { + '../../mojo/mojo_variables.gypi', + }, 'variables': { 'chromium_code': 1, }, @@ -67,6 +70,43 @@ '../../build/android/increase_size_for_speed.gypi', ], }, + { + # GN version: //ui/gfx/geometry/mojo:interfaces + 'target_name': 'mojo_geometry_bindings_mojom', + 'type': 'none', + 'variables': { + 'mojom_files': [ + 'geometry/mojo/geometry.mojom', + ], + }, + 'includes': [ '../../mojo/mojom_bindings_generator_explicit.gypi' ], + }, + { + 'target_name': 'mojo_geometry_bindings', + 'type': 'static_library', + 'dependencies': [ + 'mojo_geometry_bindings_mojom', + '../../mojo/mojo_public.gyp:mojo_cpp_bindings', + ], + }, + { + # GN version: //ui/gfx/geometry/mojo + 'target_name': 'mojo_geometry_lib', + 'type': '<(component)', + 'defines': [ + 'MOJO_GEOMETRY_IMPLEMENTATION', + ], + 'dependencies': [ + 'mojo_geometry_bindings', + 'gfx_geometry', + '<(mojo_system_for_component)', + ], + 'sources': [ + 'geometry/mojo/geometry_type_converters.cc', + 'geometry/mojo/geometry_type_converters.h', + 'geometry/mojo/mojo_geometry_export.h', + ], + }, { 'target_name': 'gfx_range', 'type': '<(component)', diff --git a/ui/keyboard/BUILD.gn b/ui/keyboard/BUILD.gn index ae966b8b4483a5..1af8a5f2b4afc3 100644 --- a/ui/keyboard/BUILD.gn +++ b/ui/keyboard/BUILD.gn @@ -132,7 +132,7 @@ mojom("mojom") { "keyboard.mojom", ] deps = [ - "//ui/mojo/geometry:interfaces", + "//ui/gfx/geometry/mojo:interfaces", ] } diff --git a/ui/keyboard/keyboard.mojom b/ui/keyboard/keyboard.mojom index 212765b17a560e..37d3ca35dd2623 100644 --- a/ui/keyboard/keyboard.mojom +++ b/ui/keyboard/keyboard.mojom @@ -4,7 +4,7 @@ module keyboard.mojom; -import "ui/mojo/geometry/geometry.mojom"; +import "ui/gfx/geometry/mojo/geometry.mojom"; interface KeyboardObserver { // Sent any time state changes in the keyboard. diff --git a/ui/mojo/display/BUILD.gn b/ui/mojo/display/BUILD.gn index 54f43e27e1d51b..781c428dd06c1d 100644 --- a/ui/mojo/display/BUILD.gn +++ b/ui/mojo/display/BUILD.gn @@ -10,9 +10,9 @@ component("display") { ] deps = [ "//components/mus/public/interfaces", - "//mojo/converters/geometry", "//mojo/public/c/system:for_component", "//ui/display", + "//ui/gfx/geometry/mojo", ] defines = [ "MOJO_DISPLAY_IMPLEMENTATION" ] diff --git a/ui/mojo/display/DEPS b/ui/mojo/display/DEPS index 412d63017be04b..edc7674ab593d4 100644 --- a/ui/mojo/display/DEPS +++ b/ui/mojo/display/DEPS @@ -1,5 +1,5 @@ include_rules = [ "+components/mus/public/interfaces", - "+mojo/converters/geometry", "+ui/display", + "+ui/gfx/geometry/mojo", ] diff --git a/ui/mojo/display/display_type_converters.cc b/ui/mojo/display/display_type_converters.cc index bc1a55d0c3f686..920b9faeafd4c6 100644 --- a/ui/mojo/display/display_type_converters.cc +++ b/ui/mojo/display/display_type_converters.cc @@ -4,8 +4,8 @@ #include "ui/mojo/display/display_type_converters.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "ui/display/display.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" namespace mojo { diff --git a/ui/mojo/geometry/BUILD.gn b/ui/mojo/geometry/BUILD.gn deleted file mode 100644 index b44586de90db8d..00000000000000 --- a/ui/mojo/geometry/BUILD.gn +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2014 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("interfaces") { - sources = [ - "geometry.mojom", - ] -} - -source_set("util") { - sources = [ - "geometry_util.h", - ] - - deps = [ - ":interfaces", - ] -} diff --git a/ui/mojo/geometry/mojo_bindings.gyp b/ui/mojo/geometry/mojo_bindings.gyp deleted file mode 100644 index 28e1c98b2966f6..00000000000000 --- a/ui/mojo/geometry/mojo_bindings.gyp +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2015 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. - -{ - 'targets': [ - { - # GN version: //ui/mojo/geometry - 'target_name': 'mojo_geometry_bindings_mojom', - 'type': 'none', - 'variables': { - 'mojom_files': [ - 'geometry.mojom', - ], - }, - 'includes': [ '../../../mojo/mojom_bindings_generator_explicit.gypi' ], - }, - { - 'target_name': 'mojo_geometry_bindings', - 'type': 'static_library', - 'dependencies': [ - 'mojo_geometry_bindings_mojom', - '../../../mojo/mojo_public.gyp:mojo_cpp_bindings', - ], - }, - ], -} diff --git a/ui/views/mus/BUILD.gn b/ui/views/mus/BUILD.gn index 3e9ce2319f7341..7fbf9963faea19 100644 --- a/ui/views/mus/BUILD.gn +++ b/ui/views/mus/BUILD.gn @@ -58,7 +58,6 @@ component("mus") { "//components/mus/gles2:lib", "//components/mus/public/cpp", "//components/mus/public/interfaces", - "//mojo/converters/geometry", "//mojo/converters/ime", "//mojo/converters/input_events", "//mojo/converters/surfaces", @@ -77,6 +76,7 @@ component("mus") { "//ui/events/devices", "//ui/gfx", "//ui/gfx/geometry", + "//ui/gfx/geometry/mojo", "//ui/gl", "//ui/mojo/display", "//ui/mojo/ime:interfaces_cpp_sources", diff --git a/ui/views/mus/native_widget_mus.cc b/ui/views/mus/native_widget_mus.cc index a732154a973ff0..b759b534f2eccb 100644 --- a/ui/views/mus/native_widget_mus.cc +++ b/ui/views/mus/native_widget_mus.cc @@ -17,7 +17,6 @@ #include "components/mus/public/interfaces/window_manager.mojom.h" #include "components/mus/public/interfaces/window_manager_constants.mojom.h" #include "components/mus/public/interfaces/window_tree.mojom.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "ui/aura/client/default_capture_client.h" #include "ui/aura/client/window_tree_client.h" #include "ui/aura/env.h" @@ -28,6 +27,7 @@ #include "ui/base/hit_test.h" #include "ui/events/event.h" #include "ui/gfx/canvas.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/gfx/path.h" #include "ui/native_theme/native_theme_aura.h" #include "ui/platform_window/platform_window_delegate.h" diff --git a/ui/views/mus/screen_mus.cc b/ui/views/mus/screen_mus.cc index 663b2f90dc13e4..07720cd6645f39 100644 --- a/ui/views/mus/screen_mus.cc +++ b/ui/views/mus/screen_mus.cc @@ -4,12 +4,12 @@ #include "ui/views/mus/screen_mus.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "services/shell/public/cpp/connection.h" #include "services/shell/public/cpp/connector.h" #include "ui/aura/window.h" #include "ui/display/display_finder.h" #include "ui/display/display_observer.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/mojo/display/display_type_converters.h" #include "ui/views/mus/screen_mus_delegate.h" #include "ui/views/mus/window_manager_frame_values.h" diff --git a/ui/views/mus/surface_binding.cc b/ui/views/mus/surface_binding.cc index a3dc98fb7304f2..a33f709c0cd4a8 100644 --- a/ui/views/mus/surface_binding.cc +++ b/ui/views/mus/surface_binding.cc @@ -24,10 +24,10 @@ #include "components/mus/public/cpp/window.h" #include "components/mus/public/cpp/window_tree_connection.h" #include "components/mus/public/interfaces/gpu.mojom.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/converters/surfaces/surfaces_type_converters.h" #include "mojo/public/cpp/bindings/binding.h" #include "services/shell/public/cpp/connector.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/views/mus/window_tree_host_mus.h" namespace views { diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc index a76ffa6ebd4ec8..e6280123a8e1d4 100644 --- a/ui/views/mus/window_manager_connection.cc +++ b/ui/views/mus/window_manager_connection.cc @@ -14,10 +14,10 @@ #include "components/mus/public/cpp/window_tree_connection.h" #include "components/mus/public/interfaces/event_matcher.mojom.h" #include "components/mus/public/interfaces/window_tree.mojom.h" -#include "mojo/converters/geometry/geometry_type_converters.h" #include "services/shell/public/cpp/connection.h" #include "services/shell/public/cpp/connector.h" #include "ui/events/devices/device_data_manager.h" +#include "ui/gfx/geometry/mojo/geometry_type_converters.h" #include "ui/views/mus/native_widget_mus.h" #include "ui/views/mus/screen_mus.h" #include "ui/views/pointer_watcher.h"