Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2028)

Unified Diff: content/browser/renderer_host/web_input_event_aurax11.cc

Issue 11047012: Wiring metro mouse events to aura viewer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/web_input_event_aura.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/web_input_event_aurax11.cc
===================================================================
--- content/browser/renderer_host/web_input_event_aurax11.cc (revision 160403)
+++ content/browser/renderer_host/web_input_event_aurax11.cc (working copy)
@@ -59,26 +59,6 @@
// This matches Firefox behavior.
const int kPixelsPerTick = 53;
-int EventFlagsToWebEventModifiers(int flags) {
- int modifiers = 0;
- if (flags & ui::EF_SHIFT_DOWN)
- modifiers |= WebKit::WebInputEvent::ShiftKey;
- if (flags & ui::EF_CONTROL_DOWN)
- modifiers |= WebKit::WebInputEvent::ControlKey;
- if (flags & ui::EF_ALT_DOWN)
- modifiers |= WebKit::WebInputEvent::AltKey;
- // TODO(beng): MetaKey/META_MASK
- if (flags & ui::EF_LEFT_MOUSE_BUTTON)
- modifiers |= WebKit::WebInputEvent::LeftButtonDown;
- if (flags & ui::EF_MIDDLE_MOUSE_BUTTON)
- modifiers |= WebKit::WebInputEvent::MiddleButtonDown;
- if (flags & ui::EF_RIGHT_MOUSE_BUTTON)
- modifiers |= WebKit::WebInputEvent::RightButtonDown;
- if (flags & ui::EF_CAPS_LOCK_DOWN)
- modifiers |= WebKit::WebInputEvent::CapsLockOn;
- return modifiers;
-}
-
int XKeyEventToWindowsKeyCode(XKeyEvent* event) {
int windows_key_code =
ui::KeyboardCodeFromXKeyEvent(reinterpret_cast<XEvent*>(event));
@@ -189,42 +169,6 @@
} // namespace
-WebKit::WebMouseEvent MakeWebMouseEventFromAuraEvent(ui::MouseEvent* event) {
- WebKit::WebMouseEvent webkit_event;
-
- webkit_event.modifiers = EventFlagsToWebEventModifiers(event->flags());
- webkit_event.timeStampSeconds = event->time_stamp().InSecondsF();
-
- webkit_event.button = WebKit::WebMouseEvent::ButtonNone;
- if (event->flags() & ui::EF_LEFT_MOUSE_BUTTON)
- webkit_event.button = WebKit::WebMouseEvent::ButtonLeft;
- if (event->flags() & ui::EF_MIDDLE_MOUSE_BUTTON)
- webkit_event.button = WebKit::WebMouseEvent::ButtonMiddle;
- if (event->flags() & ui::EF_RIGHT_MOUSE_BUTTON)
- webkit_event.button = WebKit::WebMouseEvent::ButtonRight;
-
- switch (event->type()) {
- case ui::ET_MOUSE_PRESSED:
- webkit_event.type = WebKit::WebInputEvent::MouseDown;
- webkit_event.clickCount = event->GetClickCount();
- break;
- case ui::ET_MOUSE_RELEASED:
- webkit_event.type = WebKit::WebInputEvent::MouseUp;
- break;
- case ui::ET_MOUSE_ENTERED:
- case ui::ET_MOUSE_EXITED:
- case ui::ET_MOUSE_MOVED:
- case ui::ET_MOUSE_DRAGGED:
- webkit_event.type = WebKit::WebInputEvent::MouseMove;
- break;
- default:
- NOTIMPLEMENTED() << "Received unexpected event: " << event->type();
- break;
- }
-
- return webkit_event;
-}
-
WebKit::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
ui::MouseWheelEvent* event) {
WebKit::WebMouseWheelEvent webkit_event;
« no previous file with comments | « content/browser/renderer_host/web_input_event_aura.cc ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698