Cleans up events to just the parts we're actually using

services/native_viewport/native_viewport_impl.cc

 // Copyright 2014 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 "services/native_viewport/native_viewport_impl.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "mojo/public/cpp/application/interface_factory.h"
 #include "services/gles2/gpu_state.h"
 #include "services/native_viewport/platform_viewport_headless.h"
 #include "ui/events/event.h"
 
 namespace native_viewport {
 namespace {
 
-bool IsRateLimitedEventType(ui::Event* event) {
-  return event->type() == ui::ET_MOUSE_MOVED ||
-         event->type() == ui::ET_MOUSE_DRAGGED ||
-         event->type() == ui::ET_TOUCH_MOVED;
+bool IsRateLimitedEventType(const mojo::EventPtr& event) {
+  return event->action == mojo::EVENT_TYPE_POINTER_MOVE;
 }
 
 }  // namespace
 
 NativeViewportImpl::NativeViewportImpl(
     bool is_headless,
     const scoped_refptr<gles2::GpuState>& gpu_state,
     mojo::InterfaceRequest<mojo::NativeViewport> request)
     : is_headless_(is_headless),
       context_provider_(gpu_state),
@@ skipping 80 matching lines @@
   // where we don't know the actual size until the first OnMetricsChanged call.
   create_callback_.Run(metrics_.Clone());
   sent_metrics_ = true;
   create_callback_.reset();
 }
 
 void NativeViewportImpl::OnAcceleratedWidgetDestroyed() {
   context_provider_.SetAcceleratedWidget(gfx::kNullAcceleratedWidget);
 }
 
-bool NativeViewportImpl::OnEvent(ui::Event* ui_event) {
-  if (!event_dispatcher_.get())
+bool NativeViewportImpl::OnEvent(mojo::EventPtr event) {
+  if (event.is_null() || !event_dispatcher_.get() ||
+      (waiting_for_event_ack_ && IsRateLimitedEventType(event))) {
     return false;
-
-  // Must not return early before updating capture.
-  switch (ui_event->type()) {
-    case ui::ET_MOUSE_PRESSED:
-    case ui::ET_TOUCH_PRESSED:
-      platform_viewport_->SetCapture();
-      break;
-    case ui::ET_MOUSE_RELEASED:
-    case ui::ET_TOUCH_RELEASED:
-      platform_viewport_->ReleaseCapture();
-      break;
-    default:
-      break;
   }
 
-  if (waiting_for_event_ack_ && IsRateLimitedEventType(ui_event))
-    return false;
-
   event_dispatcher_->OnEvent(
-      mojo::Event::From(*ui_event),
+      event.Pass(),
       base::Bind(&NativeViewportImpl::AckEvent, weak_factory_.GetWeakPtr()));
   waiting_for_event_ack_ = true;
   return false;
 }
 
 void NativeViewportImpl::OnDestroyed() {
   // This will signal a connection error and cause us to delete |this|.
   binding_.Close();
 }
 
 void NativeViewportImpl::OnConnectionError() {
   binding_.set_error_handler(nullptr);
   delete this;
 }
 
 void NativeViewportImpl::AckEvent() {
   waiting_for_event_ack_ = false;
 }
 
 }  // namespace native_viewport