Index: content/browser/renderer_host/event_with_latency_info.h |
diff --git a/content/browser/renderer_host/event_with_latency_info.h b/content/browser/renderer_host/event_with_latency_info.h |
index f55bb0c4e89499f78965d2b9286f40b27ca1b571..0ff2b4c4eeac9e1e2aa1837e1df60b0d5ead1794 100644 |
--- a/content/browser/renderer_host/event_with_latency_info.h |
+++ b/content/browser/renderer_host/event_with_latency_info.h |
@@ -5,66 +5,13 @@ |
#ifndef CONTENT_BROWSER_RENDERER_HOST_EVENT_WITH_LATENCY_INFO_H_ |
#define CONTENT_BROWSER_RENDERER_HOST_EVENT_WITH_LATENCY_INFO_H_ |
-#include "ui/events/latency_info.h" |
- |
-#include "content/common/input/web_input_event_traits.h" |
+#include "content/common/input/event_with_latency_info.h" |
#include "content/public/browser/native_web_keyboard_event.h" |
-namespace blink { |
-class WebGestureEvent; |
-class WebMouseEvent; |
-class WebMouseWheelEvent; |
-class WebTouchEvent; |
-} |
- |
namespace content { |
-template <typename T> |
-class EventWithLatencyInfo { |
- public: |
- T event; |
- mutable ui::LatencyInfo latency; |
- |
- explicit EventWithLatencyInfo(const T& e) : event(e) {} |
- |
- EventWithLatencyInfo(const T& e, const ui::LatencyInfo& l) |
- : event(e), latency(l) {} |
- |
- EventWithLatencyInfo() {} |
- |
- bool CanCoalesceWith(const EventWithLatencyInfo& other) |
- const WARN_UNUSED_RESULT { |
- return WebInputEventTraits::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()); |
- double old_timestamp = event.timeStampSeconds; |
- WebInputEventTraits::Coalesce(other.event, &event); |
- // When coalescing two input events, we keep the oldest LatencyInfo |
- // for Telemetry latency test since it will represent the longest |
- // latency. |
- if (other.latency.trace_id() >= 0 && |
- (latency.trace_id() < 0 || |
- other.latency.trace_id() < latency.trace_id())) { |
- latency = other.latency; |
- } |
- latency.AddCoalescedEventTimestamp(old_timestamp); |
- } |
-}; |
- |
typedef EventWithLatencyInfo<NativeWebKeyboardEvent> |
NativeWebKeyboardEventWithLatencyInfo; |
-typedef EventWithLatencyInfo<blink::WebGestureEvent> |
- GestureEventWithLatencyInfo; |
-typedef EventWithLatencyInfo<blink::WebMouseWheelEvent> |
- MouseWheelEventWithLatencyInfo; |
-typedef EventWithLatencyInfo<blink::WebMouseEvent> |
- MouseEventWithLatencyInfo; |
-typedef EventWithLatencyInfo<blink::WebTouchEvent> |
- TouchEventWithLatencyInfo; |
} // namespace content |