Target touches to the correct display.

ui/events/gestures/gesture_recognizer_impl.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_recognizer_impl.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "ui/events/event.h"
@@ skipping 60 matching lines @@
 
 GestureConsumer* GestureRecognizerImpl::GetTargetForGestureEvent(
     const GestureEvent& event) {
   GestureConsumer* target = NULL;
   int touch_id = event.GetLowestTouchId();
   target = touch_id_target_for_gestures_[touch_id];
   return target;
 }
 
 GestureConsumer* GestureRecognizerImpl::GetTargetForLocation(
-    const gfx::Point& location) {
+    const gfx::Point& location, int source_device_id) {
   const GesturePoint* closest_point = NULL;
   int64 closest_distance_squared = 0;
   std::map<GestureConsumer*, GestureSequence*>::iterator i;
   for (i = consumer_sequence_.begin(); i != consumer_sequence_.end(); ++i) {
     const GesturePoint* points = i->second->points();
     for (int j = 0; j < GestureSequence::kMaxGesturePoints; ++j) {
-      if (!points[j].in_use())
+      if (!points[j].in_use() ||
+          source_device_id != points[j].source_device_id()) {
         continue;
+      }
       gfx::Vector2d delta = points[j].last_touch_position() - location;
       // Relative distance is all we need here, so LengthSquared() is
       // appropriate, and cheaper than Length().
       int64 distance_squared = delta.LengthSquared();
       if (!closest_point || distance_squared < closest_distance_squared) {
         closest_point = &points[j];
         closest_distance_squared = distance_squared;
       }
     }
   }
@@ skipping 164 matching lines @@
 
 static GestureRecognizerImpl* g_gesture_recognizer_instance = NULL;
 
 // GestureRecognizer, static
 GestureRecognizer* GestureRecognizer::Get() {
   if (!g_gesture_recognizer_instance)
     g_gesture_recognizer_instance = new GestureRecognizerImpl();
   return g_gesture_recognizer_instance;
 }
 
+// GestureRecognizer, static
+void GestureRecognizer::Reset() {
+  g_gesture_recognizer_instance = NULL;
+}
+
 void SetGestureRecognizerForTesting(GestureRecognizer* gesture_recognizer) {
   // Transfer helpers to the new GR.
   std::vector<GestureEventHelper*>& helpers =
       g_gesture_recognizer_instance->helpers();
   std::vector<GestureEventHelper*>::iterator it;
   for (it = helpers.begin(); it != helpers.end(); ++it)
     gesture_recognizer->AddGestureEventHelper(*it);
 
   helpers.clear();
   g_gesture_recognizer_instance =
       static_cast<GestureRecognizerImpl*>(gesture_recognizer);
 }
 
 }  // namespace ui