Revert 243974 "Target touches to the correct display."

trunk/src/ui/events/gestures/gesture_point.cc

 // Copyright (c) 2012 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_point.h"
 
 #include <cmath>
 
 #include "base/basictypes.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gestures/gesture_configuration.h"
 #include "ui/events/gestures/gesture_types.h"
 #include "ui/events/gestures/gesture_util.h"
 
 namespace ui {
 
 GesturePoint::GesturePoint()
     : first_touch_time_(0.0),
       second_last_touch_time_(0.0),
       last_touch_time_(0.0),
       second_last_tap_time_(0.0),
       last_tap_time_(0.0),
       velocity_calculator_(
           GestureConfiguration::points_buffered_for_velocity()),
       point_id_(-1),
-      touch_id_(-1),
-      source_device_id_(-1) {
+      touch_id_(-1) {
 }
 
 GesturePoint::~GesturePoint() {}
 
 void GesturePoint::Reset() {
   first_touch_time_ = second_last_touch_time_ = last_touch_time_ = 0.0;
   ResetVelocity();
   point_id_ = -1;
   clear_enclosing_rectangle();
-  source_device_id_ = -1;
 }
 
 void GesturePoint::ResetVelocity() {
   velocity_calculator_.ClearHistory();
   same_direction_count_ = gfx::Vector2d();
 }
 
 gfx::Vector2d GesturePoint::ScrollDelta() const {
   return last_touch_position_ - second_last_touch_position_;
 }
@@ skipping 174 matching lines @@
                  event.location().y() - radius,
                  radius * 2,
                  radius * 2);
   if (IsInClickWindow(event))
     enclosing_rect_.Union(rect);
   else
     enclosing_rect_ = rect;
 }
 
 }  // namespace ui