diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 17:35:13 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-06 17:35:13 +0000 |
commit | 32d07d6400ac9c21c0f2cf8619212af9215be38c (patch) | |
tree | 5ab474c0a6d8667e3a4f0891f7b82f34abc3c5d3 /mojo/services/native_viewport/native_viewport_impl.cc | |
parent | 0f5a491d2dc8d94056514cba2ccd08ec13afffe8 (diff) | |
download | chromium_src-32d07d6400ac9c21c0f2cf8619212af9215be38c.zip chromium_src-32d07d6400ac9c21c0f2cf8619212af9215be38c.tar.gz chromium_src-32d07d6400ac9c21c0f2cf8619212af9215be38c.tar.bz2 |
Wire events through to sample_app
R=abarth@chromium.org
http://crbug.com/324639
Review URL: https://codereview.chromium.org/100823010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/services/native_viewport/native_viewport_impl.cc')
-rw-r--r-- | mojo/services/native_viewport/native_viewport_impl.cc | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/mojo/services/native_viewport/native_viewport_impl.cc b/mojo/services/native_viewport/native_viewport_impl.cc index bce78e3..777c8d2 100644 --- a/mojo/services/native_viewport/native_viewport_impl.cc +++ b/mojo/services/native_viewport/native_viewport_impl.cc @@ -47,7 +47,29 @@ void NativeViewportImpl::CreateGLES2ContextIfNeeded() { gles2_->CreateContext(widget_, native_viewport_->GetSize()); } -bool NativeViewportImpl::OnEvent(ui::Event* event) { +bool NativeViewportImpl::OnEvent(ui::Event* ui_event) { + AllocationScope scope; + + Event::Builder event; + event.set_action(ui_event->type()); + event.set_time_stamp(ui_event->time_stamp().ToInternalValue()); + + if (ui_event->IsMouseEvent() || ui_event->IsTouchEvent()) { + ui::LocatedEvent* located_event = static_cast<ui::LocatedEvent*>(ui_event); + Point::Builder location; + location.set_x(located_event->location().x()); + location.set_y(located_event->location().y()); + event.set_location(location.Finish()); + } + + if (ui_event->IsTouchEvent()) { + ui::TouchEvent* touch_event = static_cast<ui::TouchEvent*>(ui_event); + TouchData::Builder touch_data; + touch_data.set_pointer_id(touch_event->touch_id()); + event.set_touch_data(touch_data.Finish()); + } + + client_->HandleEvent(event.Finish()); return false; } |