aura: Allow held touch-events to contribute to gesture events.

ui/aura/window_event_dispatcher.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/aura/window_event_dispatcher.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 452 matching lines @@
   DispatchDetails details;
   if (!target || 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) {
-    // Do not let 'held' touch events contribute to any gestures.
-    if (!held_move_event_ || !held_move_event_->IsTouchEvent()) {
+    // Do not let 'held' touch events contribute to any gestures unless it is
+    // being dispatched.
+    if (dispatching_held_event_ || !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());
     }
   }
@@ skipping 356 matching lines @@
       break;
 
     default:
       NOTREACHED();
       break;
   }
   PreDispatchLocatedEvent(target, event);
 }
 
 }  // namespace aura