From 85370194a4def6e0806d514698f78779439d5124 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Thu, 11 Jun 2015 14:08:36 +0200
Subject: Trivial changes for Chromium 44

Change-Id: I8261b201f1d6623eff3427b68b8d098c17d293d3
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
---
 src/core/renderer/pepper/pepper_host_factory_qt.cpp          | 7 +++----
 src/core/renderer/pepper/pepper_host_factory_qt.h            | 2 +-
 src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp | 4 ++--
 src/core/renderer/pepper/pepper_renderer_host_factory_qt.h   | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/core/renderer')

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;
 
-- 
cgit v1.2.3