aura: Fix a couple of issues related to held touch events.

ui/aura/root_window.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/aura/root_window.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 607 matching lines @@
   DispatchDetails details;
   if (target != event_dispatch_target_)
     details.target_destroyed = true;
   event_dispatch_target_ = old_dispatch_target_;
   old_dispatch_target_ = NULL;
 #ifndef NDEBUG
   DCHECK(!event_dispatch_target_ || window()->Contains(event_dispatch_target_));
 #endif
 
   if (event.IsTouchEvent() && !details.target_destroyed) {
-    ui::TouchEvent orig_event(static_cast<const ui::TouchEvent&>(event),
-                              static_cast<Window*>(event.target()), window());
-    // Get the list of GestureEvents from GestureRecognizer.
-    scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
-    gestures.reset(ui::GestureRecognizer::Get()->
-        ProcessTouchEventForGesture(orig_event, event.result(),
-                                    static_cast<Window*>(target)));
-    return ProcessGestures(gestures.get());
+    // Do not let 'held' touch events contribute to any gestures.
+    if (!held_move_event_ || !held_move_event_->IsTouchEvent()) {
+      ui::TouchEvent orig_event(static_cast<const ui::TouchEvent&>(event),
+                                static_cast<Window*>(event.target()), window());
+      // Get the list of GestureEvents from GestureRecognizer.
+      scoped_ptr<ui::GestureRecognizer::Gestures> gestures;
+      gestures.reset(ui::GestureRecognizer::Get()->
+          ProcessTouchEventForGesture(orig_event, event.result(),
+                                      static_cast<Window*>(target)));
+      return ProcessGestures(gestures.get());
+    }
   }
 
   return details;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindow, ui::GestureEventHelper implementation:
 
 bool RootWindow::CanDispatchToConsumer(ui::GestureConsumer* consumer) {
   Window* consumer_window = ConsumerToWindow(consumer);;
@@ skipping 108 matching lines @@
   return this;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindow, private:
 
 ui::EventDispatchDetails RootWindow::OnHostMouseEventImpl(
     ui::MouseEvent* event) {
   if (IsEventCandidateForHold(*event)) {
     if (move_hold_count_) {
-      Window* null_window = static_cast<Window*>(NULL);
-      held_move_event_.reset(
-          new ui::MouseEvent(*event, null_window, null_window));
+      held_move_event_.reset(new ui::MouseEvent(*event));
       event->SetHandled();
       return DispatchDetails();
     } else {
       // We may have a held event for a period between the time move_hold_count_
       // fell to 0 and the DispatchHeldEvents executes. Since we're going to
       // dispatch the new event directly below, we can reset the old one.
       held_move_event_.reset();
     }
   }
   DispatchDetails details = DispatchHeldEvents();
@@ skipping 216 matching lines @@
         break;
       // fallthrough
     case ui::ET_TOUCH_RELEASED:
       touch_ids_down_ = (touch_ids_down_ | (1 << event->touch_id())) ^
             (1 << event->touch_id());
       Env::GetInstance()->set_touch_down(touch_ids_down_ != 0);
       break;
 
     case ui::ET_TOUCH_MOVED:
       if (move_hold_count_) {
-        held_move_event_.reset(new ui::TouchEvent(*event));
+        held_move_event_.reset(new ui::TouchEvent(*event, target, window()));
         event->SetHandled();
         return;
       }
       break;
 
     default:
       NOTREACHED();
       break;
   }
   PreDispatchLocatedEvent(target, event);
 }
 
 }  // namespace aura