Introducing WebCoalescedInputEvent and inclusion in content/common

content/renderer/mus/compositor_mus_connection.cc

 // Copyright 2015 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.
 
 #include "content/renderer/mus/compositor_mus_connection.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "content/renderer/input/input_handler_manager.h"
 #include "content/renderer/mus/render_widget_mus_connection.h"
@@ skipping 78 matching lines @@
 void CompositorMusConnection::OnConnectionLostOnMainThread() {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   RenderWidgetMusConnection* connection =
       RenderWidgetMusConnection::Get(routing_id_);
   if (!connection)
     return;
   connection->OnConnectionLost();
 }
 
 void CompositorMusConnection::OnWindowInputEventOnMainThread(
-    ui::ScopedWebInputEvent web_event,
+    blink::WebScopedInputEvent web_event,
     const base::Callback<void(EventResult)>& ack) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   RenderWidgetMusConnection* connection =
       RenderWidgetMusConnection::Get(routing_id_);
   if (!connection) {
     ack.Run(EventResult::UNHANDLED);
     return;
   }
   connection->OnWindowInputEvent(std::move(web_event), ack);
 }
@@ skipping 70 matching lines @@
 
 void CompositorMusConnection::OnWindowInputEvent(
     ui::Window* window,
     const ui::Event& event,
     std::unique_ptr<base::Callback<void(EventResult)>>* ack_callback) {
   DCHECK(compositor_task_runner_->BelongsToCurrentThread());
 
   // Take ownership of the callback, indicating that we will handle it.
   std::unique_ptr<base::Callback<void(EventResult)>> callback =
       std::move(*ack_callback);
-  ui::ScopedWebInputEvent web_event(Convert(event).release());
+  blink::WebScopedInputEvent web_event(Convert(event).release());
   // TODO(sad): We probably need to plumb LatencyInfo through Mus.
   ui::LatencyInfo info;
   input_handler_manager_->HandleInputEvent(
       routing_id_, std::move(web_event), info,
       base::Bind(
           &CompositorMusConnection::DidHandleWindowInputEventAndOverscroll,
           this, base::Passed(std::move(callback))));
 }
 
 void CompositorMusConnection::DidHandleWindowInputEventAndOverscroll(
     std::unique_ptr<base::Callback<void(EventResult)>> ack_callback,
     InputEventAckState ack_state,
-    ui::ScopedWebInputEvent web_event,
+    blink::WebScopedInputEvent web_event,
     const ui::LatencyInfo& latency_info,
     std::unique_ptr<ui::DidOverscrollParams> overscroll_params) {
   // TODO(jonross): We probably need to ack the event based on the consumed
   // state.
   if (ack_state != INPUT_EVENT_ACK_STATE_NOT_CONSUMED) {
     // We took the ownership of the callback, so we need to send the ack, and
     // mark the event as not consumed to preserve existing behavior.
     ack_callback->Run(EventResult::UNHANDLED);
     return;
   }
@@ skipping 16 matching lines @@
   }
   ack_callback.reset();
 
   main_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&CompositorMusConnection::OnWindowInputEventOnMainThread, this,
                  base::Passed(std::move(web_event)), ack));
 }
 
 }  // namespace content