Introducing WebCoalescedInputEvent and inclusion in content/common

content/common/input/event_with_latency_info.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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/platform/WebCoalescedInputEvent.h"
 #include "third_party/WebKit/public/platform/WebGestureEvent.h"
-#include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "ui/events/blink/blink_event_util.h"
-#include "ui/events/blink/scoped_web_input_event.h"
 #include "ui/events/latency_info.h"
 
 namespace content {
 
 class ScopedWebInputEventWithLatencyInfo {
  public:
-  ScopedWebInputEventWithLatencyInfo(ui::ScopedWebInputEvent,
-                                     const ui::LatencyInfo&);
+  ScopedWebInputEventWithLatencyInfo(
+      blink::WebCoalescedInputEvent::ScopedWebInputEvent,
+      const ui::LatencyInfo&);
 
   ~ScopedWebInputEventWithLatencyInfo();
 
   bool CanCoalesceWith(const ScopedWebInputEventWithLatencyInfo& other) const
       WARN_UNUSED_RESULT;
 
-  const blink::WebInputEvent& event() const;
-  blink::WebInputEvent& event();
+  const blink::WebCoalescedInputEvent& coalescedEvent() const;
+  blink::WebCoalescedInputEvent& coalescedEvent();
   const ui::LatencyInfo latencyInfo() const { return latency_; }
 
   void CoalesceWith(const ScopedWebInputEventWithLatencyInfo& other);
 
  private:
-  ui::ScopedWebInputEvent event_;
+  blink::ScopedCoalescedWebInputEvent event_;
   mutable ui::LatencyInfo latency_;
 };
 
 template <typename T>
 class EventWithLatencyInfo {
  public:
   T event;
   mutable ui::LatencyInfo latency;
 
   explicit EventWithLatencyInfo(const T& e) : event(e) {}
@@ skipping 38 matching lines @@
 typedef EventWithLatencyInfo<blink::WebMouseWheelEvent>
     MouseWheelEventWithLatencyInfo;
 typedef EventWithLatencyInfo<blink::WebMouseEvent>
     MouseEventWithLatencyInfo;
 typedef EventWithLatencyInfo<blink::WebTouchEvent>
     TouchEventWithLatencyInfo;
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_INPUT_EVENT_WITH_LATENCY_INFO_H_