From 7d7986a993f9b49c38597d39b2f75fa3fee362c3 Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Mon, 21 Sep 2015 17:03:13 -0700
Subject: [PATCH] Remove uses of sky.GestureEvent

---
 .../sky/lib/src/rendering/sky_binding.dart    |  2 --
 .../sky/lib/src/widgets/ink_well.dart         | 12 ++++++----
 .../sky/lib/src/widgets/scrollable.dart       |  2 +-
 sky/unit/test/engine/mock_events.dart         | 23 -------------------
 4 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/sky/packages/sky/lib/src/rendering/sky_binding.dart b/sky/packages/sky/lib/src/rendering/sky_binding.dart
index 3ab1cd5d8cd..971de744284 100644
--- a/sky/packages/sky/lib/src/rendering/sky_binding.dart
+++ b/sky/packages/sky/lib/src/rendering/sky_binding.dart
@@ -96,8 +96,6 @@ class SkyBinding extends HitTestTarget {
   void _handleEvent(sky.Event event) {
     if (event is sky.PointerEvent) {
       _handlePointerEvent(event);
-    } else if (event is sky.GestureEvent) {
-      dispatchEvent(event, hitTest(new Point(event.x, event.y)));
     } else {
       for (EventListener listener in _eventListeners)
         listener(event);
diff --git a/sky/packages/sky/lib/src/widgets/ink_well.dart b/sky/packages/sky/lib/src/widgets/ink_well.dart
index 61447345a58..d4096d09525 100644
--- a/sky/packages/sky/lib/src/widgets/ink_well.dart
+++ b/sky/packages/sky/lib/src/widgets/ink_well.dart
@@ -82,13 +82,15 @@ class RenderInkWell extends RenderProxyBox {
   final List<InkSplash> _splashes = new List<InkSplash>();
 
   void handleEvent(sky.Event event, BoxHitTestEntry entry) {
-    if (event is sky.GestureEvent) {
+    // TODO(abarth): We should trigger these effects based on gestures.
+    // https://github.com/flutter/engine/issues/1271
+    if (event is sky.PointerEvent) {
       switch (event.type) {
-        case 'gesturetapdown':
-          _startSplash(event.primaryPointer, entry.localPosition);
+        case 'pointerdown':
+          _startSplash(event.pointer, entry.localPosition);
           break;
-        case 'gesturetap':
-          _confirmSplash(event.primaryPointer);
+        case 'pointerup':
+          _confirmSplash(event.pointer);
           break;
       }
     }
diff --git a/sky/packages/sky/lib/src/widgets/scrollable.dart b/sky/packages/sky/lib/src/widgets/scrollable.dart
index 52724be2c25..933af0f7e4f 100644
--- a/sky/packages/sky/lib/src/widgets/scrollable.dart
+++ b/sky/packages/sky/lib/src/widgets/scrollable.dart
@@ -19,7 +19,7 @@ import 'package:sky/src/widgets/mixed_viewport.dart';
 
 export 'package:sky/src/widgets/mixed_viewport.dart' show MixedViewportLayoutState;
 
-// The GestureEvent velocity properties are pixels/second, config min,max limits are pixels/ms
+// The gesture velocity properties are pixels/second, config min,max limits are pixels/ms
 const double _kMillisecondsPerSecond = 1000.0;
 const double _kMinFlingVelocity = -kMaxFlingVelocity * _kMillisecondsPerSecond;
 const double _kMaxFlingVelocity = kMaxFlingVelocity * _kMillisecondsPerSecond;
diff --git a/sky/unit/test/engine/mock_events.dart b/sky/unit/test/engine/mock_events.dart
index c7feb148eda..184fa8f0e8a 100644
--- a/sky/unit/test/engine/mock_events.dart
+++ b/sky/unit/test/engine/mock_events.dart
@@ -59,29 +59,6 @@ class TestPointerEvent extends sky.PointerEvent {
   double tilt;
 }
 
-class TestGestureEvent extends sky.GestureEvent {
-  TestGestureEvent({
-    this.type,
-    this.primaryPointer,
-    this.x,
-    this.y,
-    this.dx,
-    this.dy,
-    this.velocityX,
-    this.velocityY
-  });
-
-  // These are all of the GestureEvent members, but not all of Event.
-  String type;
-  int primaryPointer;
-  double x;
-  double y;
-  double dx;
-  double dy;
-  double velocityX;
-  double velocityY;
-}
-
 class TestPointer {
   TestPointer([ this.pointer = 1 ]);