diff options
author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 19:06:35 +0000 |
---|---|---|
committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 19:06:35 +0000 |
commit | 9e1abbc82e974719b757844402ec74aba660a3c8 (patch) | |
tree | 383f4cd93f6534ec1d55ba1d8a9dec2d46475372 /content | |
parent | f4821400355c5126dda788043ef6e148c067d160 (diff) | |
download | chromium_src-9e1abbc82e974719b757844402ec74aba660a3c8.zip chromium_src-9e1abbc82e974719b757844402ec74aba660a3c8.tar.gz chromium_src-9e1abbc82e974719b757844402ec74aba660a3c8.tar.bz2 |
Move PPB_KeyboardInputEvent.GetCode to stable.
Remove GetUsbKeycode and SetUsbKeyCode since they were earlier verisons of this API that are not being used anywhere.
Remove all the KeyboardEvent _Dev files since they will no longer be used once GetCode is moved out.
BUG=286359,284774,275049
R=binji@chromium.org, dcheng@chromium.org, dmichael@chromium.org
Review URL: https://codereview.chromium.org/112983005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/renderer/pepper/event_conversion.cc | 2 | ||||
-rw-r--r-- | content/renderer/pepper/resource_creation_impl.cc | 18 | ||||
-rw-r--r-- | content/renderer/pepper/resource_creation_impl.h | 10 |
3 files changed, 25 insertions, 5 deletions
diff --git a/content/renderer/pepper/event_conversion.cc b/content/renderer/pepper/event_conversion.cc index 2ceaf07..52d382a 100644 --- a/content/renderer/pepper/event_conversion.cc +++ b/content/renderer/pepper/event_conversion.cc @@ -127,7 +127,6 @@ InputEventData GetEventWithCommonFieldsAndType(const WebInputEvent& web_event) { InputEventData result; result.event_type = ConvertEventTypes(web_event.type); result.event_time_stamp = EventTimeToPPTimeTicks(web_event.timeStampSeconds); - result.usb_key_code = 0; return result; } @@ -138,7 +137,6 @@ void AppendKeyEvent(const WebInputEvent& event, InputEventData result = GetEventWithCommonFieldsAndType(event); result.event_modifiers = key_event.modifiers; result.key_code = key_event.windowsKeyCode; - result.usb_key_code = UsbKeyCodeForKeyboardEvent(key_event); result.code = CodeForKeyboardEvent(key_event); result_events->push_back(result); } diff --git a/content/renderer/pepper/resource_creation_impl.cc b/content/renderer/pepper/resource_creation_impl.cc index 79962a2..18f06fc 100644 --- a/content/renderer/pepper/resource_creation_impl.cc +++ b/content/renderer/pepper/resource_creation_impl.cc @@ -157,16 +157,30 @@ PP_Resource ResourceCreationImpl::CreateIMEInputEvent( segment_offsets, target_segment, selection_start, selection_end); } -PP_Resource ResourceCreationImpl::CreateKeyboardInputEvent( +PP_Resource ResourceCreationImpl::CreateKeyboardInputEvent_1_0( PP_Instance instance, PP_InputEvent_Type type, PP_TimeTicks time_stamp, uint32_t modifiers, uint32_t key_code, struct PP_Var character_text) { + PP_Var code = StringVar::StringToPPVar(""); return PPB_InputEvent_Shared::CreateKeyboardInputEvent( ppapi::OBJECT_IS_IMPL, instance, type, time_stamp, modifiers, key_code, - character_text); + character_text, code); +} + +PP_Resource ResourceCreationImpl::CreateKeyboardInputEvent_1_2( + PP_Instance instance, + PP_InputEvent_Type type, + PP_TimeTicks time_stamp, + uint32_t modifiers, + uint32_t key_code, + struct PP_Var character_text, + struct PP_Var code) { + return PPB_InputEvent_Shared::CreateKeyboardInputEvent( + ppapi::OBJECT_IS_IMPL, instance, type, time_stamp, modifiers, key_code, + character_text, code); } PP_Resource ResourceCreationImpl::CreateMouseInputEvent( diff --git a/content/renderer/pepper/resource_creation_impl.h b/content/renderer/pepper/resource_creation_impl.h index c08abdc..0f20b62 100644 --- a/content/renderer/pepper/resource_creation_impl.h +++ b/content/renderer/pepper/resource_creation_impl.h @@ -72,13 +72,21 @@ class ResourceCreationImpl : public ppapi::thunk::ResourceCreationAPI { int32_t target_segment, uint32_t selection_start, uint32_t selection_end) OVERRIDE; - virtual PP_Resource CreateKeyboardInputEvent( + virtual PP_Resource CreateKeyboardInputEvent_1_0( PP_Instance instance, PP_InputEvent_Type type, PP_TimeTicks time_stamp, uint32_t modifiers, uint32_t key_code, PP_Var character_text) OVERRIDE; + virtual PP_Resource CreateKeyboardInputEvent_1_2( + PP_Instance instance, + PP_InputEvent_Type type, + PP_TimeTicks time_stamp, + uint32_t modifiers, + uint32_t key_code, + PP_Var character_text, + PP_Var code) OVERRIDE; virtual PP_Resource CreateMouseInputEvent( PP_Instance instance, PP_InputEvent_Type type, |