diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 16:05:50 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 16:05:50 +0000 |
| commit | 0981f86e200719979691ce48a93c8532d525c06b (patch) | |
| tree | 7ddb1801860141974063bee88f41fcead1e240c0 /content | |
| parent | 749756bb44d5b4d91a130377b04f9ce1e6d4bb7e (diff) | |
| download | chromium_src-0981f86e200719979691ce48a93c8532d525c06b.zip chromium_src-0981f86e200719979691ce48a93c8532d525c06b.tar.gz chromium_src-0981f86e200719979691ce48a93c8532d525c06b.tar.bz2 | |
aura: Add mouse wheel event support for x11 in RWHVA.
BUG=99757
TEST=manually
Review URL: http://codereview.chromium.org/8370024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/web_input_event_aurax11.cc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/content/browser/renderer_host/web_input_event_aurax11.cc b/content/browser/renderer_host/web_input_event_aurax11.cc index 44879fd..2360cc9 100644 --- a/content/browser/renderer_host/web_input_event_aurax11.cc +++ b/content/browser/renderer_host/web_input_event_aurax11.cc @@ -254,7 +254,14 @@ WebKit::WebMouseEvent MakeWebMouseEventFromAuraEvent(aura::MouseEvent* event) { WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent( aura::MouseEvent* event) { WebKit::WebMouseWheelEvent webkit_event; - // TODO(sadrul): ! + + webkit_event.type = WebKit::WebInputEvent::MouseWheel; + webkit_event.button = WebKit::WebMouseEvent::ButtonNone; + webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags()); + webkit_event.timeStampSeconds = event->time_stamp().ToDoubleT(); + webkit_event.deltaY = ui::GetMouseWheelOffset(event->native_event()); + webkit_event.wheelTicksY = webkit_event.deltaY > 0 ? 1 : -1; + return webkit_event; } |