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

mojo/services/native_viewport/native_viewport.mojom

Index: mojo/services/native_viewport/native_viewport.mojom
diff --git a/mojo/services/native_viewport/native_viewport.mojom b/mojo/services/native_viewport/native_viewport.mojom
index 5535da1d1bedee31e8d96e22f7b3c1f9e9f9daba..8e0edb559bbd51635a75401db316827930d96bc3 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);