| Index: ppapi/thunk/ppb_input_event_thunk.cc
|
| diff --git a/ppapi/thunk/ppb_input_event_thunk.cc b/ppapi/thunk/ppb_input_event_thunk.cc
|
| index c29b56c3f32fdfa599e993c266b27db65f52343b..d0d21645bddf85c51721a60ea0a63636deafa316 100644
|
| --- a/ppapi/thunk/ppb_input_event_thunk.cc
|
| +++ b/ppapi/thunk/ppb_input_event_thunk.cc
|
| @@ -36,8 +36,7 @@ int32_t RequestFilteringInputEvents(PP_Instance instance,
|
| event_classes);
|
| }
|
|
|
| -void ClearInputEventRequest(PP_Instance instance,
|
| - uint32_t event_classes) {
|
| +void ClearInputEventRequest(PP_Instance instance, uint32_t event_classes) {
|
| VLOG(4) << "PPB_InputEvent::ClearInputEventRequest()";
|
| EnterInstance enter(instance);
|
| if (enter.succeeded())
|
| @@ -75,14 +74,9 @@ uint32_t GetModifiers(PP_Resource event) {
|
| }
|
|
|
| const PPB_InputEvent g_ppb_input_event_thunk = {
|
| - &RequestInputEvents,
|
| - &RequestFilteringInputEvents,
|
| - &ClearInputEventRequest,
|
| - &IsInputEvent,
|
| - &GetType,
|
| - &GetTimeStamp,
|
| - &GetModifiers
|
| -};
|
| + &RequestInputEvents, &RequestFilteringInputEvents, &ClearInputEventRequest,
|
| + &IsInputEvent, &GetType, &GetTimeStamp,
|
| + &GetModifiers};
|
|
|
| // Mouse -----------------------------------------------------------------------
|
|
|
| @@ -99,9 +93,13 @@ PP_Resource CreateMouseInputEvent1_0(PP_Instance instance,
|
| return 0;
|
|
|
| PP_Point mouse_movement = PP_MakePoint(0, 0);
|
| - return enter.functions()->CreateMouseInputEvent(instance, type, time_stamp,
|
| - modifiers, mouse_button,
|
| - mouse_position, click_count,
|
| + return enter.functions()->CreateMouseInputEvent(instance,
|
| + type,
|
| + time_stamp,
|
| + modifiers,
|
| + mouse_button,
|
| + mouse_position,
|
| + click_count,
|
| &mouse_movement);
|
| }
|
|
|
| @@ -117,9 +115,13 @@ PP_Resource CreateMouseInputEvent1_1(PP_Instance instance,
|
| EnterResourceCreation enter(instance);
|
| if (enter.failed())
|
| return 0;
|
| - return enter.functions()->CreateMouseInputEvent(instance, type, time_stamp,
|
| - modifiers, mouse_button,
|
| - mouse_position, click_count,
|
| + return enter.functions()->CreateMouseInputEvent(instance,
|
| + type,
|
| + time_stamp,
|
| + modifiers,
|
| + mouse_button,
|
| + mouse_position,
|
| + click_count,
|
| mouse_movement);
|
| }
|
|
|
| @@ -169,21 +171,12 @@ PP_Point GetMouseMovement(PP_Resource mouse_event) {
|
| }
|
|
|
| const PPB_MouseInputEvent_1_0 g_ppb_mouse_input_event_1_0_thunk = {
|
| - &CreateMouseInputEvent1_0,
|
| - &IsMouseInputEvent,
|
| - &GetMouseButton,
|
| - &GetMousePosition,
|
| - &GetMouseClickCount
|
| -};
|
| + &CreateMouseInputEvent1_0, &IsMouseInputEvent, &GetMouseButton,
|
| + &GetMousePosition, &GetMouseClickCount};
|
|
|
| const PPB_MouseInputEvent g_ppb_mouse_input_event_1_1_thunk = {
|
| - &CreateMouseInputEvent1_1,
|
| - &IsMouseInputEvent,
|
| - &GetMouseButton,
|
| - &GetMousePosition,
|
| - &GetMouseClickCount,
|
| - &GetMouseMovement
|
| -};
|
| + &CreateMouseInputEvent1_1, &IsMouseInputEvent, &GetMouseButton,
|
| + &GetMousePosition, &GetMouseClickCount, &GetMouseMovement};
|
|
|
| // Wheel -----------------------------------------------------------------------
|
|
|
| @@ -197,9 +190,12 @@ PP_Resource CreateWheelInputEvent(PP_Instance instance,
|
| EnterResourceCreation enter(instance);
|
| if (enter.failed())
|
| return 0;
|
| - return enter.functions()->CreateWheelInputEvent(instance, time_stamp,
|
| - modifiers, wheel_delta,
|
| - wheel_ticks, scroll_by_page);
|
| + return enter.functions()->CreateWheelInputEvent(instance,
|
| + time_stamp,
|
| + modifiers,
|
| + wheel_delta,
|
| + wheel_ticks,
|
| + scroll_by_page);
|
| }
|
|
|
| PP_Bool IsWheelInputEvent(PP_Resource resource) {
|
| @@ -235,12 +231,8 @@ PP_Bool GetWheelScrollByPage(PP_Resource wheel_event) {
|
| }
|
|
|
| const PPB_WheelInputEvent g_ppb_wheel_input_event_thunk = {
|
| - &CreateWheelInputEvent,
|
| - &IsWheelInputEvent,
|
| - &GetWheelDelta,
|
| - &GetWheelTicks,
|
| - &GetWheelScrollByPage
|
| -};
|
| + &CreateWheelInputEvent, &IsWheelInputEvent, &GetWheelDelta, &GetWheelTicks,
|
| + &GetWheelScrollByPage};
|
|
|
| // Keyboard --------------------------------------------------------------------
|
|
|
| @@ -254,10 +246,8 @@ PP_Resource CreateKeyboardInputEvent_1_0(PP_Instance instance,
|
| EnterResourceCreation enter(instance);
|
| if (enter.failed())
|
| return 0;
|
| - return enter.functions()->CreateKeyboardInputEvent_1_0(instance, type,
|
| - time_stamp,
|
| - modifiers, key_code,
|
| - character_text);
|
| + return enter.functions()->CreateKeyboardInputEvent_1_0(
|
| + instance, type, time_stamp, modifiers, key_code, character_text);
|
| }
|
|
|
| PP_Resource CreateKeyboardInputEvent_1_2(PP_Instance instance,
|
| @@ -271,10 +261,8 @@ PP_Resource CreateKeyboardInputEvent_1_2(PP_Instance instance,
|
| EnterResourceCreation enter(instance);
|
| if (enter.failed())
|
| return 0;
|
| - return enter.functions()->CreateKeyboardInputEvent_1_2(instance, type,
|
| - time_stamp,
|
| - modifiers, key_code,
|
| - character_text, code);
|
| + return enter.functions()->CreateKeyboardInputEvent_1_2(
|
| + instance, type, time_stamp, modifiers, key_code, character_text, code);
|
| }
|
|
|
| PP_Bool IsKeyboardInputEvent(PP_Resource resource) {
|
| @@ -282,10 +270,9 @@ PP_Bool IsKeyboardInputEvent(PP_Resource resource) {
|
| if (!IsInputEvent(resource))
|
| return PP_FALSE; // Prevent warning log in GetType.
|
| PP_InputEvent_Type type = GetType(resource);
|
| - return PP_FromBool(type == PP_INPUTEVENT_TYPE_KEYDOWN ||
|
| - type == PP_INPUTEVENT_TYPE_KEYUP ||
|
| - type == PP_INPUTEVENT_TYPE_RAWKEYDOWN ||
|
| - type == PP_INPUTEVENT_TYPE_CHAR);
|
| + return PP_FromBool(
|
| + type == PP_INPUTEVENT_TYPE_KEYDOWN || type == PP_INPUTEVENT_TYPE_KEYUP ||
|
| + type == PP_INPUTEVENT_TYPE_RAWKEYDOWN || type == PP_INPUTEVENT_TYPE_CHAR);
|
| }
|
|
|
| uint32_t GetKeyCode(PP_Resource key_event) {
|
| @@ -313,19 +300,12 @@ PP_Var GetCode(PP_Resource key_event) {
|
| }
|
|
|
| const PPB_KeyboardInputEvent_1_0 g_ppb_keyboard_input_event_1_0_thunk = {
|
| - &CreateKeyboardInputEvent_1_0,
|
| - &IsKeyboardInputEvent,
|
| - &GetKeyCode,
|
| - &GetCharacterText
|
| -};
|
| + &CreateKeyboardInputEvent_1_0, &IsKeyboardInputEvent, &GetKeyCode,
|
| + &GetCharacterText};
|
|
|
| const PPB_KeyboardInputEvent g_ppb_keyboard_input_event_thunk = {
|
| - &CreateKeyboardInputEvent_1_2,
|
| - &IsKeyboardInputEvent,
|
| - &GetKeyCode,
|
| - &GetCharacterText,
|
| - &GetCode
|
| -};
|
| + &CreateKeyboardInputEvent_1_2, &IsKeyboardInputEvent, &GetKeyCode,
|
| + &GetCharacterText, &GetCode};
|
|
|
| // Composition -----------------------------------------------------------------
|
|
|
| @@ -342,8 +322,11 @@ PP_Resource CreateIMEInputEvent(PP_Instance instance,
|
| EnterResourceCreation enter(instance);
|
| if (enter.failed())
|
| return 0;
|
| - return enter.functions()->CreateIMEInputEvent(instance, type, time_stamp,
|
| - text, segment_number,
|
| + return enter.functions()->CreateIMEInputEvent(instance,
|
| + type,
|
| + time_stamp,
|
| + text,
|
| + segment_number,
|
| segment_offsets,
|
| target_segment,
|
| selection_start,
|
| @@ -404,33 +387,18 @@ void GetIMESelection(PP_Resource ime_event, uint32_t* start, uint32_t* end) {
|
| }
|
|
|
| const PPB_IMEInputEvent_Dev_0_1 g_ppb_ime_input_event_0_1_thunk = {
|
| - &IsIMEInputEvent,
|
| - &GetIMEText,
|
| - &GetIMESegmentNumber,
|
| - &GetIMESegmentOffset,
|
| - &GetIMETargetSegment,
|
| - &GetIMESelection
|
| -};
|
| + &IsIMEInputEvent, &GetIMEText, &GetIMESegmentNumber,
|
| + &GetIMESegmentOffset, &GetIMETargetSegment, &GetIMESelection};
|
|
|
| const PPB_IMEInputEvent_Dev_0_2 g_ppb_ime_input_event_0_2_thunk = {
|
| - &CreateIMEInputEvent,
|
| - &IsIMEInputEvent,
|
| - &GetIMEText,
|
| - &GetIMESegmentNumber,
|
| - &GetIMESegmentOffset,
|
| - &GetIMETargetSegment,
|
| - &GetIMESelection
|
| -};
|
| + &CreateIMEInputEvent, &IsIMEInputEvent, &GetIMEText,
|
| + &GetIMESegmentNumber, &GetIMESegmentOffset, &GetIMETargetSegment,
|
| + &GetIMESelection};
|
|
|
| const PPB_IMEInputEvent_1_0 g_ppb_ime_input_event_1_0_thunk = {
|
| - &CreateIMEInputEvent,
|
| - &IsIMEInputEvent,
|
| - &GetIMEText,
|
| - &GetIMESegmentNumber,
|
| - &GetIMESegmentOffset,
|
| - &GetIMETargetSegment,
|
| - &GetIMESelection
|
| -};
|
| + &CreateIMEInputEvent, &IsIMEInputEvent, &GetIMEText,
|
| + &GetIMESegmentNumber, &GetIMESegmentOffset, &GetIMETargetSegment,
|
| + &GetIMESelection};
|
|
|
| // Touch -----------------------------------------------------------------------
|
|
|
| @@ -442,8 +410,8 @@ PP_Resource CreateTouchInputEvent(PP_Instance instance,
|
| EnterResourceCreation enter(instance);
|
| if (enter.failed())
|
| return 0;
|
| - return enter.functions()->CreateTouchInputEvent(instance, type, time_stamp,
|
| - modifiers);
|
| + return enter.functions()->CreateTouchInputEvent(
|
| + instance, type, time_stamp, modifiers);
|
| }
|
|
|
| void AddTouchPoint(PP_Resource touch_event,
|
| @@ -496,13 +464,8 @@ struct PP_TouchPoint GetTouchById(PP_Resource touch_event,
|
| }
|
|
|
| const PPB_TouchInputEvent_1_0 g_ppb_touch_input_event_thunk = {
|
| - &CreateTouchInputEvent,
|
| - &AddTouchPoint,
|
| - &IsTouchInputEvent,
|
| - &GetTouchCount,
|
| - &GetTouchByIndex,
|
| - &GetTouchById
|
| -};
|
| + &CreateTouchInputEvent, &AddTouchPoint, &IsTouchInputEvent,
|
| + &GetTouchCount, &GetTouchByIndex, &GetTouchById};
|
|
|
| } // namespace
|
|
|
|
|