Fix multi-finger click no entry bug in TouchExplorationController

ui/chromeos/touch_exploration_controller.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/chromeos/touch_exploration_controller.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/window.h"
@@ skipping 217 matching lines @@
 
 ui::EventRewriteStatus TouchExplorationController::InDoubleTapPressed(
     const ui::TouchEvent& event, scoped_ptr<ui::Event>* rewritten_event) {
   const ui::EventType type = event.type();
   if (type == ui::ET_TOUCH_PRESSED) {
     return ui::EVENT_REWRITE_DISCARD;
   } else if (type == ui::ET_TOUCH_RELEASED || type == ui::ET_TOUCH_CANCELLED) {
     if (current_touch_ids_.size() != 0)
       return EVENT_REWRITE_DISCARD;
 
-    // Rewrite at location of last touch exploration.
+    // Rewrite release at location of last touch exploration with the same
+    // id as the prevoius press.
     rewritten_event->reset(
         new ui::TouchEvent(ui::ET_TOUCH_RELEASED,
                            last_touch_exploration_->location(),
-                           event.touch_id(),
+                           initial_press_->touch_id(),
                            event.time_stamp()));
     (*rewritten_event)->set_flags(event.flags());
     ResetToNoFingersDown();
     return ui::EVENT_REWRITE_REWRITTEN;
   } else if (type == ui::ET_TOUCH_MOVED) {
     return ui::EVENT_REWRITE_DISCARD;
   }
   NOTREACHED() << "Unexpected event type received.";
   return ui::EVENT_REWRITE_CONTINUE;
 }
@@ skipping 93 matching lines @@
       state_ = DOUBLE_TAP_PRESSED;
       VLOG_STATE();
       return EVENT_REWRITE_DISCARD;
     }
 
     // Continue to release the touch only if the touch explore finger is the
     // only finger remaining.
     if (current_touch_ids_.size() != 1)
       return EVENT_REWRITE_DISCARD;
 
+    // Continue to release the touch only if the touch explore finger is the
+    // only finger remaining.
+    if (current_touch_ids_.size() != 1)
+      return EVENT_REWRITE_DISCARD;
+
     // Rewrite at location of last touch exploration.
     rewritten_event->reset(
         new ui::TouchEvent(ui::ET_TOUCH_RELEASED,
                            last_touch_exploration_->location(),
                            initial_press_->touch_id(),
                            event.time_stamp()));
     (*rewritten_event)->set_flags(event.flags());
     state_ = TOUCH_EXPLORATION;
     VLOG_STATE();
     return ui::EVENT_REWRITE_REWRITTEN;
@@ skipping 73 matching lines @@
   CHECK(touch_event.IsTouchEvent());
   if (prev_event_ == NULL || prev_event_->type() != touch_event.type() ||
       prev_event_->touch_id() != touch_event.touch_id()) {
     const std::string type = EnumEventTypeToString(touch_event.type());
     const gfx::PointF& location = touch_event.location_f();
     const int touch_id = touch_event.touch_id();
 
     VLOG(0) << "\n Function name: " << function_name
             << "\n Event Type: " << type
             << "\n Location: " << location.ToString()
-            << "\n Touch ID: " << touch_id;
+            << "\n Touch ID: " << touch_id
+            << "\n Number of fingers down: " << current_touch_ids_.size();
     prev_event_.reset(new TouchEvent(touch_event));
   }
 }
 
 const char* TouchExplorationController::EnumStateToString(State state) {
   switch (state) {
     case NO_FINGERS_DOWN:
       return "NO_FINGERS_DOWN";
     case SINGLE_TAP_PRESSED:
       return "SINGLE_TAP_PRESSED";
@@ skipping 23 matching lines @@
     case ET_TOUCH_MOVED:
       return "ET_TOUCH_MOVED";
     case ET_TOUCH_CANCELLED:
       return "ET_TOUCH_CANCELLED";
     default:
       return base::IntToString(type);
   }
 }
 
 }  // namespace ui