Move mojo/converters/geometry -> ui/gfx/geometry/mojo

R=sky@chromium.org TBR=tsepez@chromium.org BUG= Review-Url: https://codereview.chromium.org/2009073003 Cr-Commit-Position: refs/heads/master@{#396128}
marcosholgado · May 26, 2016 · 7a77e85 · 7a77e85
1 parent fa4dc03
commit 7a77e85
Show file tree

Hide file tree

Showing 105 changed files with 195 additions and 193 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {