Decouple EventWithLatencyInfo from WebInputEventTraits

content/common/input/event_with_latency_info.h

Index: content/common/input/event_with_latency_info.h
diff --git a/content/common/input/event_with_latency_info.h b/content/common/input/event_with_latency_info.h
index 24742a3baeb0f57f6755724c5cd33ba93272c6b3..cdfdb6ea1995309b9ee4140d9621a3772853712f 100644
--- a/content/common/input/event_with_latency_info.h
+++ b/content/common/input/event_with_latency_info.h
@@ -5,18 +5,34 @@
 #ifndef CONTENT_COMMON_INPUT_EVENT_WITH_LATENCY_INFO_H_
 #define CONTENT_COMMON_INPUT_EVENT_WITH_LATENCY_INFO_H_
 
+#include "base/compiler_specific.h"
+#include "base/logging.h"
+#include "content/common/content_export.h"
+#include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/latency_info.h"
 
-#include "content/common/input/web_input_event_traits.h"
+namespace content {
+namespace internal {
 
-namespace blink {
-class WebGestureEvent;
-class WebMouseEvent;
-class WebMouseWheelEvent;
-class WebTouchEvent;
-}
+bool CONTENT_EXPORT CanCoalesce(const blink::WebMouseEvent& event_to_coalesce,
+                                const blink::WebMouseEvent& event);
+void CONTENT_EXPORT Coalesce(const blink::WebMouseEvent& event_to_coalesce,
+                             blink::WebMouseEvent* event);
+bool CONTENT_EXPORT
+CanCoalesce(const blink::WebMouseWheelEvent& event_to_coalesce,
+            const blink::WebMouseWheelEvent& event);
+void CONTENT_EXPORT Coalesce(const blink::WebMouseWheelEvent& event_to_coalesce,
+                             blink::WebMouseWheelEvent* event);
+bool CONTENT_EXPORT CanCoalesce(const blink::WebTouchEvent& event_to_coalesce,
+                                const blink::WebTouchEvent& event);
+void CONTENT_EXPORT Coalesce(const blink::WebTouchEvent& event_to_coalesce,
+                             blink::WebTouchEvent* event);
+bool CONTENT_EXPORT CanCoalesce(const blink::WebGestureEvent& event_to_coalesce,
+                                const blink::WebGestureEvent& event);
+void CONTENT_EXPORT Coalesce(const blink::WebGestureEvent& event_to_coalesce,
+                             blink::WebGestureEvent* event);
 
-namespace content {
+}  // namespace internal
 
 template <typename T>
 class EventWithLatencyInfo {
@@ -33,14 +49,26 @@ class EventWithLatencyInfo {
 
   bool CanCoalesceWith(const EventWithLatencyInfo& other)
       const WARN_UNUSED_RESULT {
-    return WebInputEventTraits::CanCoalesce(other.event, event);
+    if (other.event.type != event.type)
+      return false;
+
+    DCHECK_EQ(sizeof(T), event.size);
+    DCHECK_EQ(sizeof(T), other.event.size);
+
+    return internal::CanCoalesce(other.event, event);
   }
 
   void CoalesceWith(const EventWithLatencyInfo& other) {
     // |other| should be a newer event than |this|.
     if (other.latency.trace_id() >= 0 && latency.trace_id() >= 0)
       DCHECK_GT(other.latency.trace_id(), latency.trace_id());
-    WebInputEventTraits::Coalesce(other.event, &event);
+
+    // New events get coalesced into older events, and the newer timestamp
+    // should always be preserved.
+    const double time_stamp_seconds = other.event.timeStampSeconds;
+    internal::Coalesce(other.event, &event);
+    event.timeStampSeconds = time_stamp_seconds;
+
     // When coalescing two input events, we keep the oldest LatencyInfo
     // for Telemetry latency tests, since it will represent the longest
     // latency.