Remove ui::TouchEvent -> blink::WebTouchEvent conversion methods.

ui/events/gestures/gesture_provider_aura.cc

 // 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.
 
 #include "ui/events/gestures/gesture_provider_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "ui/events/event.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 #include "ui/events/gesture_detection/gesture_event_data.h"
 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"
 
 namespace ui {
 
 GestureProviderAura::GestureProviderAura(GestureProviderAuraClient* client)
     : client_(client),
       filtered_gesture_provider_(
           GetGestureProviderConfig(GestureProviderConfigType::CURRENT_PLATFORM),
           this),
       handling_event_(false),
       last_unique_touch_event_id_(
           std::numeric_limits<unsigned long long>::max()) {
   filtered_gesture_provider_.SetDoubleTapSupportForPlatformEnabled(false);
 }
 
 GestureProviderAura::~GestureProviderAura() {}
 
 bool GestureProviderAura::OnTouchEvent(TouchEvent* event) {
-  DCHECK(event);
   last_unique_touch_event_id_ = event->unique_event_id();

[jdduke (slow), 2015/01/05 22:35:14]

Should we only update these if |pointer_state_.OnTouch| succeeds?

[tdresser, 2015/01/06 14:20:16]

The latency info should definitely only be set if OnTouch succeeds.

We get a slightly stricter condition on synchronous acks if we always set the
unique_touch_id, but it's probably clearer to only update both fields if OnTouch
succeeds. Done.

-  int index = pointer_state_.FindPointerIndexOfId(event->touch_id());
-  bool pointer_id_is_active = index != -1;
-
-  if (event->type() == ET_TOUCH_PRESSED && pointer_id_is_active) {
-    // Ignore touch press events if we already believe the pointer is down.
+  last_touch_event_latency_info_ = *event->latency();
+  if (!pointer_state_.OnTouch(*event))
     return false;
-  } else if (event->type() != ET_TOUCH_PRESSED && !pointer_id_is_active) {
-    // We could have an active touch stream transfered to us, resulting in touch
-    // move or touch up events without associated touch down events. Ignore
-    // them.
-    return false;
-  }
-
-  // If this is a touchmove event, and it isn't different from the last
-  // event, ignore it.
-  if (event->type() == ET_TOUCH_MOVED &&
-      event->x() == pointer_state_.GetX(index) &&
-      event->y() == pointer_state_.GetY(index)) {
-    return false;
-  }
-
-  last_touch_event_latency_info_ = *event->latency();
-  pointer_state_.OnTouch(*event);
 
   auto result = filtered_gesture_provider_.OnTouchEvent(pointer_state_);
   if (!result.succeeded)
     return false;
 
   event->set_may_cause_scrolling(result.did_generate_scroll);
   pointer_state_.CleanupRemovedTouchPoints(*event);
   return true;
 }
 
@@ skipping 85 matching lines @@
   float double_tap_slop_square =
       GestureConfiguration::GetInstance()
           ->max_distance_between_taps_for_double_tap();
   double_tap_slop_square *= double_tap_slop_square;
   const float delta_x = previous_tap.x - current_tap.x;
   const float delta_y = previous_tap.y - current_tap.y;
   return (delta_x * delta_x + delta_y * delta_y < double_tap_slop_square);
 }
 
 }  // namespace content