| Index: content/renderer/pepper/resource_creation_impl.cc
|
| diff --git a/content/renderer/pepper/resource_creation_impl.cc b/content/renderer/pepper/resource_creation_impl.cc
|
| index 5d2c0eee7c65b9eaddd5f9e6b8146b76f3d0f009..1a698b176096d2d2877d78038e3b2311e41a28c7 100644
|
| --- a/content/renderer/pepper/resource_creation_impl.cc
|
| +++ b/content/renderer/pepper/resource_creation_impl.cc
|
| @@ -29,8 +29,7 @@ namespace content {
|
| ResourceCreationImpl::ResourceCreationImpl(PepperPluginInstanceImpl* instance) {
|
| }
|
|
|
| -ResourceCreationImpl::~ResourceCreationImpl() {
|
| -}
|
| +ResourceCreationImpl::~ResourceCreationImpl() {}
|
|
|
| PP_Resource ResourceCreationImpl::CreateAudio1_0(
|
| PP_Instance instance,
|
| @@ -40,11 +39,10 @@ PP_Resource ResourceCreationImpl::CreateAudio1_0(
|
| return 0; // Not supported in-process.
|
| }
|
|
|
| -PP_Resource ResourceCreationImpl::CreateAudio(
|
| - PP_Instance instance,
|
| - PP_Resource config_id,
|
| - PPB_Audio_Callback audio_callback,
|
| - void* user_data) {
|
| +PP_Resource ResourceCreationImpl::CreateAudio(PP_Instance instance,
|
| + PP_Resource config_id,
|
| + PPB_Audio_Callback audio_callback,
|
| + void* user_data) {
|
| return 0; // Not supported in-process.
|
| }
|
|
|
| @@ -56,8 +54,7 @@ PP_Resource ResourceCreationImpl::CreateAudioConfig(
|
| ppapi::OBJECT_IS_IMPL, instance, sample_rate, sample_frame_count);
|
| }
|
|
|
| -PP_Resource ResourceCreationImpl::CreateAudioTrusted(
|
| - PP_Instance instance) {
|
| +PP_Resource ResourceCreationImpl::CreateAudioTrusted(PP_Instance instance) {
|
| return (new PPB_Audio_Impl(instance))->GetReference();
|
| }
|
|
|
| @@ -95,10 +92,9 @@ PP_Resource ResourceCreationImpl::CreateFlashMessageLoop(PP_Instance instance) {
|
| return PPB_Flash_MessageLoop_Impl::Create(instance);
|
| }
|
|
|
| -PP_Resource ResourceCreationImpl::CreateGraphics3D(
|
| - PP_Instance instance,
|
| - PP_Resource share_context,
|
| - const int32_t* attrib_list) {
|
| +PP_Resource ResourceCreationImpl::CreateGraphics3D(PP_Instance instance,
|
| + PP_Resource share_context,
|
| + const int32_t* attrib_list) {
|
| return PPB_Graphics3D_Impl::Create(instance, share_context, attrib_list);
|
| }
|
|
|
| @@ -118,14 +114,15 @@ PP_Resource ResourceCreationImpl::CreateHostResolverPrivate(
|
| return 0; // Not supported in-process.
|
| }
|
|
|
| -PP_Resource ResourceCreationImpl::CreateImageData(
|
| - PP_Instance instance,
|
| - PP_ImageDataFormat format,
|
| - const PP_Size* size,
|
| - PP_Bool init_to_zero) {
|
| +PP_Resource ResourceCreationImpl::CreateImageData(PP_Instance instance,
|
| + PP_ImageDataFormat format,
|
| + const PP_Size* size,
|
| + PP_Bool init_to_zero) {
|
| return PPB_ImageData_Impl::Create(instance,
|
| ppapi::PPB_ImageData_Shared::PLATFORM,
|
| - format, *size, init_to_zero);
|
| + format,
|
| + *size,
|
| + init_to_zero);
|
| }
|
|
|
| PP_Resource ResourceCreationImpl::CreateImageDataSimple(
|
| @@ -135,7 +132,9 @@ PP_Resource ResourceCreationImpl::CreateImageDataSimple(
|
| PP_Bool init_to_zero) {
|
| return PPB_ImageData_Impl::Create(instance,
|
| ppapi::PPB_ImageData_Shared::SIMPLE,
|
| - format, *size, init_to_zero);
|
| + format,
|
| + *size,
|
| + init_to_zero);
|
| }
|
|
|
| PP_Resource ResourceCreationImpl::CreateIMEInputEvent(
|
| @@ -148,9 +147,16 @@ PP_Resource ResourceCreationImpl::CreateIMEInputEvent(
|
| int32_t target_segment,
|
| uint32_t selection_start,
|
| uint32_t selection_end) {
|
| - return PPB_InputEvent_Shared::CreateIMEInputEvent(
|
| - ppapi::OBJECT_IS_IMPL, instance, type, time_stamp, text, segment_number,
|
| - segment_offsets, target_segment, selection_start, selection_end);
|
| + return PPB_InputEvent_Shared::CreateIMEInputEvent(ppapi::OBJECT_IS_IMPL,
|
| + instance,
|
| + type,
|
| + time_stamp,
|
| + text,
|
| + segment_number,
|
| + segment_offsets,
|
| + target_segment,
|
| + selection_start,
|
| + selection_end);
|
| }
|
|
|
| PP_Resource ResourceCreationImpl::CreateKeyboardInputEvent_1_0(
|
| @@ -161,9 +167,14 @@ PP_Resource ResourceCreationImpl::CreateKeyboardInputEvent_1_0(
|
| 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, code);
|
| + return PPB_InputEvent_Shared::CreateKeyboardInputEvent(ppapi::OBJECT_IS_IMPL,
|
| + instance,
|
| + type,
|
| + time_stamp,
|
| + modifiers,
|
| + key_code,
|
| + character_text,
|
| + code);
|
| }
|
|
|
| PP_Resource ResourceCreationImpl::CreateKeyboardInputEvent_1_2(
|
| @@ -174,9 +185,14 @@ PP_Resource ResourceCreationImpl::CreateKeyboardInputEvent_1_2(
|
| 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);
|
| + return PPB_InputEvent_Shared::CreateKeyboardInputEvent(ppapi::OBJECT_IS_IMPL,
|
| + instance,
|
| + type,
|
| + time_stamp,
|
| + modifiers,
|
| + key_code,
|
| + character_text,
|
| + code);
|
| }
|
|
|
| PP_Resource ResourceCreationImpl::CreateMouseInputEvent(
|
| @@ -188,9 +204,15 @@ PP_Resource ResourceCreationImpl::CreateMouseInputEvent(
|
| const PP_Point* mouse_position,
|
| int32_t click_count,
|
| const PP_Point* mouse_movement) {
|
| - return PPB_InputEvent_Shared::CreateMouseInputEvent(
|
| - ppapi::OBJECT_IS_IMPL, instance, type, time_stamp, modifiers,
|
| - mouse_button, mouse_position, click_count, mouse_movement);
|
| + return PPB_InputEvent_Shared::CreateMouseInputEvent(ppapi::OBJECT_IS_IMPL,
|
| + instance,
|
| + type,
|
| + time_stamp,
|
| + modifiers,
|
| + mouse_button,
|
| + mouse_position,
|
| + click_count,
|
| + mouse_movement);
|
| }
|
|
|
| PP_Resource ResourceCreationImpl::CreateNetAddressFromIPv4Address(
|
| @@ -211,11 +233,10 @@ PP_Resource ResourceCreationImpl::CreateNetAddressFromNetAddressPrivate(
|
| return 0; // Not supported in-process.
|
| }
|
|
|
| -PP_Resource ResourceCreationImpl::CreateTouchInputEvent(
|
| - PP_Instance instance,
|
| - PP_InputEvent_Type type,
|
| - PP_TimeTicks time_stamp,
|
| - uint32_t modifiers) {
|
| +PP_Resource ResourceCreationImpl::CreateTouchInputEvent(PP_Instance instance,
|
| + PP_InputEvent_Type type,
|
| + PP_TimeTicks time_stamp,
|
| + uint32_t modifiers) {
|
| return PPB_InputEvent_Shared::CreateTouchInputEvent(
|
| ppapi::OBJECT_IS_IMPL, instance, type, time_stamp, modifiers);
|
| }
|
| @@ -279,13 +300,11 @@ PP_Resource ResourceCreationImpl::CreateVideoDecoder(
|
| return PPB_VideoDecoder_Impl::Create(instance, graphics3d_id, profile);
|
| }
|
|
|
| -PP_Resource ResourceCreationImpl::CreateVideoDestination(
|
| - PP_Instance instance) {
|
| +PP_Resource ResourceCreationImpl::CreateVideoDestination(PP_Instance instance) {
|
| return 0; // Not supported in-process.
|
| }
|
|
|
| -PP_Resource ResourceCreationImpl::CreateVideoSource(
|
| - PP_Instance instance) {
|
| +PP_Resource ResourceCreationImpl::CreateVideoSource(PP_Instance instance) {
|
| return 0; // Not supported in-process.
|
| }
|
|
|
| @@ -296,9 +315,13 @@ PP_Resource ResourceCreationImpl::CreateWheelInputEvent(
|
| const PP_FloatPoint* wheel_delta,
|
| const PP_FloatPoint* wheel_ticks,
|
| PP_Bool scroll_by_page) {
|
| - return PPB_InputEvent_Shared::CreateWheelInputEvent(
|
| - ppapi::OBJECT_IS_IMPL, instance, time_stamp, modifiers,
|
| - wheel_delta, wheel_ticks, scroll_by_page);
|
| + return PPB_InputEvent_Shared::CreateWheelInputEvent(ppapi::OBJECT_IS_IMPL,
|
| + instance,
|
| + time_stamp,
|
| + modifiers,
|
| + wheel_delta,
|
| + wheel_ticks,
|
| + scroll_by_page);
|
| }
|
|
|
| PP_Resource ResourceCreationImpl::CreateX509CertificatePrivate(
|
|
|