Revert "Move geometry to mojo/services, extract input events to their own mojom"

Suspected to break compile step:
http://build.chromium.org/p/chromium/builders/Linux/builds/50125/steps/compile/logs/stdio#error1
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Mac/builds/18148/steps/compile/logs/stdio#error1

> Move geometry to mojo/services, extract input events to their own mojom
>
> R=sky@chromium.org
> TBR=sky@chromium.org
> http://crbug.com/365012
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=273161

TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/304673002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273172 0039d316-1c4b-4281-b951-d872f2087c98

18 files changed, 70 insertions, 98 deletions

diff --git a/mojo/aura/window_tree_host_mojo.cc b/mojo/aura/window_tree_host_mojo.cc
index 477ebd8..2abc5f7 100644
--- a/mojo/aura/window_tree_host_mojo.cc
+++ b/mojo/aura/window_tree_host_mojo.cc
@@ -5,9 +5,9 @@
 #include "mojo/aura/window_tree_host_mojo.h"
 
 #include "mojo/aura/context_factory_mojo.h"
+#include "mojo/geometry/geometry_type_converters.h"
 #include "mojo/public/c/gles2/gles2.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
-#include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc
index 583f4e9..c225fae 100644
--- a/mojo/examples/compositor_app/compositor_app.cc
+++ b/mojo/examples/compositor_app/compositor_app.cc
@@ -8,13 +8,13 @@
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/examples/compositor_app/compositor_host.h"
+#include "mojo/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/application/application.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/gles2/gles2.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
-#include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "ui/gfx/rect.h"
 
 #if defined(WIN32)
diff --git a/mojo/services/public/cpp/geometry/DEPS b/mojo/geometry/DEPS
index 194be1c..194be1c 100644
--- a/mojo/services/public/cpp/geometry/DEPS
+++ b/mojo/geometry/DEPS
diff --git a/mojo/services/public/cpp/geometry/lib/geometry_type_converters.cc b/mojo/geometry/geometry_type_converters.cc
index 1111744..b01d249 100644
--- a/mojo/services/public/cpp/geometry/lib/geometry_type_converters.cc
+++ b/mojo/geometry/geometry_type_converters.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 "mojo/services/public/cpp/geometry/geometry_type_converters.h"
+#include "mojo/geometry/geometry_type_converters.h"
 
 namespace mojo {
 
diff --git a/mojo/services/public/cpp/geometry/geometry_type_converters.h b/mojo/geometry/geometry_type_converters.h
index e99d9f5e..3905e76 100644
--- a/mojo/services/public/cpp/geometry/geometry_type_converters.h
+++ b/mojo/geometry/geometry_type_converters.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_
-#define MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_
+#ifndef MOJO_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_
+#define MOJO_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_
 
-#include "mojo/services/public/cpp/geometry/mojo_geometry_export.h"
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
+#include "mojo/geometry/mojo_geometry_export.h"
+#include "mojo/public/interfaces/geometry/geometry.mojom.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mojo {
@@ -40,4 +40,4 @@ class MOJO_GEOMETRY_EXPORT TypeConverter<Rect, gfx::Rect> {
 
 }  // namespace mojo
 
-#endif  // MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_
+#endif  // MOJO_GEOMETRY_GEOMETRY_TYPE_CONVERTERS_H_
diff --git a/mojo/services/public/cpp/geometry/mojo_geometry_export.h b/mojo/geometry/mojo_geometry_export.h
index f21aebce..a6e64ce 100644
--- a/mojo/services/public/cpp/geometry/mojo_geometry_export.h
+++ b/mojo/geometry/mojo_geometry_export.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_MOJO_GEOMETRY_EXPORT_H_
-#define MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_MOJO_GEOMETRY_EXPORT_H_
+#ifndef MOJO_GEOMETRY_MOJO_GEOMETRY_EXPORT_H_
+#define MOJO_GEOMETRY_MOJO_GEOMETRY_EXPORT_H_
 
 #if defined(COMPONENT_BUILD)
 
@@ -29,4 +29,4 @@
 #define MOJO_GEOMETRY_EXPORT
 #endif
 
-#endif  // MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_MOJO_GEOMETRY_EXPORT_H_
+#endif  // MOJO_GEOMETRY_MOJO_GEOMETRY_EXPORT_H_
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index e8cb08c..5bbe9bf 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -456,6 +456,23 @@
       ],
     },
     {
+      'target_name': 'mojo_geometry_lib',
+      'type': '<(component)',
+      'defines': [
+        'MOJO_GEOMETRY_IMPLEMENTATION',
+      ],
+      'dependencies': [
+        '../ui/gfx/gfx.gyp:gfx_geometry',
+        'mojo_environment_chromium',
+        'mojo_geometry_bindings',
+        'mojo_system_impl',
+      ],
+      'sources': [
+        'geometry/geometry_type_converters.cc',
+        'geometry/geometry_type_converters.h',
+      ],
+    },
+    {
       'target_name': 'mojo_shell_lib',
       'type': 'static_library',
       'dependencies': [
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index c2b2b73..1caa854 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -350,6 +350,23 @@
       ],
     },
     {
+      'target_name': 'mojo_geometry_bindings',
+      'type': 'static_library',
+      'sources': [
+        'public/interfaces/geometry/geometry.mojom',
+      ],
+      'variables': {
+        'mojom_base_output_dir': 'mojo',
+      },
+      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
+      'dependencies': [
+        'mojo_cpp_bindings',
+      ],
+      'export_dependent_settings': [
+        'mojo_cpp_bindings',
+      ],
+    },
+    {
       'target_name': 'mojo_service_provider_bindings',
       'type': 'static_library',
       'sources': [
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 599a28f..b053605 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -18,57 +18,6 @@
       ],
     },
     {
-      'target_name': 'mojo_input_events_bindings',
-      'type': 'static_library',
-      'sources': [
-        'services/public/interfaces/input_events/input_events.mojom',
-      ],
-      'variables': {
-        'mojom_base_output_dir': 'mojo',
-      },
-      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-      'dependencies': [
-        'mojo_cpp_bindings',
-      ],
-    },
-    {
-      'target_name': 'mojo_geometry_bindings',
-      'type': 'static_library',
-      'sources': [
-        'services/public/interfaces/geometry/geometry.mojom',
-      ],
-      'variables': {
-        'mojom_base_output_dir': 'mojo',
-      },
-      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
-      'dependencies': [
-        'mojo_cpp_bindings',
-      ],
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-    },
-    {
-      'target_name': 'mojo_geometry_lib',
-      'type': '<(component)',
-      'defines': [
-        'MOJO_GEOMETRY_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_environment_chromium',
-        'mojo_geometry_bindings',
-        'mojo_system_impl',
-      ],
-      'sources': [
-        'services/public/cpp/geometry/lib/geometry_type_converters.cc',
-        'services/public/cpp/geometry/geometry_type_converters.h',
-      ],
-    },
-    {
       'target_name': 'mojo_gles2_bindings',
       'type': 'static_library',
       'sources': [
@@ -124,7 +73,6 @@
       ],
       'dependencies': [
         'mojo_geometry_bindings',
-        'mojo_input_events_bindings',
         'mojo_cpp_bindings',
       ],
     },
diff --git a/mojo/services/public/interfaces/geometry/geometry.mojom b/mojo/public/interfaces/geometry/geometry.mojom
index 3e7490f..3e7490f 100644
--- a/mojo/services/public/interfaces/geometry/geometry.mojom
+++ b/mojo/public/interfaces/geometry/geometry.mojom
diff --git a/mojo/services/native_viewport/DEPS b/mojo/services/native_viewport/DEPS
index 739d17f..b5edc8b 100644
--- a/mojo/services/native_viewport/DEPS
+++ b/mojo/services/native_viewport/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+mojo/services/public/cpp/geometry",
+  "+mojo/geometry",
   "+mojo/services/gles2",
   "+ui/events",
   "+ui/gfx",
diff --git a/mojo/services/native_viewport/native_viewport.mojom b/mojo/services/native_viewport/native_viewport.mojom
index 5535da1..8e0edb55 100644
--- a/mojo/services/native_viewport/native_viewport.mojom
+++ b/mojo/services/native_viewport/native_viewport.mojom
@@ -2,11 +2,28 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import "../public/interfaces/geometry/geometry.mojom"
-import "../public/interfaces/input_events/input_events.mojom"
+import "../../public/interfaces/geometry/geometry.mojom"
 
 module mojo {
 
+struct KeyData {
+  int32 key_code;
+  bool is_char;
+};
+
+struct TouchData {
+  int32 pointer_id;
+};
+
+struct Event {
+  int32 action;
+  int32 flags;
+  int64 time_stamp;
+  Point location;
+  KeyData key_data;
+  TouchData touch_data;
+};
+
 [Client=NativeViewportClient]
 interface NativeViewport {
   Create(Rect bounds);
diff --git a/mojo/services/native_viewport/native_viewport_service.cc b/mojo/services/native_viewport/native_viewport_service.cc
index f90cef3..b9c5a82 100644
--- a/mojo/services/native_viewport/native_viewport_service.cc
+++ b/mojo/services/native_viewport/native_viewport_service.cc
@@ -7,12 +7,12 @@
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
+#include "mojo/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/services/gles2/command_buffer_impl.h"
 #include "mojo/services/native_viewport/native_viewport.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
-#include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "ui/events/event.h"
 
 namespace mojo {
diff --git a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h
index 73a75ae..71200d0 100644
--- a/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h
+++ b/mojo/services/public/cpp/view_manager/lib/view_manager_synchronizer.h
@@ -9,7 +9,7 @@
 #include "base/callback.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
-#include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
+#include "mojo/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_types.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"
 
diff --git a/mojo/services/public/interfaces/input_events/input_events.mojom b/mojo/services/public/interfaces/input_events/input_events.mojom
deleted file mode 100644
index 255fe28..0000000
--- a/mojo/services/public/interfaces/input_events/input_events.mojom
+++ /dev/null
@@ -1,27 +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 "../geometry/geometry.mojom"
-
-module mojo {
-
-struct KeyData {
-  int32 key_code;
-  bool is_char;
-};
-
-struct TouchData {
-  int32 pointer_id;
-};
-
-struct Event {
-  int32 action;
-  int32 flags;
-  int64 time_stamp;
-  Point location;
-  KeyData key_data;
-  TouchData touch_data;
-};
-
-}
diff --git a/mojo/services/public/interfaces/view_manager/view_manager.mojom b/mojo/services/public/interfaces/view_manager/view_manager.mojom
index d63f7ca..e5bab6d 100644
--- a/mojo/services/public/interfaces/view_manager/view_manager.mojom
+++ b/mojo/services/public/interfaces/view_manager/view_manager.mojom
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import "../geometry/geometry.mojom"
+import "../../../../public/interfaces/geometry/geometry.mojom"
 
 module mojo.view_manager {
 
diff --git a/mojo/services/view_manager/view_manager_connection.cc b/mojo/services/view_manager/view_manager_connection.cc
index 498dc39..12dfe93 100644
--- a/mojo/services/view_manager/view_manager_connection.cc
+++ b/mojo/services/view_manager/view_manager_connection.cc
@@ -5,8 +5,8 @@
 #include "mojo/services/view_manager/view_manager_connection.h"
 
 #include "base/stl_util.h"
+#include "mojo/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
-#include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/view_manager/node.h"
 #include "mojo/services/view_manager/root_node_manager.h"
 #include "mojo/services/view_manager/view.h"
diff --git a/mojo/services/view_manager/view_manager_connection_unittest.cc b/mojo/services/view_manager/view_manager_connection_unittest.cc
index 7153ed4..5945f30 100644
--- a/mojo/services/view_manager/view_manager_connection_unittest.cc
+++ b/mojo/services/view_manager/view_manager_connection_unittest.cc
@@ -11,10 +11,10 @@
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/common/common_type_converters.h"
+#include "mojo/geometry/geometry_type_converters.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/public/cpp/bindings/allocation_scope.h"
 #include "mojo/public/cpp/environment/environment.h"
-#include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
 #include "mojo/services/public/cpp/view_manager/view_manager_types.h"
 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h"