Fix issues related to a continuous event getting coalesced with a discrete event.

content/renderer/input/main_thread_event_queue.h

 // Copyright 2016 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.
 
 #ifndef CONTENT_RENDERER_INPUT_MAIN_THREAD_EVENT_QUEUE_H_
 #define CONTENT_RENDERER_INPUT_MAIN_THREAD_EVENT_QUEUE_H_
 
 #include <deque>
 #include "base/feature_list.h"
 #include "content/common/content_export.h"
 #include "content/common/input/event_with_latency_info.h"
 #include "content/common/input/input_event_ack_state.h"
 #include "content/common/input/input_event_dispatch_type.h"
 #include "content/common/input/web_input_event_queue.h"
 #include "content/public/common/content_features.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "third_party/WebKit/public/platform/scheduler/renderer/renderer_scheduler.h"
 #include "ui/events/blink/web_input_event_traits.h"
 #include "ui/events/latency_info.h"
 
 namespace content {
 
 class EventWithDispatchType : public ScopedWebInputEventWithLatencyInfo {
  public:
   EventWithDispatchType(ui::ScopedWebInputEvent event,
                         const ui::LatencyInfo& latency,
                         InputEventDispatchType dispatch_type);
   ~EventWithDispatchType();
-  bool CanCoalesceWith(const EventWithDispatchType& other) const
-      WARN_UNUSED_RESULT;
   void CoalesceWith(const EventWithDispatchType& other);
 
-  const std::deque<uint32_t>& coalescedEventIds() const {
-    return coalesced_event_ids_;
+  const std::deque<uint32_t>& blockingCoalescedEventIds() const {
+    return blocking_coalesced_event_ids_;
   }
   InputEventDispatchType dispatchType() const { return dispatch_type_; }
   base::TimeTicks creationTimestamp() const { return creation_timestamp_; }
   base::TimeTicks lastCoalescedTimestamp() const {
     return last_coalesced_timestamp_;
   }
 
+  size_t coalescedCount() const {
+    return non_blocking_coalesced_count_ + blocking_coalesced_event_ids_.size();
+  }
+
  private:
   InputEventDispatchType dispatch_type_;
 
-  // |coalesced_event_ids_| contains the unique touch event ids to be acked. If
+  // Contains the unique touch event ids to be acked. If
   // the events are not TouchEvents the values will be 0. More importantly for
   // those cases the deque ends up containing how many additional ACKs
   // need to be sent.
-  std::deque<uint32_t> coalesced_event_ids_;
+  std::deque<uint32_t> blocking_coalesced_event_ids_;
+  // Contains the number of non-blocking events coalesced.
+  size_t non_blocking_coalesced_count_;
   base::TimeTicks creation_timestamp_;
   base::TimeTicks last_coalesced_timestamp_;
 };
 
 class CONTENT_EXPORT MainThreadEventQueueClient {
  public:
   // Handle an |event| that was previously queued (possibly
   // coalesced with another event) to the |routing_id|'s
   // channel. Implementors must implement this callback.
   virtual void HandleEventOnMainThread(
@@ skipping 74 matching lines @@
   void SendEventNotificationToMainThread();
   void DispatchSingleEvent();
   void DispatchInFlightEvent();
   void PossiblyScheduleMainFrame();
 
   void SendEventToMainThread(const blink::WebInputEvent* event,
                              const ui::LatencyInfo& latency,
                              InputEventDispatchType original_dispatch_type);
 
   bool IsRafAlignedInputDisabled();
-  bool IsRafAlignedEvent(const std::unique_ptr<EventWithDispatchType>& event);
+  bool IsRafAlignedEvent(const blink::WebInputEvent& event);
 
   friend class MainThreadEventQueueTest;
   int routing_id_;
   MainThreadEventQueueClient* client_;
   std::unique_ptr<EventWithDispatchType> in_flight_event_;
   bool last_touch_start_forced_nonblocking_due_to_fling_;
   bool enable_fling_passive_listener_flag_;
   bool handle_raf_aligned_touch_input_;
   bool handle_raf_aligned_mouse_input_;
 
@@ skipping 12 matching lines @@
 
   scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
   blink::scheduler::RendererScheduler* renderer_scheduler_;
 
   DISALLOW_COPY_AND_ASSIGN(MainThreadEventQueue);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_INPUT_MAIN_THREAD_EVENT_QUEUE_H_