Index: webkit/glue/plugins/pepper_event_conversion.cc |
=================================================================== |
--- webkit/glue/plugins/pepper_event_conversion.cc (revision 51931) |
+++ webkit/glue/plugins/pepper_event_conversion.cc (working copy) |
@@ -20,28 +20,28 @@ |
PP_Event_Type ConvertEventTypes(WebInputEvent::Type wetype) { |
switch (wetype) { |
case WebInputEvent::MouseDown: |
- return PP_Event_Type_MouseDown; |
+ return PP_EVENT_TYPE_MOUSEDOWN; |
case WebInputEvent::MouseUp: |
- return PP_Event_Type_MouseUp; |
+ return PP_EVENT_TYPE_MOUSEUP; |
case WebInputEvent::MouseMove: |
- return PP_Event_Type_MouseMove; |
+ return PP_EVENT_TYPE_MOUSEMOVE; |
case WebInputEvent::MouseEnter: |
- return PP_Event_Type_MouseEnter; |
+ return PP_EVENT_TYPE_MOUSEENTER; |
case WebInputEvent::MouseLeave: |
- return PP_Event_Type_MouseLeave; |
+ return PP_EVENT_TYPE_MOUSELEAVE; |
case WebInputEvent::MouseWheel: |
- return PP_Event_Type_MouseWheel; |
+ return PP_EVENT_TYPE_MOUSEWHEEL; |
case WebInputEvent::RawKeyDown: |
- return PP_Event_Type_RawKeyDown; |
+ return PP_EVENT_TYPE_RAWKEYDOWN; |
case WebInputEvent::KeyDown: |
- return PP_Event_Type_KeyDown; |
+ return PP_EVENT_TYPE_KEYDOWN; |
case WebInputEvent::KeyUp: |
- return PP_Event_Type_KeyUp; |
+ return PP_EVENT_TYPE_KEYUP; |
case WebInputEvent::Char: |
- return PP_Event_Type_Char; |
+ return PP_EVENT_TYPE_CHAR; |
case WebInputEvent::Undefined: |
default: |
- return PP_Event_Type_Undefined; |
+ return PP_EVENT_TYPE_UNDEFINED; |
} |
} |
@@ -91,13 +91,13 @@ |
WebKeyboardEvent* BuildKeyEvent(const PP_Event& event) { |
WebKeyboardEvent* key_event = new WebKeyboardEvent(); |
switch (event.type) { |
- case PP_Event_Type_RawKeyDown: |
+ case PP_EVENT_TYPE_RAWKEYDOWN: |
key_event->type = WebInputEvent::RawKeyDown; |
break; |
- case PP_Event_Type_KeyDown: |
+ case PP_EVENT_TYPE_KEYDOWN: |
key_event->type = WebInputEvent::KeyDown; |
break; |
- case PP_Event_Type_KeyUp: |
+ case PP_EVENT_TYPE_KEYUP: |
key_event->type = WebInputEvent::KeyUp; |
break; |
} |
@@ -126,19 +126,19 @@ |
WebMouseEvent* BuildMouseEvent(const PP_Event& event) { |
WebMouseEvent* mouse_event = new WebMouseEvent(); |
switch (event.type) { |
- case PP_Event_Type_MouseDown: |
+ case PP_EVENT_TYPE_MOUSEDOWN: |
mouse_event->type = WebInputEvent::MouseDown; |
break; |
- case PP_Event_Type_MouseUp: |
+ case PP_EVENT_TYPE_MOUSEUP: |
mouse_event->type = WebInputEvent::MouseUp; |
break; |
- case PP_Event_Type_MouseMove: |
+ case PP_EVENT_TYPE_MOUSEMOVE: |
mouse_event->type = WebInputEvent::MouseMove; |
break; |
- case PP_Event_Type_MouseEnter: |
+ case PP_EVENT_TYPE_MOUSEENTER: |
mouse_event->type = WebInputEvent::MouseEnter; |
break; |
- case PP_Event_Type_MouseLeave: |
+ case PP_EVENT_TYPE_MOUSELEAVE: |
mouse_event->type = WebInputEvent::MouseLeave; |
break; |
} |
@@ -176,24 +176,24 @@ |
pp_event->size = sizeof(pp_event); |
pp_event->time_stamp_seconds = event.timeStampSeconds; |
switch (pp_event->type) { |
- case PP_Event_Type_Undefined: |
+ case PP_EVENT_TYPE_UNDEFINED: |
return NULL; |
- case PP_Event_Type_MouseDown: |
- case PP_Event_Type_MouseUp: |
- case PP_Event_Type_MouseMove: |
- case PP_Event_Type_MouseEnter: |
- case PP_Event_Type_MouseLeave: |
+ case PP_EVENT_TYPE_MOUSEDOWN: |
+ case PP_EVENT_TYPE_MOUSEUP: |
+ case PP_EVENT_TYPE_MOUSEMOVE: |
+ case PP_EVENT_TYPE_MOUSEENTER: |
+ case PP_EVENT_TYPE_MOUSELEAVE: |
BuildMouseEvent(&event, pp_event.get()); |
break; |
- case PP_Event_Type_MouseWheel: |
+ case PP_EVENT_TYPE_MOUSEWHEEL: |
BuildMouseWheelEvent(&event, pp_event.get()); |
break; |
- case PP_Event_Type_RawKeyDown: |
- case PP_Event_Type_KeyDown: |
- case PP_Event_Type_KeyUp: |
+ case PP_EVENT_TYPE_RAWKEYDOWN: |
+ case PP_EVENT_TYPE_KEYDOWN: |
+ case PP_EVENT_TYPE_KEYUP: |
BuildKeyEvent(&event, pp_event.get()); |
break; |
- case PP_Event_Type_Char: |
+ case PP_EVENT_TYPE_CHAR: |
BuildCharEvent(&event, pp_event.get()); |
break; |
} |
@@ -204,27 +204,27 @@ |
WebInputEvent* CreateWebInputEvent(const PP_Event& event) { |
scoped_ptr<WebInputEvent> web_input_event; |
switch (event.type) { |
- case PP_Event_Type_Undefined: |
+ case PP_EVENT_TYPE_UNDEFINED: |
return NULL; |
- case PP_Event_Type_MouseDown: |
- case PP_Event_Type_MouseUp: |
- case PP_Event_Type_MouseMove: |
- case PP_Event_Type_MouseEnter: |
- case PP_Event_Type_MouseLeave: |
+ case PP_EVENT_TYPE_MOUSEDOWN: |
+ case PP_EVENT_TYPE_MOUSEUP: |
+ case PP_EVENT_TYPE_MOUSEMOVE: |
+ case PP_EVENT_TYPE_MOUSEENTER: |
+ case PP_EVENT_TYPE_MOUSELEAVE: |
web_input_event.reset(BuildMouseEvent(event)); |
break; |
- case PP_Event_Type_MouseWheel: |
+ case PP_EVENT_TYPE_MOUSEWHEEL: |
web_input_event.reset(BuildMouseWheelEvent(event)); |
break; |
- case PP_Event_Type_RawKeyDown: |
- case PP_Event_Type_KeyDown: |
- case PP_Event_Type_KeyUp: |
+ case PP_EVENT_TYPE_RAWKEYDOWN: |
+ case PP_EVENT_TYPE_KEYDOWN: |
+ case PP_EVENT_TYPE_KEYUP: |
web_input_event.reset(BuildKeyEvent(event)); |
break; |
- case PP_Event_Type_Char: |
+ case PP_EVENT_TYPE_CHAR: |
web_input_event.reset(BuildCharEvent(event)); |
break; |
- case PP_Event_Type_Focus: |
+ case PP_EVENT_TYPE_FOCUS: |
// NOTIMPLEMENTED(); |
return NULL; |
} |