diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 04:45:58 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 04:45:58 +0000 |
| commit | ff71e6483669362f5060598214afc1a594427bce (patch) | |
| tree | be5be8c112cdfcdc5ebd4a02406ded639751fbdb /webkit/plugins/ppapi/resource_creation_impl.cc | |
| parent | eaeaf86449c9cee06d432759e7ebe128f89317b8 (diff) | |
| download | chromium_src-ff71e6483669362f5060598214afc1a594427bce.zip chromium_src-ff71e6483669362f5060598214afc1a594427bce.tar.gz chromium_src-ff71e6483669362f5060598214afc1a594427bce.tar.bz2 | |
Merge the plugin and impl side of the audio config and input event resources.
Now that we have a unified resource system, we no longer need the duplication
on both sides of the proxy. This resource is now implemented entirely in
shared_impl.
Review URL: http://codereview.chromium.org/7621070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98185 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/ppapi/resource_creation_impl.cc')
| -rw-r--r-- | webkit/plugins/ppapi/resource_creation_impl.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc index 7009f0c..15436f1 100644 --- a/webkit/plugins/ppapi/resource_creation_impl.cc +++ b/webkit/plugins/ppapi/resource_creation_impl.cc @@ -5,6 +5,7 @@ #include "webkit/plugins/ppapi/resource_creation_impl.h" #include "ppapi/c/pp_size.h" +#include "ppapi/shared_impl/audio_config_impl.h" #include "ppapi/shared_impl/input_event_impl.h" #include "ppapi/shared_impl/var.h" #include "webkit/plugins/ppapi/common.h" @@ -23,7 +24,6 @@ #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h" #include "webkit/plugins/ppapi/ppb_graphics_3d_impl.h" #include "webkit/plugins/ppapi/ppb_image_data_impl.h" -#include "webkit/plugins/ppapi/ppb_input_event_impl.h" #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h" #include "webkit/plugins/ppapi/ppb_surface_3d_impl.h" #include "webkit/plugins/ppapi/ppb_transport_impl.h" @@ -34,6 +34,7 @@ #include "webkit/plugins/ppapi/ppb_video_layer_impl.h" using ppapi::InputEventData; +using ppapi::InputEventImpl; using ppapi::StringVar; namespace webkit { @@ -63,8 +64,8 @@ PP_Resource ResourceCreationImpl::CreateAudioConfig( PP_Instance instance, PP_AudioSampleRate sample_rate, uint32_t sample_frame_count) { - return PPB_AudioConfig_Impl::Create(instance, sample_rate, - sample_frame_count); + return ::ppapi::AudioConfigImpl::CreateAsImpl(instance, sample_rate, + sample_frame_count); } PP_Resource ResourceCreationImpl::CreateAudioTrusted( @@ -202,7 +203,8 @@ PP_Resource ResourceCreationImpl::CreateKeyboardInputEvent( data.character_text = string_var->value(); } - return (new PPB_InputEvent_Impl(instance, data))->GetReference(); + return (new InputEventImpl(InputEventImpl::InitAsImpl(), + instance, data))->GetReference(); } PP_Resource ResourceCreationImpl::CreateMouseInputEvent( @@ -228,7 +230,8 @@ PP_Resource ResourceCreationImpl::CreateMouseInputEvent( data.mouse_position = *mouse_position; data.mouse_click_count = click_count; - return (new PPB_InputEvent_Impl(instance, data))->GetReference(); + return (new InputEventImpl(InputEventImpl::InitAsImpl(), + instance, data))->GetReference(); } PP_Resource ResourceCreationImpl::CreateScrollbar(PP_Instance instance, @@ -292,7 +295,8 @@ PP_Resource ResourceCreationImpl::CreateWheelInputEvent( data.wheel_ticks = *wheel_ticks; data.wheel_scroll_by_page = PP_ToBool(scroll_by_page); - return (new PPB_InputEvent_Impl(instance, data))->GetReference(); + return (new InputEventImpl(InputEventImpl::InitAsImpl(), + instance, data))->GetReference(); } } // namespace ppapi |