Index: ppapi/proxy/resource_creation_proxy.cc |
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc |
index 77936c491584e4d18ff4cbb0829976de324b04a1..38244ed9ec32abe00d07f0e9f30e1205643f6edd 100644 |
--- a/ppapi/proxy/resource_creation_proxy.cc |
+++ b/ppapi/proxy/resource_creation_proxy.cc |
@@ -29,12 +29,12 @@ |
#include "ppapi/proxy/ppb_video_capture_proxy.h" |
#include "ppapi/proxy/ppb_video_decoder_proxy.h" |
#include "ppapi/shared_impl/api_id.h" |
-#include "ppapi/shared_impl/audio_config_impl.h" |
-#include "ppapi/shared_impl/font_impl.h" |
#include "ppapi/shared_impl/function_group_base.h" |
#include "ppapi/shared_impl/host_resource.h" |
-#include "ppapi/shared_impl/input_event_impl.h" |
-#include "ppapi/shared_impl/url_request_info_impl.h" |
+#include "ppapi/shared_impl/ppb_audio_config_shared.h" |
+#include "ppapi/shared_impl/ppb_font_shared.h" |
+#include "ppapi/shared_impl/ppb_input_event_shared.h" |
+#include "ppapi/shared_impl/ppb_url_request_info_shared.h" |
#include "ppapi/shared_impl/var.h" |
#include "ppapi/thunk/enter.h" |
#include "ppapi/thunk/ppb_image_data_api.h" |
@@ -73,7 +73,7 @@ PP_Resource ResourceCreationProxy::CreateAudioConfig( |
PP_Instance instance, |
PP_AudioSampleRate sample_rate, |
uint32_t sample_frame_count) { |
- return AudioConfigImpl::CreateAsProxy( |
+ return PPB_AudioConfig_Shared::CreateAsProxy( |
instance, sample_rate, sample_frame_count); |
} |
@@ -151,7 +151,7 @@ PP_Resource ResourceCreationProxy::CreateFlashNetConnector( |
PP_Resource ResourceCreationProxy::CreateFontObject( |
PP_Instance instance, |
const PP_FontDescription_Dev* description) { |
- if (!ppapi::FontImpl::IsPPFontDescriptionValid(*description)) |
+ if (!PPB_Font_Shared::IsPPFontDescriptionValid(*description)) |
return 0; |
return (new Font(HostResource::MakeInstanceOnly(instance), *description))-> |
GetReference(); |
@@ -201,7 +201,7 @@ PP_Resource ResourceCreationProxy::CreateKeyboardInputEvent( |
type != PP_INPUTEVENT_TYPE_KEYUP && |
type != PP_INPUTEVENT_TYPE_CHAR) |
return 0; |
- ppapi::InputEventData data; |
+ InputEventData data; |
data.event_type = type; |
data.event_time_stamp = time_stamp; |
data.event_modifiers = modifiers; |
@@ -213,8 +213,8 @@ PP_Resource ResourceCreationProxy::CreateKeyboardInputEvent( |
data.character_text = text_str->value(); |
} |
- return (new InputEventImpl(InputEventImpl::InitAsProxy(), |
- instance, data))->GetReference(); |
+ return (new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsProxy(), |
+ instance, data))->GetReference(); |
} |
PP_Resource ResourceCreationProxy::CreateMouseInputEvent( |
@@ -233,7 +233,7 @@ PP_Resource ResourceCreationProxy::CreateMouseInputEvent( |
type != PP_INPUTEVENT_TYPE_MOUSELEAVE) |
return 0; |
- ppapi::InputEventData data; |
+ InputEventData data; |
data.event_type = type; |
data.event_time_stamp = time_stamp; |
data.event_modifiers = modifiers; |
@@ -242,8 +242,8 @@ PP_Resource ResourceCreationProxy::CreateMouseInputEvent( |
data.mouse_click_count = click_count; |
data.mouse_movement = *mouse_movement; |
- return (new InputEventImpl(InputEventImpl::InitAsProxy(), |
- instance, data))->GetReference(); |
+ return (new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsProxy(), |
+ instance, data))->GetReference(); |
} |
PP_Resource ResourceCreationProxy::CreateGraphics3D( |
@@ -293,7 +293,7 @@ PP_Resource ResourceCreationProxy::CreateURLLoader(PP_Instance instance) { |
PP_Resource ResourceCreationProxy::CreateURLRequestInfo( |
PP_Instance instance, |
const PPB_URLRequestInfo_Data& data) { |
- return (new URLRequestInfoImpl( |
+ return (new PPB_URLRequestInfo_Shared( |
HostResource::MakeInstanceOnly(instance), data))->GetReference(); |
} |
@@ -328,7 +328,7 @@ PP_Resource ResourceCreationProxy::CreateWheelInputEvent( |
const PP_FloatPoint* wheel_delta, |
const PP_FloatPoint* wheel_ticks, |
PP_Bool scroll_by_page) { |
- ppapi::InputEventData data; |
+ InputEventData data; |
data.event_type = PP_INPUTEVENT_TYPE_WHEEL; |
data.event_time_stamp = time_stamp; |
data.event_modifiers = modifiers; |
@@ -336,8 +336,8 @@ PP_Resource ResourceCreationProxy::CreateWheelInputEvent( |
data.wheel_ticks = *wheel_ticks; |
data.wheel_scroll_by_page = PP_ToBool(scroll_by_page); |
- return (new InputEventImpl(InputEventImpl::InitAsProxy(), |
- instance, data))->GetReference(); |
+ return (new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsProxy(), |
+ instance, data))->GetReference(); |
} |
bool ResourceCreationProxy::Send(IPC::Message* msg) { |
@@ -360,7 +360,7 @@ void ResourceCreationProxy::OnMsgCreateGraphics2D(PP_Instance instance, |
const PP_Size& size, |
PP_Bool is_always_opaque, |
HostResource* result) { |
- ppapi::thunk::EnterFunction<ResourceCreationAPI> enter(instance, false); |
+ thunk::EnterFunction<ResourceCreationAPI> enter(instance, false); |
if (enter.succeeded()) { |
result->SetHostResource(instance, enter.functions()->CreateGraphics2D( |
instance, size, is_always_opaque)); |
@@ -377,7 +377,7 @@ void ResourceCreationProxy::OnMsgCreateImageData( |
ImageHandle* result_image_handle) { |
*result_image_handle = ImageData::NullHandle; |
- ppapi::thunk::EnterFunction<ResourceCreationAPI> enter(instance, false); |
+ thunk::EnterFunction<ResourceCreationAPI> enter(instance, false); |
if (enter.failed()) |
return; |
@@ -388,8 +388,8 @@ void ResourceCreationProxy::OnMsgCreateImageData( |
result->SetHostResource(instance, resource); |
// Get the description, it's just serialized as a string. |
- ppapi::thunk::EnterResourceNoLock<ppapi::thunk::PPB_ImageData_API> |
- enter_resource(resource, false); |
+ thunk::EnterResourceNoLock<thunk::PPB_ImageData_API> enter_resource( |
+ resource, false); |
PP_ImageDataDesc desc; |
if (enter_resource.object()->Describe(&desc) == PP_TRUE) { |
image_data_desc->resize(sizeof(PP_ImageDataDesc)); |