diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-11 14:08:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-23 14:56:07 +0000 |
| commit | 85370194a4def6e0806d514698f78779439d5124 (patch) | |
| tree | b4ee5d8da95c6da4cd1d5cdf0f23591fc9eb7c74 /src/core/renderer | |
| parent | 77fff2db5122eb7250e0eda67dd466809bcb5d52 (diff) | |
Trivial changes for Chromium 44
Change-Id: I8261b201f1d6623eff3427b68b8d098c17d293d3
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/core/renderer')
4 files changed, 7 insertions, 8 deletions
diff --git a/src/core/renderer/pepper/pepper_host_factory_qt.cpp b/src/core/renderer/pepper/pepper_host_factory_qt.cpp index fe877e4bc..61eeac9a0 100644 --- a/src/core/renderer/pepper/pepper_host_factory_qt.cpp +++ b/src/core/renderer/pepper/pepper_host_factory_qt.cpp @@ -58,9 +58,8 @@ PepperHostFactoryQt::PepperHostFactoryQt(content::BrowserPpapiHost* host) PepperHostFactoryQt::~PepperHostFactoryQt() {} -scoped_ptr<ppapi::host::ResourceHost> PepperHostFactoryQt::CreateResourceHost( - ppapi::host::PpapiHost* host, - const ppapi::proxy::ResourceMessageCallParams& params, +scoped_ptr<ppapi::host::ResourceHost> PepperHostFactoryQt::CreateResourceHost(ppapi::host::PpapiHost* host, + PP_Resource resource, PP_Instance instance, const IPC::Message& message) { @@ -75,7 +74,7 @@ scoped_ptr<ppapi::host::ResourceHost> PepperHostFactoryQt::CreateResourceHost( return scoped_ptr<ppapi::host::ResourceHost>( new PepperFlashBrowserHostQt(host_, instance, - params.pp_resource())); + resource)); return scoped_ptr<ppapi::host::ResourceHost>(); } diff --git a/src/core/renderer/pepper/pepper_host_factory_qt.h b/src/core/renderer/pepper/pepper_host_factory_qt.h index 568f064b3..22bf87b1b 100644 --- a/src/core/renderer/pepper/pepper_host_factory_qt.h +++ b/src/core/renderer/pepper/pepper_host_factory_qt.h @@ -56,7 +56,7 @@ public: virtual scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost( ppapi::host::PpapiHost* host, - const ppapi::proxy::ResourceMessageCallParams& params, + PP_Resource resource, PP_Instance instance, const IPC::Message& message) override; private: diff --git a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp index 65229f501..51416d698 100644 --- a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp +++ b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp @@ -57,7 +57,7 @@ PepperRendererHostFactoryQt::~PepperRendererHostFactoryQt() scoped_ptr<ppapi::host::ResourceHost> PepperRendererHostFactoryQt::CreateResourceHost( ppapi::host::PpapiHost* host, - const ppapi::proxy::ResourceMessageCallParams& params, + PP_Resource resource, PP_Instance instance, const IPC::Message& message) { @@ -71,7 +71,7 @@ scoped_ptr<ppapi::host::ResourceHost> PepperRendererHostFactoryQt::CreateResourc return scoped_ptr<ppapi::host::ResourceHost>( new PepperFlashRendererHostQt(host_, instance, - params.pp_resource())); + resource)); return scoped_ptr<ppapi::host::ResourceHost>(); } diff --git a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h index 0878087fc..8631c1e03 100644 --- a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h +++ b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.h @@ -57,7 +57,7 @@ public: // HostFactory. scoped_ptr<ppapi::host::ResourceHost> CreateResourceHost( ppapi::host::PpapiHost* host, - const ppapi::proxy::ResourceMessageCallParams& params, + PP_Resource resource, PP_Instance instance, const IPC::Message& message) override; |