diff options
| -rw-r--r-- | ppapi/c/pp_input_event.h | 26 | ||||
| -rw-r--r-- | webkit/plugins/ppapi/event_conversion.cc | 9 |
2 files changed, 21 insertions, 14 deletions
diff --git a/ppapi/c/pp_input_event.h b/ppapi/c/pp_input_event.h index 0aae4ea..f1a46cf 100644 --- a/ppapi/c/pp_input_event.h +++ b/ppapi/c/pp_input_event.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010 The Chromium Authors. All rights reserved. +/* Copyright (c) 2011 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. */ @@ -27,17 +27,18 @@ typedef enum { PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InputEvent_MouseButton, 4); typedef enum { - PP_INPUTEVENT_TYPE_UNDEFINED = -1, - PP_INPUTEVENT_TYPE_MOUSEDOWN = 0, - PP_INPUTEVENT_TYPE_MOUSEUP = 1, - PP_INPUTEVENT_TYPE_MOUSEMOVE = 2, - PP_INPUTEVENT_TYPE_MOUSEENTER = 3, - PP_INPUTEVENT_TYPE_MOUSELEAVE = 4, - PP_INPUTEVENT_TYPE_MOUSEWHEEL = 5, - PP_INPUTEVENT_TYPE_RAWKEYDOWN = 6, - PP_INPUTEVENT_TYPE_KEYDOWN = 7, - PP_INPUTEVENT_TYPE_KEYUP = 8, - PP_INPUTEVENT_TYPE_CHAR = 9 + PP_INPUTEVENT_TYPE_UNDEFINED = -1, + PP_INPUTEVENT_TYPE_MOUSEDOWN = 0, // PP_InputEvent_Mouse + PP_INPUTEVENT_TYPE_MOUSEUP = 1, // PP_InputEvent_Mouse + PP_INPUTEVENT_TYPE_MOUSEMOVE = 2, // PP_InputEvent_Mouse + PP_INPUTEVENT_TYPE_MOUSEENTER = 3, // PP_InputEvent_Mouse + PP_INPUTEVENT_TYPE_MOUSELEAVE = 4, // PP_InputEvent_Mouse + PP_INPUTEVENT_TYPE_MOUSEWHEEL = 5, // PP_InputEvent_Wheel + PP_INPUTEVENT_TYPE_RAWKEYDOWN = 6, // PP_InputEvent_Key + PP_INPUTEVENT_TYPE_KEYDOWN = 7, // PP_InputEvent_Key + PP_INPUTEVENT_TYPE_KEYUP = 8, // PP_InputEvent_Key + PP_INPUTEVENT_TYPE_CHAR = 9, // PP_InputEvent_Character + PP_INPUTEVENT_TYPE_CONTEXTMENU = 10 // PP_InputEvent_Mouse } PP_InputEvent_Type; PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_InputEvent_Type, 4); @@ -194,4 +195,3 @@ PP_COMPILE_ASSERT_STRUCT_SIZE_IN_BYTES(PP_InputEvent, 80); */ #endif /* PPAPI_C_PP_INPUT_EVENT_H_ */ - diff --git a/webkit/plugins/ppapi/event_conversion.cc b/webkit/plugins/ppapi/event_conversion.cc index f7d9139..90a7f85 100644 --- a/webkit/plugins/ppapi/event_conversion.cc +++ b/webkit/plugins/ppapi/event_conversion.cc @@ -36,6 +36,8 @@ PP_InputEvent_Type ConvertEventTypes(WebInputEvent::Type wetype) { return PP_INPUTEVENT_TYPE_MOUSEENTER; case WebInputEvent::MouseLeave: return PP_INPUTEVENT_TYPE_MOUSELEAVE; + case WebInputEvent::ContextMenu: + return PP_INPUTEVENT_TYPE_CONTEXTMENU; case WebInputEvent::MouseWheel: return PP_INPUTEVENT_TYPE_MOUSEWHEEL; case WebInputEvent::RawKeyDown: @@ -213,6 +215,9 @@ WebMouseEvent* BuildMouseEvent(const PP_InputEvent& event) { case PP_INPUTEVENT_TYPE_MOUSELEAVE: mouse_event->type = WebInputEvent::MouseLeave; break; + case PP_INPUTEVENT_TYPE_CONTEXTMENU: + mouse_event->type = WebInputEvent::ContextMenu; + break; default: NOTREACHED(); } @@ -251,6 +256,7 @@ void CreatePPEvent(const WebInputEvent& event, case WebInputEvent::MouseMove: case WebInputEvent::MouseEnter: case WebInputEvent::MouseLeave: + case WebInputEvent::ContextMenu: AppendMouseEvent(event, pp_events); break; case WebInputEvent::MouseWheel: @@ -280,6 +286,7 @@ WebInputEvent* CreateWebInputEvent(const PP_InputEvent& event) { case PP_INPUTEVENT_TYPE_MOUSEMOVE: case PP_INPUTEVENT_TYPE_MOUSEENTER: case PP_INPUTEVENT_TYPE_MOUSELEAVE: + case PP_INPUTEVENT_TYPE_CONTEXTMENU: web_input_event.reset(BuildMouseEvent(event)); break; case PP_INPUTEVENT_TYPE_MOUSEWHEEL: @@ -297,6 +304,6 @@ WebInputEvent* CreateWebInputEvent(const PP_InputEvent& event) { return web_input_event.release(); } + } // namespace ppapi } // namespace webkit - |