summaryrefslogtreecommitdiffstats
path: root/src/core/renderer
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-07-11 13:20:02 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-07-18 10:25:57 +0000
commit59c603b801b37ced083698bec813c1dbaf2c58e8 (patch)
tree5d0167fa81d1e14996273475dd1afe6c3df86ed1 /src/core/renderer
parentf0a77c0f2a82147ba28eed35fcf4d1186d0aaa92 (diff)
Add support for PPAPI shared memory
Install the handler for requests for shared memory from PPAPI plugins. Change-Id: I7c3c191253fea734c318e56ba07912900f1abf64 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/renderer')
-rw-r--r--src/core/renderer/render_frame_observer_qt.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/renderer/render_frame_observer_qt.cpp b/src/core/renderer/render_frame_observer_qt.cpp
index f2285f298..8f65ea8ff 100644
--- a/src/core/renderer/render_frame_observer_qt.cpp
+++ b/src/core/renderer/render_frame_observer_qt.cpp
@@ -44,11 +44,12 @@
#include "render_frame_observer_qt.h"
+#include "base/memory/scoped_ptr.h"
+#include "chrome/renderer/pepper/pepper_shared_memory_message_filter.h"
#include "content/public/renderer/renderer_ppapi_host.h"
#include "ppapi/host/ppapi_host.h"
#include "renderer/pepper/pepper_renderer_host_factory_qt.h"
-#include "renderer/pepper/pepper_flash_renderer_host_qt.h"
namespace QtWebEngineCore {
@@ -65,8 +66,9 @@ RenderFrameObserverQt::~RenderFrameObserverQt()
void RenderFrameObserverQt::DidCreatePepperPlugin(content::RendererPpapiHost* host)
{
host->GetPpapiHost()->AddHostFactoryFilter(
- scoped_ptr<ppapi::host::HostFactory>(
- new PepperRendererHostFactoryQt(host)));
+ scoped_ptr<ppapi::host::HostFactory>(new PepperRendererHostFactoryQt(host)));
+ host->GetPpapiHost()->AddInstanceMessageFilter(
+ scoped_ptr<ppapi::host::InstanceMessageFilter>(new PepperSharedMemoryMessageFilter(host)));
}
#endif