Merge the plugin and impl side of the audio config and input event resources.

webkit/plugins/ppapi/resource_creation_impl.cc

 // 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.
 
 #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"
 #include "webkit/plugins/ppapi/ppb_audio_impl.h"
 #include "webkit/plugins/ppapi/ppb_broker_impl.h"
 #include "webkit/plugins/ppapi/ppb_buffer_impl.h"
 #include "webkit/plugins/ppapi/ppb_context_3d_impl.h"
 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h"
 #include "webkit/plugins/ppapi/ppb_file_chooser_impl.h"
 #include "webkit/plugins/ppapi/ppb_file_io_impl.h"
 #include "webkit/plugins/ppapi/ppb_file_ref_impl.h"
 #include "webkit/plugins/ppapi/ppb_file_system_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
 #include "webkit/plugins/ppapi/ppb_font_impl.h"
 #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"
 #include "webkit/plugins/ppapi/ppb_url_loader_impl.h"
 #include "webkit/plugins/ppapi/ppb_url_request_info_impl.h"
 #include "webkit/plugins/ppapi/ppb_video_capture_impl.h"
 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
 #include "webkit/plugins/ppapi/ppb_video_layer_impl.h"
 
 using ppapi::InputEventData;
+using ppapi::InputEventImpl;
 using ppapi::StringVar;
 
 namespace webkit {
 namespace ppapi {
 
 ResourceCreationImpl::ResourceCreationImpl(PluginInstance* instance) {
 }
 
 ResourceCreationImpl::~ResourceCreationImpl() {
 }
 
 ::ppapi::thunk::ResourceCreationAPI*
 ResourceCreationImpl::AsResourceCreationAPI() {
   return this;
 }
 
 PP_Resource ResourceCreationImpl::CreateAudio(
     PP_Instance instance,
     PP_Resource config_id,
     PPB_Audio_Callback audio_callback,
     void* user_data) {
   return PPB_Audio_Impl::Create(instance, config_id, audio_callback,
                                 user_data);
 }
 
 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(
     PP_Instance instance) {
   return (new PPB_Audio_Impl(instance))->GetReference();
 }
 
 PP_Resource ResourceCreationImpl::CreateBroker(PP_Instance instance) {
   return (new PPB_Broker_Impl(instance))->GetReference();
 }
@@ skipping 117 matching lines @@
   data.event_time_stamp = time_stamp;
   data.event_modifiers = modifiers;
   data.key_code = key_code;
   if (character_text.type == PP_VARTYPE_STRING) {
     StringVar* string_var = StringVar::FromPPVar(character_text);
     if (!string_var)
       return 0;
     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(
     PP_Instance instance,
     PP_InputEvent_Type type,
     PP_TimeTicks time_stamp,
     uint32_t modifiers,
     PP_InputEvent_MouseButton mouse_button,
     const PP_Point* mouse_position,
     int32_t click_count) {
   if (type != PP_INPUTEVENT_TYPE_MOUSEDOWN &&
       type != PP_INPUTEVENT_TYPE_MOUSEUP &&
       type != PP_INPUTEVENT_TYPE_MOUSEMOVE &&
       type != PP_INPUTEVENT_TYPE_MOUSEENTER &&
       type != PP_INPUTEVENT_TYPE_MOUSELEAVE)
     return 0;
 
   InputEventData data;
   data.event_type = type;
   data.event_time_stamp = time_stamp;
   data.event_modifiers = modifiers;
   data.mouse_button = mouse_button;
   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,
                                                   PP_Bool vertical) {
   return PPB_Scrollbar_Impl::Create(instance, PP_ToBool(vertical));
 }
 
 PP_Resource ResourceCreationImpl::CreateSurface3D(
     PP_Instance instance,
     PP_Config3D_Dev config,
@@ skipping 43 matching lines @@
     const PP_FloatPoint* wheel_ticks,
     PP_Bool scroll_by_page) {
   InputEventData data;
   data.event_type = PP_INPUTEVENT_TYPE_WHEEL;
   data.event_time_stamp = time_stamp;
   data.event_modifiers = modifiers;
   data.wheel_delta = *wheel_delta;
   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
 }  // namespace webkit