Update mojo sdk to rev cb6c5abfadfea0ca73dca466e2894554ac1ae144

R=brettw@chromium.org, erg@chromium.org, jamesr@chromium.org
TBR=jamesr@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#322083}

19 files changed, 48 insertions, 101 deletions

diff --git a/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn b/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn
index 7997908c..2b29c1a 100644
--- a/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/accessibility/public/interfaces/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
diff --git a/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn b/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn
index 7ac21d2..16fe33b 100644
--- a/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/clipboard/public/interfaces/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
diff --git a/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn b/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn
index 5016c65..77798ea 100644
--- a/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/content_handler/public/interfaces/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
diff --git a/third_party/mojo_services/src/geometry/public/cpp/BUILD.gn b/third_party/mojo_services/src/geometry/public/cpp/BUILD.gn
index c05b8d3..c527c93 100644
--- a/third_party/mojo_services/src/geometry/public/cpp/BUILD.gn
+++ b/third_party/mojo_services/src/geometry/public/cpp/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/mojo_sdk.gni")
 
 mojo_sdk_source_set("cpp") {
diff --git a/third_party/mojo_services/src/geometry/public/interfaces/BUILD.gn b/third_party/mojo_services/src/geometry/public/interfaces/BUILD.gn
index 4896add..9047ee2 100644
--- a/third_party/mojo_services/src/geometry/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/geometry/public/interfaces/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
diff --git a/third_party/mojo_services/src/gpu/public/interfaces/BUILD.gn b/third_party/mojo_services/src/gpu/public/interfaces/BUILD.gn
index 865f73e..ec061df 100644
--- a/third_party/mojo_services/src/gpu/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/gpu/public/interfaces/BUILD.gn
@@ -2,13 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
   sources = [
-    "context_provider.mojom",
     "command_buffer.mojom",
+    "context_provider.mojom",
     "gpu.mojom",
     "gpu_capabilities.mojom",
     "viewport_parameter_listener.mojom",
diff --git a/third_party/mojo_services/src/http_server/public/cpp/BUILD.gn b/third_party/mojo_services/src/http_server/public/cpp/BUILD.gn
index a24f006..4fca6c7 100644
--- a/third_party/mojo_services/src/http_server/public/cpp/BUILD.gn
+++ b/third_party/mojo_services/src/http_server/public/cpp/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/mojo_sdk.gni")
 
 mojo_sdk_source_set("cpp") {
diff --git a/third_party/mojo_services/src/http_server/public/interfaces/BUILD.gn b/third_party/mojo_services/src/http_server/public/interfaces/BUILD.gn
index 05eee62a..7fde891 100644
--- a/third_party/mojo_services/src/http_server/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/http_server/public/interfaces/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
diff --git a/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn b/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn
index e7a75f2..5ef09eb 100644
--- a/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/input_events/public/interfaces/BUILD.gn
@@ -2,13 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
   sources = [
-    "input_events.mojom",
     "input_event_constants.mojom",
+    "input_events.mojom",
     "input_key_codes.mojom",
   ]
 
diff --git a/third_party/mojo_services/src/input_events/public/interfaces/input_event_constants.mojom b/third_party/mojo_services/src/input_events/public/interfaces/input_event_constants.mojom
index f137fb3..b3e0ea1 100644
--- a/third_party/mojo_services/src/input_events/public/interfaces/input_event_constants.mojom
+++ b/third_party/mojo_services/src/input_events/public/interfaces/input_event_constants.mojom
@@ -4,50 +4,14 @@
 
 module mojo;
 
-// This mirrors ui::EventType
 enum EventType {
-  UNKNOWN ,
-  MOUSE_PRESSED,
-  MOUSE_DRAGGED,
-  MOUSE_RELEASED,
-  MOUSE_MOVED,
-  MOUSE_ENTERED,
-  MOUSE_EXITED,
+  UNKNOWN,
   KEY_PRESSED,
   KEY_RELEASED,
-  MOUSEWHEEL,
-  MOUSE_CAPTURE_CHANGED,
-  TOUCH_RELEASED,
-  TOUCH_PRESSED,
-  TOUCH_MOVED,
-  TOUCH_CANCELLED,
-  DROP_TARGET_EVENT,
-  TRANSLATED_KEY_PRESS,
-  TRANSLATED_KEY_RELEASE,
-  GESTURE_SCROLL_BEGIN,
-  GESTURE_SCROLL_END,
-  GESTURE_SCROLL_UPDATE,
-  GESTURE_TAP,
-  GESTURE_TAP_DOWN,
-  GESTURE_TAP_CANCEL,
-  GESTURE_TAP_UNCONFIRMED,
-  GESTURE_DOUBLE_TAP,
-  GESTURE_BEGIN,
-  GESTURE_END,
-  GESTURE_TWO_FINGER_TAP,
-  GESTURE_PINCH_BEGIN,
-  GESTURE_PINCH_END,
-  GESTURE_PINCH_UPDATE,
-  GESTURE_LONG_PRESS,
-  GESTURE_LONG_TAP,
-  GESTURE_SWIPE,
-  GESTURE_SHOW_PRESS,
-  GESTURE_WIN8_EDGE_SWIPE,
-  SCROLL,
-  SCROLL_FLING_START,
-  SCROLL_FLING_CANCEL,
-  CANCEL_MODE,
-  UMA_DATA
+  POINTER_CANCEL,
+  POINTER_DOWN,
+  POINTER_MOVE,
+  POINTER_UP,
 };
 
 // This mirrors ui::EventFlags
@@ -75,3 +39,8 @@ enum MouseEventFlags {
 
   // TODO(erg): Move accessibility flags and maybe synthetic touch events here.
 };
+
+enum PointerKind {
+  TOUCH,
+  MOUSE,
+};
diff --git a/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom b/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom
index 1cab579..0086265 100644
--- a/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom
+++ b/third_party/mojo_services/src/input_events/public/interfaces/input_events.mojom
@@ -8,11 +8,6 @@ import "geometry/public/interfaces/geometry.mojom";
 import "input_events/public/interfaces/input_event_constants.mojom";
 import "input_events/public/interfaces/input_key_codes.mojom";
 
-struct LocationData {
-  Point? in_view_location;
-  Point? screen_location;
-};
-
 struct KeyData {
   // The chromium event key code; these values are from the ui/ KeyCode enum,
   // which has the fun property of being neither consistently the Windows key
@@ -52,47 +47,30 @@ struct KeyData {
   uint16 unmodified_text;
 };
 
-struct TouchData {
+struct PointerData {
   int32 pointer_id;
-};
-
-struct GestureData {
-  // A bounding box for all the input events that contributed to this gesture.
-  RectF? bounding_box;
-
-  // GESTURE_SCROLL_UPDATE
-  float scroll_x;
-  float scroll_y;
-
-  // SCROLL_FLING_START
-  float velocity_x;
-  float velocity_y;
-
-  // GESTURE_PINCH_UPDATE
-  float scale;
-
-  // GESTURE_SWIPE
-  bool swipe_left;
-  bool swipe_right;
-  bool swipe_up;
-  bool swipe_down;
-
-  // GESTURE_TAP and GESTURE_TAP_UNCONFIRMED and GESTURE_DOUBLE_TAP
-  int32 tap_count;
-};
-
-struct MouseWheelData {
-  int32 x_offset;
-  int32 y_offset;
+  PointerKind kind;
+  // |x| and |y| are in the coordinate system of the View.
+  float x;
+  float y;
+  // |screen_x| and |screen_y| are in screen coordinates.
+  float screen_x;
+  float screen_y;
+  float pressure;
+  float radius_major;
+  float radius_minor;
+  float orientation;
+  // Used for devices that support wheels. Ranges from -1 to 1.
+  float horizontal_wheel;
+  float vertical_wheel;
 };
 
 struct Event {
+  // TODO(sky): rename to type.
   EventType action;
+  // TODO(sky): parts of this should move to PointerData.
   EventFlags flags;
   int64 time_stamp;
-  LocationData? location_data;
   KeyData? key_data;
-  TouchData? touch_data;
-  GestureData? gesture_data;
-  MouseWheelData? wheel_data;
+  PointerData? pointer_data;
 };
diff --git a/third_party/mojo_services/src/native_viewport/public/cpp/BUILD.gn b/third_party/mojo_services/src/native_viewport/public/cpp/BUILD.gn
index 035ddfa..855de71 100644
--- a/third_party/mojo_services/src/native_viewport/public/cpp/BUILD.gn
+++ b/third_party/mojo_services/src/native_viewport/public/cpp/BUILD.gn
@@ -2,13 +2,13 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/mojo_sdk.gni")
 
 mojo_sdk_source_set("args") {
   public_configs = [ "../../../public/build/config:mojo_services" ]
   sources = [
-    "lib/args.cc",
     "args.h",
+    "lib/args.cc",
   ]
 }
diff --git a/third_party/mojo_services/src/native_viewport/public/interfaces/BUILD.gn b/third_party/mojo_services/src/native_viewport/public/interfaces/BUILD.gn
index 0311564..86ff870 100644
--- a/third_party/mojo_services/src/native_viewport/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/native_viewport/public/interfaces/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
diff --git a/third_party/mojo_services/src/navigation/public/interfaces/BUILD.gn b/third_party/mojo_services/src/navigation/public/interfaces/BUILD.gn
index da9fc70..5141680 100644
--- a/third_party/mojo_services/src/navigation/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/navigation/public/interfaces/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
diff --git a/third_party/mojo_services/src/surfaces/public/cpp/BUILD.gn b/third_party/mojo_services/src/surfaces/public/cpp/BUILD.gn
index ddac4f3..9cf48b33 100644
--- a/third_party/mojo_services/src/surfaces/public/cpp/BUILD.gn
+++ b/third_party/mojo_services/src/surfaces/public/cpp/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/mojo_sdk.gni")
 
 mojo_sdk_source_set("cpp") {
diff --git a/third_party/mojo_services/src/surfaces/public/interfaces/BUILD.gn b/third_party/mojo_services/src/surfaces/public/interfaces/BUILD.gn
index 8350df8..7902a7a 100644
--- a/third_party/mojo_services/src/surfaces/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/surfaces/public/interfaces/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
diff --git a/third_party/mojo_services/src/view_manager/public/cpp/BUILD.gn b/third_party/mojo_services/src/view_manager/public/cpp/BUILD.gn
index d121021..189e827 100644
--- a/third_party/mojo_services/src/view_manager/public/cpp/BUILD.gn
+++ b/third_party/mojo_services/src/view_manager/public/cpp/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/mojo_sdk.gni")
 
 mojo_sdk_source_set("cpp") {
diff --git a/third_party/mojo_services/src/view_manager/public/interfaces/BUILD.gn b/third_party/mojo_services/src/view_manager/public/interfaces/BUILD.gn
index 69a454b..177066b 100644
--- a/third_party/mojo_services/src/view_manager/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/view_manager/public/interfaces/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {
diff --git a/third_party/mojo_services/src/window_manager/public/interfaces/BUILD.gn b/third_party/mojo_services/src/window_manager/public/interfaces/BUILD.gn
index 14b7d2c..b97f069 100644
--- a/third_party/mojo_services/src/window_manager/public/interfaces/BUILD.gn
+++ b/third_party/mojo_services/src/window_manager/public/interfaces/BUILD.gn
@@ -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("../../../mojo_sdk_root.gni")
+import("//build/module_args/mojo.gni")
 import("$mojo_sdk_root/mojo/public/tools/bindings/mojom.gni")
 
 mojom("interfaces") {