| 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 c8814063829b9af4c97a345751d064200513cf26..1613ee81409dfc196f1ed490f99b6fe05cadf291 100644
|
| --- a/content/common/input/event_with_latency_info.h
|
| +++ b/content/common/input/event_with_latency_info.h
|
| @@ -8,37 +8,15 @@
|
| #include "base/compiler_specific.h"
|
| #include "base/logging.h"
|
| #include "content/common/content_export.h"
|
| -#include "third_party/WebKit/public/platform/WebCoalescedInputEvent.h"
|
| #include "third_party/WebKit/public/platform/WebGestureEvent.h"
|
| #include "third_party/WebKit/public/platform/WebMouseWheelEvent.h"
|
| #include "third_party/WebKit/public/platform/WebTouchEvent.h"
|
| #include "ui/events/blink/blink_event_util.h"
|
| +#include "ui/events/blink/web_input_event_traits.h"
|
| #include "ui/events/latency_info.h"
|
|
|
| namespace content {
|
|
|
| -class ScopedWebInputEventWithLatencyInfo {
|
| - public:
|
| - ScopedWebInputEventWithLatencyInfo(blink::WebScopedInputEvent,
|
| - const ui::LatencyInfo&);
|
| -
|
| - ~ScopedWebInputEventWithLatencyInfo();
|
| -
|
| - bool CanCoalesceWith(const ScopedWebInputEventWithLatencyInfo& other) const
|
| - WARN_UNUSED_RESULT;
|
| -
|
| - const blink::WebInputEvent& event() const;
|
| - const blink::WebCoalescedInputEvent& coalesced_event() const;
|
| - blink::WebInputEvent& event();
|
| - const ui::LatencyInfo latencyInfo() const { return latency_; }
|
| -
|
| - void CoalesceWith(const ScopedWebInputEventWithLatencyInfo& other);
|
| -
|
| - private:
|
| - blink::WebScopedCoalescedInputEvent event_;
|
| - mutable ui::LatencyInfo latency_;
|
| -};
|
| -
|
| template <typename T>
|
| class EventWithLatencyInfo {
|
| public:
|
|
|