Revert 273723 "Wire input events through the ViewManagerClient i..."

trunk/src/mojo/services/native_viewport/native_viewport_service.cc

 // 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.
 
 #include "mojo/services/native_viewport/native_viewport_service.h"
 
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/services/gles2/command_buffer_impl.h"
 #include "mojo/services/native_viewport/native_viewport.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
 #include "mojo/services/public/cpp/geometry/geometry_type_converters.h"
-#include "mojo/services/public/cpp/input_events/input_events_type_converters.h"
 #include "ui/events/event.h"
 
 namespace mojo {
 namespace services {
 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;
@@ skipping 80 matching lines @@
     case ui::ET_TOUCH_RELEASED:
       native_viewport_->ReleaseCapture();
       break;
     default:
       break;
     }
 
     if (waiting_for_event_ack_ && IsRateLimitedEventType(ui_event))
       return false;
 
-    client()->OnEvent(
-        TypeConverter<EventPtr, ui::Event>::ConvertFrom(*ui_event),
-        base::Bind(&NativeViewportImpl::AckEvent,
-                   base::Unretained(this)));
+    EventPtr event(Event::New());
+    event->action = ui_event->type();
+    event->flags = ui_event->flags();
+    event->time_stamp = ui_event->time_stamp().ToInternalValue();
+
+    if (ui_event->IsMouseEvent() || ui_event->IsTouchEvent()) {
+      ui::LocatedEvent* located_event =
+          static_cast<ui::LocatedEvent*>(ui_event);
+      event->location = Point::New();
+      event->location->x = located_event->location().x();
+      event->location->y = located_event->location().y();
+    }
+
+    if (ui_event->IsTouchEvent()) {
+      ui::TouchEvent* touch_event = static_cast<ui::TouchEvent*>(ui_event);
+      event->touch_data = TouchData::New();
+      event->touch_data->pointer_id = touch_event->touch_id();
+    } else if (ui_event->IsKeyEvent()) {
+      ui::KeyEvent* key_event = static_cast<ui::KeyEvent*>(ui_event);
+      event->key_data = KeyData::New();
+      event->key_data->key_code = key_event->key_code();
+      event->key_data->is_char = key_event->is_char();
+    }
+
+    client()->OnEvent(event.Pass(),
+                      base::Bind(&NativeViewportImpl::AckEvent,
+                                 base::Unretained(this)));
     waiting_for_event_ack_ = true;
     return false;
   }
 
   virtual void OnAcceleratedWidgetAvailable(
       gfx::AcceleratedWidget widget) OVERRIDE {
     widget_ = widget;
     CreateCommandBufferIfNeeded();
   }
 
@@ skipping 23 matching lines @@
 
 MOJO_NATIVE_VIEWPORT_EXPORT mojo::Application*
     CreateNativeViewportService(
         mojo::shell::Context* context,
         mojo::ScopedMessagePipeHandle service_provider_handle) {
   mojo::Application* app = new mojo::Application(
       service_provider_handle.Pass());
   app->AddService<mojo::services::NativeViewportImpl>(context);
   return app;
 }