[Compositor event queue] Coalesce gesture scroll&pinch of the same sequence

ui/events/blink/event_with_callback.h

Index: ui/events/blink/event_with_callback.h
diff --git a/ui/events/blink/event_with_callback.h b/ui/events/blink/event_with_callback.h
index c6fd612caf9d6085d252e47ed43a09e32d985498..3f99906fe4232fe0cf34d0ce5f800e8587abc757 100644
--- a/ui/events/blink/event_with_callback.h
+++ b/ui/events/blink/event_with_callback.h
@@ -18,11 +18,26 @@ class InputHandlerProxyEventQueueTest;
 
 class EventWithCallback {
  public:
+  struct OriginalEventWithCallback {
+    OriginalEventWithCallback(
+        ScopedWebInputEvent event,
+        const InputHandlerProxy::EventDispositionCallback& callback);
+    ~OriginalEventWithCallback();
+    ScopedWebInputEvent event_;
+    InputHandlerProxy::EventDispositionCallback callback_;
+  };
+  using OriginalEventList = std::list<OriginalEventWithCallback>;
+
   EventWithCallback(
       ScopedWebInputEvent event,
       const LatencyInfo& latency,
       base::TimeTicks timestamp_now,
       const InputHandlerProxy::EventDispositionCallback& callback);
+  EventWithCallback(ScopedWebInputEvent event,
+                    const LatencyInfo& latency,
+                    base::TimeTicks creation_timestamp,
+                    base::TimeTicks last_coalesced_timestamp,
+                    std::unique_ptr<OriginalEventList> original_events);
   ~EventWithCallback();
 
   bool CanCoalesceWith(const EventWithCallback& other) const WARN_UNUSED_RESULT;
@@ -32,6 +47,7 @@ class EventWithCallback {
                     const LatencyInfo& latency,
                     std::unique_ptr<DidOverscrollParams>);
 
+  const blink::WebGestureEvent& ToWebGestureEvent() const;

[dtapuska, 2016/12/08 15:18:37]

This method looks a little weird to have on something that takes a general
WebInputEvent

[chongz, 2016/12/09 20:52:25]

Moved to "blink_event_util.h".

   const blink::WebInputEvent& event() const { return *event_; }
   const LatencyInfo latency_info() const { return latency_; }
   base::TimeTicks creation_timestamp() const { return creation_timestamp_; }
@@ -39,23 +55,16 @@ class EventWithCallback {
     return last_coalesced_timestamp_;
   }
   size_t coalesced_count() const { return original_events_.size(); }
+  OriginalEventList& original_events() { return original_events_; }
 
  private:
   friend class test::InputHandlerProxyEventQueueTest;
-  struct OriginalEventWithCallback {
-    OriginalEventWithCallback(
-        ScopedWebInputEvent event,
-        const InputHandlerProxy::EventDispositionCallback& callback);
-    ~OriginalEventWithCallback();
-    ScopedWebInputEvent event_;
-    InputHandlerProxy::EventDispositionCallback callback_;
-  };
 
   void SetTickClockForTesting(std::unique_ptr<base::TickClock> tick_clock);
 
   ScopedWebInputEvent event_;
   LatencyInfo latency_;
-  std::list<OriginalEventWithCallback> original_events_;
+  OriginalEventList original_events_;
 
   base::TimeTicks creation_timestamp_;
   base::TimeTicks last_coalesced_timestamp_;