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 541b7ce4589da3a89077a39f5e4ff44ffa14fe14..43279f5b6e54e40d87fffca9bf98cef58fb39d82 100644 |
--- a/content/common/input/event_with_latency_info.h |
+++ b/content/common/input/event_with_latency_info.h |
@@ -8,9 +8,8 @@ |
#include "base/compiler_specific.h" |
#include "base/logging.h" |
#include "content/common/content_export.h" |
+#include "third_party/WebKit/public/platform/CoalescedWebInputEvent.h" |
#include "third_party/WebKit/public/platform/WebGestureEvent.h" |
-#include "third_party/WebKit/public/platform/WebInputEvent.h" |
-#include "ui/events/blink/scoped_web_input_event.h" |
#include "ui/events/latency_info.h" |
namespace content { |
@@ -38,22 +37,24 @@ void CONTENT_EXPORT Coalesce(const blink::WebGestureEvent& event_to_coalesce, |
class ScopedWebInputEventWithLatencyInfo { |
public: |
- ScopedWebInputEventWithLatencyInfo(ui::ScopedWebInputEvent, |
- const ui::LatencyInfo&); |
+ ScopedWebInputEventWithLatencyInfo( |
+ blink::CoalescedWebInputEvent::ScopedWebInputEvent, |
+ const ui::LatencyInfo&); |
~ScopedWebInputEventWithLatencyInfo(); |
bool CanCoalesceWith(const ScopedWebInputEventWithLatencyInfo& other) const |
WARN_UNUSED_RESULT; |
- const blink::WebInputEvent& event() const; |
- blink::WebInputEvent& event(); |
+ const blink::CoalescedWebInputEvent& coalescedEvent() const; |
+ blink::CoalescedWebInputEvent& coalescedEvent(); |
const ui::LatencyInfo latencyInfo() const { return latency_; } |
void CoalesceWith(const ScopedWebInputEventWithLatencyInfo& other); |
private: |
- ui::ScopedWebInputEvent event_; |
+ blink::ScopedCoalescedWebInputEvent event_; |
+ |
mutable ui::LatencyInfo latency_; |
}; |