diff options
Diffstat (limited to 'webkit/plugins')
20 files changed, 59 insertions, 99 deletions
diff --git a/webkit/plugins/ppapi/event_conversion.cc b/webkit/plugins/ppapi/event_conversion.cc index 5411671..d78ad39 100644 --- a/webkit/plugins/ppapi/event_conversion.cc +++ b/webkit/plugins/ppapi/event_conversion.cc @@ -13,7 +13,7 @@ #include "base/utf_string_conversions.h" #include "base/utf_string_conversion_utils.h" #include "ppapi/c/pp_input_event.h" -#include "ppapi/shared_impl/input_event_impl.h" +#include "ppapi/shared_impl/ppb_input_event_shared.h" #include "ppapi/shared_impl/time_conversion.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h" diff --git a/webkit/plugins/ppapi/plugin_module.cc b/webkit/plugins/ppapi/plugin_module.cc index 87bc066..fc5b2a1 100644 --- a/webkit/plugins/ppapi/plugin_module.cc +++ b/webkit/plugins/ppapi/plugin_module.cc @@ -83,7 +83,8 @@ #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h" #include "ppapi/c/trusted/ppb_image_data_trusted.h" #include "ppapi/c/trusted/ppb_url_loader_trusted.h" -#include "ppapi/shared_impl/input_event_impl.h" +#include "ppapi/shared_impl/ppb_input_event_shared.h" +#include "ppapi/shared_impl/ppb_opengles2_shared.h" #include "ppapi/shared_impl/time_conversion.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/thunk.h" @@ -105,7 +106,6 @@ #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h" #include "webkit/plugins/ppapi/ppb_image_data_impl.h" #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h" -#include "webkit/plugins/ppapi/ppb_opengles_impl.h" #include "webkit/plugins/ppapi/ppb_proxy_impl.h" #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h" #include "webkit/plugins/ppapi/ppb_uma_private_impl.h" @@ -314,7 +314,7 @@ const void* GetInterface(const char* name) { if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE) == 0) return ::ppapi::thunk::GetPPB_Instance_Private_Thunk(); if (strcmp(name, PPB_OPENGLES2_INTERFACE) == 0) - return PPB_OpenGLES_Impl::GetInterface(); + return ::ppapi::PPB_OpenGLES2_Shared::GetInterface(); if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0) return PPB_Proxy_Impl::GetInterface(); if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0) diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index f116d6c..92882f9 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -34,10 +34,10 @@ #include "ppapi/c/ppp_mouse_lock.h" #include "ppapi/c/private/ppb_instance_private.h" #include "ppapi/c/private/ppp_instance_private.h" -#include "ppapi/shared_impl/input_event_impl.h" +#include "ppapi/shared_impl/ppb_input_event_shared.h" +#include "ppapi/shared_impl/ppb_url_util_shared.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/shared_impl/time_conversion.h" -#include "ppapi/shared_impl/url_util_impl.h" #include "ppapi/shared_impl/var.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_buffer_api.h" @@ -101,7 +101,7 @@ using base::StringPrintf; using ppapi::InputEventData; -using ppapi::InputEventImpl; +using ppapi::PPB_InputEvent_Shared; using ppapi::PpapiGlobals; using ppapi::StringVar; using ppapi::thunk::EnterResourceNoLock; @@ -588,9 +588,9 @@ bool PluginInstance::SendCompositionEventWithUnderlineInformationToPlugin( event.is_filtered = true; else handled = true; // Unfiltered events are assumed to be handled. - scoped_refptr<InputEventImpl> event_resource( - new InputEventImpl(InputEventImpl::InitAsImpl(), - pp_instance(), event)); + scoped_refptr<PPB_InputEvent_Shared> event_resource( + new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(), + pp_instance(), event)); handled |= PP_ToBool(plugin_input_event_interface_->HandleInputEvent( pp_instance(), event_resource->pp_resource())); return handled; @@ -687,9 +687,9 @@ bool PluginInstance::HandleInputEvent(const WebKit::WebInputEvent& event, events[i].is_filtered = true; else rv = true; // Unfiltered events are assumed to be handled. - scoped_refptr<InputEventImpl> event_resource( - new InputEventImpl(InputEventImpl::InitAsImpl(), - pp_instance(), events[i])); + scoped_refptr<PPB_InputEvent_Shared> event_resource( + new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(), + pp_instance(), events[i])); rv |= PP_ToBool(plugin_input_event_interface_->HandleInputEvent( pp_instance(), event_resource->pp_resource())); @@ -1895,7 +1895,7 @@ PP_Var PluginInstance::ResolveRelativeToDocument( WebElement plugin_element = container()->element(); GURL document_url = plugin_element.document().baseURL(); - return ::ppapi::URLUtilImpl::GenerateURLReturn( + return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn( module()->pp_module(), document_url.Resolve(relative_string->value()), components); @@ -1933,15 +1933,16 @@ PP_Bool PluginInstance::DocumentCanAccessDocument(PP_Instance instance, PP_Var PluginInstance::GetDocumentURL(PP_Instance instance, PP_URLComponents_Dev* components) { WebKit::WebDocument document = container()->element().document(); - return ::ppapi::URLUtilImpl::GenerateURLReturn(module()->pp_module(), - document.url(), components); + return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn( + module()->pp_module(), document.url(), components); } PP_Var PluginInstance::GetPluginInstanceURL( PP_Instance instance, PP_URLComponents_Dev* components) { - return ::ppapi::URLUtilImpl::GenerateURLReturn(module()->pp_module(), - plugin_url_, components); + return ::ppapi::PPB_URLUtil_Shared::GenerateURLReturn(module()->pp_module(), + plugin_url_, + components); } void PluginInstance::DoSetCursor(WebCursorInfo* cursor) { diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.h b/webkit/plugins/ppapi/ppapi_plugin_instance.h index a2d429b..83dcf43 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.h +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.h @@ -26,7 +26,7 @@ #include "ppapi/c/ppp_graphics_3d.h" #include "ppapi/c/ppp_instance.h" #include "ppapi/shared_impl/function_group_base.h" -#include "ppapi/shared_impl/instance_impl.h" +#include "ppapi/shared_impl/ppb_instance_shared.h" #include "ppapi/shared_impl/ppp_instance_combined.h" #include "ppapi/thunk/ppb_instance_api.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -86,7 +86,7 @@ class WEBKIT_PLUGINS_EXPORT PluginInstance : public base::RefCounted<PluginInstance>, public ::ppapi::FunctionGroupBase, NON_EXPORTED_BASE(public ::ppapi::thunk::PPB_Instance_FunctionAPI), - public ::ppapi::InstanceImpl { + public ::ppapi::PPB_Instance_Shared { public: // Create and return a PluginInstance object which supports the // PPP_Instance_1_0 interface. diff --git a/webkit/plugins/ppapi/ppb_audio_impl.h b/webkit/plugins/ppapi/ppb_audio_impl.h index 47c2e78..d131090 100644 --- a/webkit/plugins/ppapi/ppb_audio_impl.h +++ b/webkit/plugins/ppapi/ppb_audio_impl.h @@ -13,10 +13,10 @@ #include "ppapi/c/ppb_audio.h" #include "ppapi/c/ppb_audio_config.h" #include "ppapi/c/trusted/ppb_audio_trusted.h" -#include "ppapi/shared_impl/audio_config_impl.h" -#include "ppapi/shared_impl/audio_impl.h" -#include "ppapi/shared_impl/scoped_pp_resource.h" +#include "ppapi/shared_impl/ppb_audio_config_shared.h" +#include "ppapi/shared_impl/ppb_audio_shared.h" #include "ppapi/shared_impl/resource.h" +#include "ppapi/shared_impl/scoped_pp_resource.h" #include "webkit/plugins/ppapi/audio_helper.h" #include "webkit/plugins/ppapi/plugin_delegate.h" #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" @@ -25,9 +25,9 @@ namespace webkit { namespace ppapi { // Some of the backend functionality of this class is implemented by the -// AudioImpl so it can be shared with the proxy. +// PPB_Audio_Shared so it can be shared with the proxy. class PPB_Audio_Impl : public ::ppapi::Resource, - public ::ppapi::AudioImpl, + public ::ppapi::PPB_Audio_Shared, public AudioHelper { public: // Trusted initialization. You must call Init after this. diff --git a/webkit/plugins/ppapi/ppb_audio_input_impl.h b/webkit/plugins/ppapi/ppb_audio_input_impl.h index 4435eb6..f18a7a0 100644 --- a/webkit/plugins/ppapi/ppb_audio_input_impl.h +++ b/webkit/plugins/ppapi/ppb_audio_input_impl.h @@ -12,8 +12,8 @@ #include "ppapi/c/dev/ppb_audio_input_dev.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/trusted/ppb_audio_input_trusted_dev.h" -#include "ppapi/shared_impl/audio_config_impl.h" -#include "ppapi/shared_impl/audio_input_impl.h" +#include "ppapi/shared_impl/ppb_audio_config_shared.h" +#include "ppapi/shared_impl/ppb_audio_input_shared.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/shared_impl/scoped_pp_resource.h" #include "webkit/plugins/ppapi/audio_helper.h" @@ -26,7 +26,7 @@ namespace ppapi { // Some of the backend functionality of this class is implemented by the // AudioInputImpl so it can be shared with the proxy. class PPB_AudioInput_Impl : public ::ppapi::Resource, - public ::ppapi::AudioInputImpl, + public ::ppapi::PPB_AudioInput_Shared, public AudioHelper { public: // Trusted initialization. You must call Init after this. diff --git a/webkit/plugins/ppapi/ppb_file_ref_impl.cc b/webkit/plugins/ppapi/ppb_file_ref_impl.cc index 3b39ce6..bc0de22 100644 --- a/webkit/plugins/ppapi/ppb_file_ref_impl.cc +++ b/webkit/plugins/ppapi/ppb_file_ref_impl.cc @@ -80,14 +80,14 @@ std::string GetNameForVirtualFilePath(const std::string& path) { PPB_FileRef_Impl::PPB_FileRef_Impl(const PPB_FileRef_CreateInfo& info, PPB_FileSystem_Impl* file_system) - : FileRefImpl(FileRefImpl::InitAsImpl(), info), + : PPB_FileRef_Shared(PPB_FileRef_Shared::InitAsImpl(), info), file_system_(file_system), external_file_system_path_() { } PPB_FileRef_Impl::PPB_FileRef_Impl(const PPB_FileRef_CreateInfo& info, const FilePath& external_file_path) - : FileRefImpl(FileRefImpl::InitAsImpl(), info), + : PPB_FileRef_Shared(PPB_FileRef_Shared::InitAsImpl(), info), file_system_(), external_file_system_path_(external_file_path) { } diff --git a/webkit/plugins/ppapi/ppb_file_ref_impl.h b/webkit/plugins/ppapi/ppb_file_ref_impl.h index 39bc80b..c9b1dbf 100644 --- a/webkit/plugins/ppapi/ppb_file_ref_impl.h +++ b/webkit/plugins/ppapi/ppb_file_ref_impl.h @@ -10,7 +10,7 @@ #include "base/file_path.h" #include "googleurl/src/gurl.h" #include "ppapi/c/ppb_file_ref.h" -#include "ppapi/shared_impl/file_ref_impl.h" +#include "ppapi/shared_impl/ppb_file_ref_shared.h" #include "ppapi/shared_impl/var.h" namespace webkit { @@ -20,7 +20,7 @@ using ::ppapi::StringVar; class PPB_FileSystem_Impl; -class PPB_FileRef_Impl : public ::ppapi::FileRefImpl { +class PPB_FileRef_Impl : public ::ppapi::PPB_FileRef_Shared { public: PPB_FileRef_Impl(const ::ppapi::PPB_FileRef_CreateInfo& info, PPB_FileSystem_Impl* file_system); @@ -36,7 +36,7 @@ class PPB_FileRef_Impl : public ::ppapi::FileRefImpl { static PPB_FileRef_Impl* CreateExternal(PP_Instance instance, const FilePath& external_file_path); - // PPB_FileRef_API implementation (not provided by FileRefImpl). + // PPB_FileRef_API implementation (not provided by PPB_FileRef_Shared). virtual PP_Resource GetParent() OVERRIDE; virtual int32_t MakeDirectory(PP_Bool make_ancestors, PP_CompletionCallback callback) OVERRIDE; diff --git a/webkit/plugins/ppapi/ppb_font_impl.cc b/webkit/plugins/ppapi/ppb_font_impl.cc index a714e03..cac50b5 100644 --- a/webkit/plugins/ppapi/ppb_font_impl.cc +++ b/webkit/plugins/ppapi/ppb_font_impl.cc @@ -5,8 +5,8 @@ #include "webkit/plugins/ppapi/ppb_font_impl.h" #include "ppapi/c/dev/ppb_font_dev.h" -#include "ppapi/shared_impl/font_impl.h" #include "ppapi/shared_impl/ppapi_preferences.h" +#include "ppapi/shared_impl/ppb_font_shared.h" #include "ppapi/shared_impl/var.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/thunk.h" @@ -64,7 +64,7 @@ PPB_Font_Impl::~PPB_Font_Impl() { // static PP_Resource PPB_Font_Impl::Create(PP_Instance instance, const PP_FontDescription_Dev& description) { - if (!::ppapi::FontImpl::IsPPFontDescriptionValid(description)) + if (!::ppapi::PPB_Font_Shared::IsPPFontDescriptionValid(description)) return 0; return (new PPB_Font_Impl(instance, description))->GetReference(); } diff --git a/webkit/plugins/ppapi/ppb_graphics_3d_impl.h b/webkit/plugins/ppapi/ppb_graphics_3d_impl.h index 250911b..728f58a 100644 --- a/webkit/plugins/ppapi/ppb_graphics_3d_impl.h +++ b/webkit/plugins/ppapi/ppb_graphics_3d_impl.h @@ -6,7 +6,7 @@ #define WEBKIT_PLUGINS_PPAPI_PPB_GRAPHICS_3D_IMPL_H_ #include "base/memory/weak_ptr.h" -#include "ppapi/shared_impl/graphics_3d_impl.h" +#include "ppapi/shared_impl/ppb_graphics_3d_shared.h" #include "ppapi/shared_impl/resource.h" #include "webkit/plugins/ppapi/plugin_delegate.h" @@ -14,7 +14,7 @@ namespace webkit { namespace ppapi { class PPB_Graphics3D_Impl : public ::ppapi::Resource, - public ::ppapi::Graphics3DImpl { + public ::ppapi::PPB_Graphics3D_Shared { public: virtual ~PPB_Graphics3D_Impl(); @@ -62,7 +62,7 @@ class PPB_Graphics3D_Impl : public ::ppapi::Resource, } protected: - // ppapi::Graphics3DImpl overrides. + // ppapi::PPB_Graphics3D_Shared overrides. virtual gpu::CommandBuffer* GetCommandBuffer() OVERRIDE; virtual int32 DoSwapBuffers() OVERRIDE; diff --git a/webkit/plugins/ppapi/ppb_image_data_impl.h b/webkit/plugins/ppapi/ppb_image_data_impl.h index 1c6b7ff..64685d0 100644 --- a/webkit/plugins/ppapi/ppb_image_data_impl.h +++ b/webkit/plugins/ppapi/ppb_image_data_impl.h @@ -8,7 +8,7 @@ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "ppapi/c/ppb_image_data.h" -#include "ppapi/shared_impl/image_data_impl.h" +#include "ppapi/shared_impl/ppb_image_data_shared.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/thunk/ppb_image_data_api.h" #include "webkit/plugins/ppapi/plugin_delegate.h" @@ -24,7 +24,7 @@ namespace webkit { namespace ppapi { class PPB_ImageData_Impl : public ::ppapi::Resource, - public ::ppapi::ImageDataImpl, + public ::ppapi::PPB_ImageData_Shared, public ::ppapi::thunk::PPB_ImageData_API { public: // If you call this constructor, you must also call Init before use. Normally diff --git a/webkit/plugins/ppapi/ppb_opengles_impl.cc b/webkit/plugins/ppapi/ppb_opengles_impl.cc deleted file mode 100644 index 1f95df5..0000000 --- a/webkit/plugins/ppapi/ppb_opengles_impl.cc +++ /dev/null @@ -1,18 +0,0 @@ -// 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/ppb_opengles_impl.h" - -#include "ppapi/shared_impl/opengles2_impl.h" - -namespace webkit { -namespace ppapi { - -const PPB_OpenGLES2* PPB_OpenGLES_Impl::GetInterface() { - return ::ppapi::OpenGLES2Impl::GetInterface(); -} - -} // namespace ppapi -} // namespace webkit - diff --git a/webkit/plugins/ppapi/ppb_opengles_impl.h b/webkit/plugins/ppapi/ppb_opengles_impl.h deleted file mode 100644 index e4a69d2..0000000 --- a/webkit/plugins/ppapi/ppb_opengles_impl.h +++ /dev/null @@ -1,22 +0,0 @@ -// 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. - -#ifndef WEBKIT_PLUGINS_PPAPI_PPB_OPENGLES_IMPL_H_ -#define WEBKIT_PLUGINS_PPAPI_PPB_OPENGLES_IMPL_H_ - -struct PPB_OpenGLES2; - -namespace webkit { -namespace ppapi { - -class PPB_OpenGLES_Impl { - public: - static const PPB_OpenGLES2* GetInterface(); -}; - -} // namespace ppapi -} // namespace webkit - -#endif // WEBKIT_PLUGINS_PPAPI_PPB_OPENGLES_IMPL_H_ - diff --git a/webkit/plugins/ppapi/ppb_url_loader_impl.h b/webkit/plugins/ppapi/ppb_url_loader_impl.h index 61f4cde..326568e 100644 --- a/webkit/plugins/ppapi/ppb_url_loader_impl.h +++ b/webkit/plugins/ppapi/ppb_url_loader_impl.h @@ -11,8 +11,8 @@ #include "base/memory/scoped_ptr.h" #include "ppapi/c/pp_completion_callback.h" #include "ppapi/c/trusted/ppb_url_loader_trusted.h" +#include "ppapi/shared_impl/ppb_url_request_info_shared.h" #include "ppapi/shared_impl/resource.h" -#include "ppapi/shared_impl/url_request_info_impl.h" #include "ppapi/thunk/ppb_url_loader_api.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoaderClient.h" #include "webkit/plugins/ppapi/callbacks.h" diff --git a/webkit/plugins/ppapi/ppb_url_request_info_impl.cc b/webkit/plugins/ppapi/ppb_url_request_info_impl.cc index eceedd7..dcea987 100644 --- a/webkit/plugins/ppapi/ppb_url_request_info_impl.cc +++ b/webkit/plugins/ppapi/ppb_url_request_info_impl.cc @@ -49,7 +49,7 @@ const int32_t kDefaultPrefetchBufferLowerThreshold = 50 * 1000 * 1000; PPB_URLRequestInfo_Impl::PPB_URLRequestInfo_Impl( PP_Instance instance, const PPB_URLRequestInfo_Data& data) - : URLRequestInfoImpl(instance, data) { + : PPB_URLRequestInfo_Shared(instance, data) { } PPB_URLRequestInfo_Impl::~PPB_URLRequestInfo_Impl() { diff --git a/webkit/plugins/ppapi/ppb_url_request_info_impl.h b/webkit/plugins/ppapi/ppb_url_request_info_impl.h index d9841f0..d2403b6 100644 --- a/webkit/plugins/ppapi/ppb_url_request_info_impl.h +++ b/webkit/plugins/ppapi/ppb_url_request_info_impl.h @@ -7,7 +7,7 @@ #include "base/memory/ref_counted.h" #include "ppapi/thunk/ppb_url_request_info_api.h" -#include "ppapi/shared_impl/url_request_info_impl.h" +#include "ppapi/shared_impl/ppb_url_request_info_shared.h" #include "webkit/plugins/webkit_plugins_export.h" namespace WebKit { @@ -20,7 +20,7 @@ namespace webkit { namespace ppapi { class WEBKIT_PLUGINS_EXPORT PPB_URLRequestInfo_Impl : - public ::ppapi::URLRequestInfoImpl { + public ::ppapi::PPB_URLRequestInfo_Shared { public: explicit PPB_URLRequestInfo_Impl( PP_Instance instance, diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc index f108ecf..a226a77 100644 --- a/webkit/plugins/ppapi/ppb_video_decoder_impl.cc +++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.cc @@ -190,7 +190,7 @@ void PPB_VideoDecoder_Impl::Destroy() { FlushCommandBuffer(); platform_video_decoder_->Destroy(); - ::ppapi::VideoDecoderImpl::Destroy(); + ::ppapi::PPB_VideoDecoder_Shared::Destroy(); platform_video_decoder_ = NULL; ppp_videodecoder_ = NULL; } diff --git a/webkit/plugins/ppapi/ppb_video_decoder_impl.h b/webkit/plugins/ppapi/ppb_video_decoder_impl.h index a989ff8..47a9af4 100644 --- a/webkit/plugins/ppapi/ppb_video_decoder_impl.h +++ b/webkit/plugins/ppapi/ppb_video_decoder_impl.h @@ -13,8 +13,8 @@ #include "base/memory/scoped_ptr.h" #include "ppapi/c/dev/pp_video_dev.h" #include "ppapi/c/pp_var.h" +#include "ppapi/shared_impl/ppb_video_decoder_shared.h" #include "ppapi/shared_impl/resource.h" -#include "ppapi/shared_impl/video_decoder_impl.h" #include "ppapi/thunk/ppb_video_decoder_api.h" #include "webkit/plugins/ppapi/plugin_delegate.h" @@ -33,7 +33,7 @@ namespace webkit { namespace ppapi { class PPB_VideoDecoder_Impl : public ::ppapi::Resource, - public ::ppapi::VideoDecoderImpl, + public ::ppapi::PPB_VideoDecoder_Shared, public media::VideoDecodeAccelerator::Client { public: virtual ~PPB_VideoDecoder_Impl(); diff --git a/webkit/plugins/ppapi/resource_creation_impl.cc b/webkit/plugins/ppapi/resource_creation_impl.cc index d2b57f3..4b2e364 100644 --- a/webkit/plugins/ppapi/resource_creation_impl.cc +++ b/webkit/plugins/ppapi/resource_creation_impl.cc @@ -5,8 +5,8 @@ #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/ppb_audio_config_shared.h" +#include "ppapi/shared_impl/ppb_input_event_shared.h" #include "ppapi/shared_impl/var.h" #include "webkit/plugins/ppapi/common.h" #include "webkit/plugins/ppapi/ppb_audio_impl.h" @@ -36,7 +36,7 @@ #include "webkit/plugins/ppapi/ppb_websocket_impl.h" using ppapi::InputEventData; -using ppapi::InputEventImpl; +using ppapi::PPB_InputEvent_Shared; using ppapi::StringVar; namespace webkit { @@ -66,8 +66,8 @@ PP_Resource ResourceCreationImpl::CreateAudioConfig( PP_Instance instance, PP_AudioSampleRate sample_rate, uint32_t sample_frame_count) { - return ::ppapi::AudioConfigImpl::CreateAsImpl(instance, sample_rate, - sample_frame_count); + return ::ppapi::PPB_AudioConfig_Shared::CreateAsImpl(instance, sample_rate, + sample_frame_count); } PP_Resource ResourceCreationImpl::CreateAudioTrusted( @@ -196,8 +196,8 @@ PP_Resource ResourceCreationImpl::CreateKeyboardInputEvent( data.character_text = string_var->value(); } - return (new InputEventImpl(InputEventImpl::InitAsImpl(), - instance, data))->GetReference(); + return (new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(), + instance, data))->GetReference(); } PP_Resource ResourceCreationImpl::CreateMouseInputEvent( @@ -225,8 +225,8 @@ PP_Resource ResourceCreationImpl::CreateMouseInputEvent( data.mouse_click_count = click_count; data.mouse_movement = *mouse_movement; - return (new InputEventImpl(InputEventImpl::InitAsImpl(), - instance, data))->GetReference(); + return (new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(), + instance, data))->GetReference(); } PP_Resource ResourceCreationImpl::CreateScrollbar(PP_Instance instance, @@ -299,8 +299,8 @@ PP_Resource ResourceCreationImpl::CreateWheelInputEvent( data.wheel_ticks = *wheel_ticks; data.wheel_scroll_by_page = PP_ToBool(scroll_by_page); - return (new InputEventImpl(InputEventImpl::InitAsImpl(), - instance, data))->GetReference(); + return (new PPB_InputEvent_Shared(PPB_InputEvent_Shared::InitAsImpl(), + instance, data))->GetReference(); } } // namespace ppapi diff --git a/webkit/plugins/ppapi/url_request_info_unittest.cc b/webkit/plugins/ppapi/url_request_info_unittest.cc index bdfe1c7..c7f1720 100644 --- a/webkit/plugins/ppapi/url_request_info_unittest.cc +++ b/webkit/plugins/ppapi/url_request_info_unittest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "ppapi/shared_impl/url_request_info_impl.h" #include "ppapi/thunk/thunk.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h" |