summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 00:01:30 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-07 00:01:30 +0000
commit56d7ad42237c35d2b7653c7cad89e9ca6ea75d68 (patch)
treeb16971de9045c0f3524566b5a242bef0ac0ab1db /ppapi/proxy
parentf26d7fa665143e0bf1c173e093f9eadce0a10e97 (diff)
downloadchromium_src-56d7ad42237c35d2b7653c7cad89e9ca6ea75d68.zip
chromium_src-56d7ad42237c35d2b7653c7cad89e9ca6ea75d68.tar.gz
chromium_src-56d7ad42237c35d2b7653c7cad89e9ca6ea75d68.tar.bz2
Revert 113290 - Rename the shared_impl resource files to give them more regular names.
I keep getting confused between things like AudioImpl and PPB_Audio_Impl. This uses _shared for the names, so now we have _impl, _proxy, and _shared which makes more sense. I also removed the ppb_opengles2_impl file since it was just a forward to the shared version. BUG= TEST= Review URL: http://codereview.chromium.org/8790004 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/8824015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy')
-rw-r--r--ppapi/proxy/interface_list.cc4
-rw-r--r--ppapi/proxy/ppapi_messages.h4
-rw-r--r--ppapi/proxy/ppapi_param_traits.h2
-rw-r--r--ppapi/proxy/ppb_audio_input_proxy.cc4
-rw-r--r--ppapi/proxy/ppb_audio_proxy.cc4
-rw-r--r--ppapi/proxy/ppb_file_ref_proxy.cc8
-rw-r--r--ppapi/proxy/ppb_graphics_3d_proxy.h4
-rw-r--r--ppapi/proxy/ppb_image_data_proxy.h4
-rw-r--r--ppapi/proxy/ppb_instance_proxy.cc17
-rw-r--r--ppapi/proxy/ppb_instance_proxy.h6
-rw-r--r--ppapi/proxy/ppb_testing_proxy.cc8
-rw-r--r--ppapi/proxy/ppb_video_decoder_proxy.cc4
-rw-r--r--ppapi/proxy/ppb_video_decoder_proxy.h2
-rw-r--r--ppapi/proxy/ppp_input_event_proxy.cc10
-rw-r--r--ppapi/proxy/resource_creation_proxy.cc32
15 files changed, 55 insertions, 58 deletions
diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index a1c100e..af36b88 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -94,7 +94,7 @@
#include "ppapi/proxy/ppp_mouse_lock_proxy.h"
#include "ppapi/proxy/ppp_video_decoder_proxy.h"
#include "ppapi/proxy/resource_creation_proxy.h"
-#include "ppapi/shared_impl/ppb_opengles2_shared.h"
+#include "ppapi/shared_impl/opengles2_impl.h"
#include "ppapi/thunk/thunk.h"
// Helper to get the proxy name PPB_Foo_Proxy given the API name PPB_Foo.
@@ -164,7 +164,7 @@ InterfaceList::InterfaceList() {
AddPPB(PPB_CORE_INTERFACE, API_ID_PPB_CORE,
PPB_Core_Proxy::GetPPB_Core_Interface());
AddPPB(PPB_OPENGLES2_INTERFACE, API_ID_NONE,
- PPB_OpenGLES2_Shared::GetInterface());
+ OpenGLES2Impl::GetInterface());
AddPPB(PPB_VAR_INTERFACE, API_ID_NONE,
GetPPB_Var_Interface());
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h
index b894db9..d6f0515 100644
--- a/ppapi/proxy/ppapi_messages.h
+++ b/ppapi/proxy/ppapi_messages.h
@@ -34,9 +34,9 @@
#include "ppapi/proxy/ppapi_proxy_export.h"
#include "ppapi/proxy/serialized_flash_menu.h"
#include "ppapi/proxy/serialized_structs.h"
+#include "ppapi/shared_impl/input_event_impl.h"
#include "ppapi/shared_impl/ppapi_preferences.h"
-#include "ppapi/shared_impl/ppb_input_event_shared.h"
-#include "ppapi/shared_impl/ppb_url_request_info_shared.h"
+#include "ppapi/shared_impl/url_request_info_impl.h"
#undef IPC_MESSAGE_EXPORT
#define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT
diff --git a/ppapi/proxy/ppapi_param_traits.h b/ppapi/proxy/ppapi_param_traits.h
index 57706c5..4787dca 100644
--- a/ppapi/proxy/ppapi_param_traits.h
+++ b/ppapi/proxy/ppapi_param_traits.h
@@ -14,7 +14,7 @@
#include "ppapi/c/pp_rect.h"
#include "ppapi/c/pp_var.h"
#include "ppapi/proxy/ppapi_proxy_export.h"
-#include "ppapi/shared_impl/ppb_file_ref_shared.h"
+#include "ppapi/shared_impl/file_ref_impl.h"
struct PP_FileInfo;
struct PP_ObjectProperty;
diff --git a/ppapi/proxy/ppb_audio_input_proxy.cc b/ppapi/proxy/ppb_audio_input_proxy.cc
index 5126f7d..2933edd 100644
--- a/ppapi/proxy/ppb_audio_input_proxy.cc
+++ b/ppapi/proxy/ppb_audio_input_proxy.cc
@@ -15,9 +15,9 @@
#include "ppapi/proxy/plugin_dispatcher.h"
#include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/shared_impl/api_id.h"
+#include "ppapi/shared_impl/audio_input_impl.h"
#include "ppapi/shared_impl/platform_file.h"
#include "ppapi/shared_impl/ppapi_globals.h"
-#include "ppapi/shared_impl/ppb_audio_input_shared.h"
#include "ppapi/shared_impl/resource.h"
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/ppb_audio_config_api.h"
@@ -32,7 +32,7 @@ using ppapi::thunk::PPB_AudioConfig_API;
namespace ppapi {
namespace proxy {
-class AudioInput : public Resource, public PPB_AudioInput_Shared {
+class AudioInput : public Resource, public AudioInputImpl {
public:
AudioInput(const HostResource& audio_input_id,
PP_Resource config_id,
diff --git a/ppapi/proxy/ppb_audio_proxy.cc b/ppapi/proxy/ppb_audio_proxy.cc
index 8e64c85..0c4ddc4 100644
--- a/ppapi/proxy/ppb_audio_proxy.cc
+++ b/ppapi/proxy/ppb_audio_proxy.cc
@@ -15,9 +15,9 @@
#include "ppapi/proxy/plugin_dispatcher.h"
#include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/shared_impl/api_id.h"
+#include "ppapi/shared_impl/audio_impl.h"
#include "ppapi/shared_impl/platform_file.h"
#include "ppapi/shared_impl/ppapi_globals.h"
-#include "ppapi/shared_impl/ppb_audio_shared.h"
#include "ppapi/shared_impl/resource.h"
#include "ppapi/thunk/ppb_audio_config_api.h"
#include "ppapi/thunk/enter.h"
@@ -32,7 +32,7 @@ using ppapi::thunk::PPB_AudioConfig_API;
namespace ppapi {
namespace proxy {
-class Audio : public Resource, public PPB_Audio_Shared {
+class Audio : public Resource, public AudioImpl {
public:
Audio(const HostResource& audio_id,
PP_Resource config_id,
diff --git a/ppapi/proxy/ppb_file_ref_proxy.cc b/ppapi/proxy/ppb_file_ref_proxy.cc
index 20b522c..5f1a05f 100644
--- a/ppapi/proxy/ppb_file_ref_proxy.cc
+++ b/ppapi/proxy/ppb_file_ref_proxy.cc
@@ -16,7 +16,7 @@
#include "ppapi/proxy/plugin_dispatcher.h"
#include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/proxy/serialized_var.h"
-#include "ppapi/shared_impl/ppb_file_ref_shared.h"
+#include "ppapi/shared_impl/file_ref_impl.h"
#include "ppapi/thunk/resource_creation_api.h"
#include "ppapi/thunk/thunk.h"
@@ -28,12 +28,12 @@ using ppapi::thunk::ResourceCreationAPI;
namespace ppapi {
namespace proxy {
-class FileRef : public PPB_FileRef_Shared {
+class FileRef : public FileRefImpl {
public:
explicit FileRef(const PPB_FileRef_CreateInfo& info);
virtual ~FileRef();
- // PPB_FileRef_API implementation (not provided by PPB_FileRef_Shared).
+ // PPB_FileRef_API implementation (not provided by FileRefImpl).
virtual PP_Resource GetParent() OVERRIDE;
virtual int32_t MakeDirectory(PP_Bool make_ancestors,
PP_CompletionCallback callback) OVERRIDE;
@@ -72,7 +72,7 @@ class FileRef : public PPB_FileRef_Shared {
};
FileRef::FileRef(const PPB_FileRef_CreateInfo& info)
- : PPB_FileRef_Shared(PPB_FileRef_Shared::InitAsProxy(), info),
+ : FileRefImpl(FileRefImpl::InitAsProxy(), info),
next_callback_id_(1) {
}
diff --git a/ppapi/proxy/ppb_graphics_3d_proxy.h b/ppapi/proxy/ppb_graphics_3d_proxy.h
index 887ae46..472c2a7 100644
--- a/ppapi/proxy/ppb_graphics_3d_proxy.h
+++ b/ppapi/proxy/ppb_graphics_3d_proxy.h
@@ -14,7 +14,7 @@
#include "ppapi/cpp/completion_callback.h"
#include "ppapi/proxy/interface_proxy.h"
#include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
-#include "ppapi/shared_impl/ppb_graphics_3d_shared.h"
+#include "ppapi/shared_impl/graphics_3d_impl.h"
#include "ppapi/shared_impl/resource.h"
namespace ppapi {
@@ -23,7 +23,7 @@ class HostResource;
namespace proxy {
-class Graphics3D : public Resource, public PPB_Graphics3D_Shared {
+class Graphics3D : public Resource, public Graphics3DImpl {
public:
explicit Graphics3D(const HostResource& resource);
virtual ~Graphics3D();
diff --git a/ppapi/proxy/ppb_image_data_proxy.h b/ppapi/proxy/ppb_image_data_proxy.h
index 6fd64f6..9250948 100644
--- a/ppapi/proxy/ppb_image_data_proxy.h
+++ b/ppapi/proxy/ppb_image_data_proxy.h
@@ -15,7 +15,7 @@
#include "ppapi/c/pp_var.h"
#include "ppapi/proxy/interface_proxy.h"
#include "ppapi/proxy/serialized_structs.h"
-#include "ppapi/shared_impl/ppb_image_data_shared.h"
+#include "ppapi/shared_impl/image_data_impl.h"
#include "ppapi/shared_impl/resource.h"
#include "ppapi/thunk/ppb_image_data_api.h"
@@ -36,7 +36,7 @@ namespace proxy {
// public in the header since a number of other resources need to access it.
class ImageData : public ppapi::Resource,
public ppapi::thunk::PPB_ImageData_API,
- public ppapi::PPB_ImageData_Shared {
+ public ppapi::ImageDataImpl {
public:
ImageData(const ppapi::HostResource& resource,
const PP_ImageDataDesc& desc,
diff --git a/ppapi/proxy/ppb_instance_proxy.cc b/ppapi/proxy/ppb_instance_proxy.cc
index af417e8..28bb17e 100644
--- a/ppapi/proxy/ppb_instance_proxy.cc
+++ b/ppapi/proxy/ppb_instance_proxy.cc
@@ -15,7 +15,7 @@
#include "ppapi/proxy/ppapi_messages.h"
#include "ppapi/proxy/serialized_var.h"
#include "ppapi/shared_impl/ppapi_globals.h"
-#include "ppapi/shared_impl/ppb_url_util_shared.h"
+#include "ppapi/shared_impl/url_util_impl.h"
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/thunk.h"
@@ -317,9 +317,8 @@ PP_Var PPB_Instance_Proxy::ResolveRelativeToDocument(
API_ID_PPB_INSTANCE, instance,
SerializedVarSendInput(dispatcher(), relative),
&result));
- return PPB_URLUtil_Shared::ConvertComponentsAndReturnURL(
- result.Return(dispatcher()),
- components);
+ return URLUtilImpl::ConvertComponentsAndReturnURL(result.Return(dispatcher()),
+ components);
}
PP_Bool PPB_Instance_Proxy::DocumentCanRequest(PP_Instance instance,
@@ -345,9 +344,8 @@ PP_Var PPB_Instance_Proxy::GetDocumentURL(PP_Instance instance,
ReceiveSerializedVarReturnValue result;
dispatcher()->Send(new PpapiHostMsg_PPBInstance_GetDocumentURL(
API_ID_PPB_INSTANCE, instance, &result));
- return PPB_URLUtil_Shared::ConvertComponentsAndReturnURL(
- result.Return(dispatcher()),
- components);
+ return URLUtilImpl::ConvertComponentsAndReturnURL(result.Return(dispatcher()),
+ components);
}
PP_Var PPB_Instance_Proxy::GetPluginInstanceURL(
@@ -356,9 +354,8 @@ PP_Var PPB_Instance_Proxy::GetPluginInstanceURL(
ReceiveSerializedVarReturnValue result;
dispatcher()->Send(new PpapiHostMsg_PPBInstance_GetPluginInstanceURL(
API_ID_PPB_INSTANCE, instance, &result));
- return PPB_URLUtil_Shared::ConvertComponentsAndReturnURL(
- result.Return(dispatcher()),
- components);
+ return URLUtilImpl::ConvertComponentsAndReturnURL(result.Return(dispatcher()),
+ components);
}
void PPB_Instance_Proxy::PostMessage(PP_Instance instance,
diff --git a/ppapi/proxy/ppb_instance_proxy.h b/ppapi/proxy/ppb_instance_proxy.h
index eeb791c..5de8f9e 100644
--- a/ppapi/proxy/ppb_instance_proxy.h
+++ b/ppapi/proxy/ppb_instance_proxy.h
@@ -13,7 +13,7 @@
#include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
#include "ppapi/shared_impl/function_group_base.h"
#include "ppapi/shared_impl/host_resource.h"
-#include "ppapi/shared_impl/ppb_instance_shared.h"
+#include "ppapi/shared_impl/instance_impl.h"
#include "ppapi/thunk/ppb_instance_api.h"
// Windows headers interfere with this file.
@@ -29,8 +29,8 @@ class SerializedVarOutParam;
class SerializedVarReturnValue;
class PPB_Instance_Proxy : public InterfaceProxy,
- public PPB_Instance_Shared,
- public thunk::PPB_Instance_FunctionAPI {
+ public ppapi::InstanceImpl,
+ public ppapi::thunk::PPB_Instance_FunctionAPI {
public:
PPB_Instance_Proxy(Dispatcher* dispatcher);
virtual ~PPB_Instance_Proxy();
diff --git a/ppapi/proxy/ppb_testing_proxy.cc b/ppapi/proxy/ppb_testing_proxy.cc
index bb9bad0..d9f90f2 100644
--- a/ppapi/proxy/ppb_testing_proxy.cc
+++ b/ppapi/proxy/ppb_testing_proxy.cc
@@ -165,10 +165,10 @@ void PPB_Testing_Proxy::OnMsgGetLiveObjectsForInstance(PP_Instance instance,
void PPB_Testing_Proxy::OnMsgSimulateInputEvent(
PP_Instance instance,
const InputEventData& input_event) {
- scoped_refptr<PPB_InputEvent_Shared> input_event_impl(
- new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsProxy(),
- instance,
- input_event));
+ scoped_refptr<InputEventImpl> input_event_impl(
+ new InputEventImpl(InputEventImpl::InitAsProxy(),
+ instance,
+ input_event));
ppb_testing_impl_->SimulateInputEvent(instance,
input_event_impl->pp_resource());
}
diff --git a/ppapi/proxy/ppb_video_decoder_proxy.cc b/ppapi/proxy/ppb_video_decoder_proxy.cc
index 850ae6e..91b91c6 100644
--- a/ppapi/proxy/ppb_video_decoder_proxy.cc
+++ b/ppapi/proxy/ppb_video_decoder_proxy.cc
@@ -23,7 +23,7 @@ using ppapi::thunk::PPB_VideoDecoder_API;
namespace ppapi {
namespace proxy {
-class VideoDecoder : public Resource, public PPB_VideoDecoder_Shared {
+class VideoDecoder : public Resource, public VideoDecoderImpl {
public:
// You must call Init() before using this class.
explicit VideoDecoder(const HostResource& resource);
@@ -132,7 +132,7 @@ void VideoDecoder::Destroy() {
FlushCommandBuffer();
GetDispatcher()->Send(new PpapiHostMsg_PPBVideoDecoder_Destroy(
API_ID_PPB_VIDEO_DECODER_DEV, host_resource()));
- PPB_VideoDecoder_Shared::Destroy();
+ VideoDecoderImpl::Destroy();
}
PluginDispatcher* VideoDecoder::GetDispatcher() const {
diff --git a/ppapi/proxy/ppb_video_decoder_proxy.h b/ppapi/proxy/ppb_video_decoder_proxy.h
index 1185d16..edebb0e 100644
--- a/ppapi/proxy/ppb_video_decoder_proxy.h
+++ b/ppapi/proxy/ppb_video_decoder_proxy.h
@@ -9,7 +9,7 @@
#include "ppapi/cpp/completion_callback.h"
#include "ppapi/proxy/interface_proxy.h"
#include "ppapi/proxy/proxy_non_thread_safe_ref_count.h"
-#include "ppapi/shared_impl/ppb_video_decoder_shared.h"
+#include "ppapi/shared_impl/video_decoder_impl.h"
#include "ppapi/thunk/ppb_video_decoder_api.h"
namespace ppapi {
diff --git a/ppapi/proxy/ppp_input_event_proxy.cc b/ppapi/proxy/ppp_input_event_proxy.cc
index cfce397..0215e72 100644
--- a/ppapi/proxy/ppp_input_event_proxy.cc
+++ b/ppapi/proxy/ppp_input_event_proxy.cc
@@ -11,7 +11,7 @@
#include "ppapi/proxy/plugin_dispatcher.h"
#include "ppapi/proxy/plugin_resource_tracker.h"
#include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/shared_impl/ppb_input_event_shared.h"
+#include "ppapi/shared_impl/input_event_impl.h"
#include "ppapi/thunk/enter.h"
#include "ppapi/thunk/ppb_input_event_api.h"
@@ -96,8 +96,8 @@ bool PPP_InputEvent_Proxy::OnMessageReceived(const IPC::Message& msg) {
void PPP_InputEvent_Proxy::OnMsgHandleInputEvent(PP_Instance instance,
const InputEventData& data) {
- scoped_refptr<PPB_InputEvent_Shared> resource(new PPB_InputEvent_Shared(
- PPB_InputEvent_Shared::InitAsProxy(), instance, data));
+ scoped_refptr<InputEventImpl> resource(new InputEventImpl(
+ InputEventImpl::InitAsProxy(), instance, data));
ppp_input_event_impl_->HandleInputEvent(instance, resource->pp_resource());
}
@@ -105,8 +105,8 @@ void PPP_InputEvent_Proxy::OnMsgHandleFilteredInputEvent(
PP_Instance instance,
const InputEventData& data,
PP_Bool* result) {
- scoped_refptr<PPB_InputEvent_Shared> resource(new PPB_InputEvent_Shared(
- PPB_InputEvent_Shared::InitAsProxy(), instance, data));
+ scoped_refptr<InputEventImpl> resource(new InputEventImpl(
+ InputEventImpl::InitAsProxy(), instance, data));
*result = ppp_input_event_impl_->HandleInputEvent(instance,
resource->pp_resource());
}
diff --git a/ppapi/proxy/resource_creation_proxy.cc b/ppapi/proxy/resource_creation_proxy.cc
index 52cce18..0a0846e 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/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/input_event_impl.h"
+#include "ppapi/shared_impl/url_request_info_impl.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 PPB_AudioConfig_Shared::CreateAsProxy(
+ return AudioConfigImpl::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 (!PPB_Font_Shared::IsPPFontDescriptionValid(*description))
+ if (!ppapi::FontImpl::IsPPFontDescriptionValid(*description))
return 0;
return (new Font(HostResource::MakeInstanceOnly(instance), *description))->
GetReference();
@@ -184,7 +184,7 @@ PP_Resource ResourceCreationProxy::CreateKeyboardInputEvent(
type != PP_INPUTEVENT_TYPE_KEYUP &&
type != PP_INPUTEVENT_TYPE_CHAR)
return 0;
- InputEventData data;
+ ppapi::InputEventData data;
data.event_type = type;
data.event_time_stamp = time_stamp;
data.event_modifiers = modifiers;
@@ -196,8 +196,8 @@ PP_Resource ResourceCreationProxy::CreateKeyboardInputEvent(
data.character_text = text_str->value();
}
- return (new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsProxy(),
- instance, data))->GetReference();
+ return (new InputEventImpl(InputEventImpl::InitAsProxy(),
+ instance, data))->GetReference();
}
PP_Resource ResourceCreationProxy::CreateMouseInputEvent(
@@ -216,7 +216,7 @@ PP_Resource ResourceCreationProxy::CreateMouseInputEvent(
type != PP_INPUTEVENT_TYPE_MOUSELEAVE)
return 0;
- InputEventData data;
+ ppapi::InputEventData data;
data.event_type = type;
data.event_time_stamp = time_stamp;
data.event_modifiers = modifiers;
@@ -225,8 +225,8 @@ PP_Resource ResourceCreationProxy::CreateMouseInputEvent(
data.mouse_click_count = click_count;
data.mouse_movement = *mouse_movement;
- return (new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsProxy(),
- instance, data))->GetReference();
+ return (new InputEventImpl(InputEventImpl::InitAsProxy(),
+ instance, data))->GetReference();
}
PP_Resource ResourceCreationProxy::CreateGraphics3D(
@@ -276,7 +276,7 @@ PP_Resource ResourceCreationProxy::CreateURLLoader(PP_Instance instance) {
PP_Resource ResourceCreationProxy::CreateURLRequestInfo(
PP_Instance instance,
const PPB_URLRequestInfo_Data& data) {
- return (new PPB_URLRequestInfo_Shared(
+ return (new URLRequestInfoImpl(
HostResource::MakeInstanceOnly(instance), data))->GetReference();
}
@@ -311,7 +311,7 @@ PP_Resource ResourceCreationProxy::CreateWheelInputEvent(
const PP_FloatPoint* wheel_delta,
const PP_FloatPoint* wheel_ticks,
PP_Bool scroll_by_page) {
- InputEventData data;
+ ppapi::InputEventData data;
data.event_type = PP_INPUTEVENT_TYPE_WHEEL;
data.event_time_stamp = time_stamp;
data.event_modifiers = modifiers;
@@ -319,8 +319,8 @@ PP_Resource ResourceCreationProxy::CreateWheelInputEvent(
data.wheel_ticks = *wheel_ticks;
data.wheel_scroll_by_page = PP_ToBool(scroll_by_page);
- return (new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsProxy(),
- instance, data))->GetReference();
+ return (new InputEventImpl(InputEventImpl::InitAsProxy(),
+ instance, data))->GetReference();
}
bool ResourceCreationProxy::Send(IPC::Message* msg) {