summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorViktor Engelmann <viktor.engelmann@qt.io>2017-01-30 17:45:33 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-02-02 12:29:03 +0000
commit685366c9a3d8d967e072c721c64a365ce50bc531 (patch)
tree614155bbfa29929ad8e85f9f0225accae429e775
parent2daa442d8202c11e2f925991176ae1f6a6a978a6 (diff)
Provisional Fix for Navigation-Breakage on right-click in Flash applet
When one right-clicks into a flash applet, chromium believes that a context menu was open (even though PepperRendererHostFactoryQt::CreateResourceHost returns NULL, which only causes an ASSERT on chromiums side). Because of this, the navigation is disabled, although no context menu is displayed. This fix just sends a message to chromium, telling it that "the context menu" is now "closed", which causes another ASSERT, but re-enables the navigation. Task-number: QTBUG-57924 Change-Id: Id6d8150a7d4944162bab81362153f8621d35bb4c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp10
1 files changed, 9 insertions, 1 deletions
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 febde84f7..bc36a8057 100644
--- a/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp
+++ b/src/core/renderer/pepper/pepper_renderer_host_factory_qt.cpp
@@ -81,8 +81,16 @@ std::unique_ptr<ppapi::host::ResourceHost> PepperRendererHostFactoryQt::CreateRe
switch (message.type()) {
case PpapiHostMsg_Flash_Create::ID:
return base::WrapUnique(new PepperFlashRendererHostQt(host_, instance, resource));
+ case PpapiHostMsg_FlashMenu_Create::ID: {
+ ppapi::host::ReplyMessageContext reply_context(
+ ppapi::proxy::ResourceMessageReplyParams(resource, 0),
+ NULL,
+ MSG_ROUTING_NONE);
+ reply_context.params.set_result(PP_ERROR_USERCANCEL);
+ host_->GetPpapiHost()->SendReply(reply_context, PpapiPluginMsg_FlashMenu_ShowReply(-1));
+ break;
+ }
case PpapiHostMsg_FlashFullscreen_Create::ID:
- case PpapiHostMsg_FlashMenu_Create::ID:
// Not implemented
break;
}