Diff
Modified: releases/WebKitGTK/webkit-1.6/Source/WebCore/ChangeLog (106268 => 106269)
--- releases/WebKitGTK/webkit-1.6/Source/WebCore/ChangeLog 2012-01-30 19:33:16 UTC (rev 106268)
+++ releases/WebKitGTK/webkit-1.6/Source/WebCore/ChangeLog 2012-01-30 19:35:26 UTC (rev 106269)
@@ -1,3 +1,21 @@
+2012-01-30 Martin Robinson <[email protected]>
+
+ [GTK] The process freezes when you right click on windowless Flash
+ https://bugs.webkit.org/show_bug.cgi?id=69123
+
+ Reviewed by Xan Lopez.
+
+ No new tests. I tried to create a layout test that exercised this
+ issue, but it appears that EventSender clicks do not trigger
+ it. This is covered by the manual tests containing Flash.
+
+ * plugins/PluginPackage.cpp:
+ (WebCore::PluginPackage::determineQuirks): Always activate the
+ windowless Flash quirk if on x86_64 and X11.
+ * plugins/gtk/PluginViewGtk.cpp:
+ (WebCore::PluginView::handleMouseEvent): Avoid sending right-click
+ events if we have the quirk.
+
2012-01-30 Rémi Duraffort <[email protected]>
[GTK] Fix compilation with gtk v2.20.1
Modified: releases/WebKitGTK/webkit-1.6/Source/WebCore/plugins/PluginPackage.cpp (106268 => 106269)
--- releases/WebKitGTK/webkit-1.6/Source/WebCore/plugins/PluginPackage.cpp 2012-01-30 19:33:16 UTC (rev 106268)
+++ releases/WebKitGTK/webkit-1.6/Source/WebCore/plugins/PluginPackage.cpp 2012-01-30 19:35:26 UTC (rev 106269)
@@ -209,12 +209,12 @@
#if PLATFORM(QT)
// Flash will crash on repeated calls to SetWindow in windowed mode
m_quirks.add(PluginQuirkDontCallSetWindowMoreThanOnce);
+#endif
#if CPU(X86_64)
// 64-bit Flash freezes if right-click is sent in windowless mode
m_quirks.add(PluginQuirkIgnoreRightClickInWindowlessMode);
#endif
-#endif
m_quirks.add(PluginQuirkRequiresDefaultScreenDepth);
m_quirks.add(PluginQuirkThrottleInvalidate);
Modified: releases/WebKitGTK/webkit-1.6/Source/WebCore/plugins/gtk/PluginViewGtk.cpp (106268 => 106269)
--- releases/WebKitGTK/webkit-1.6/Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2012-01-30 19:33:16 UTC (rev 106268)
+++ releases/WebKitGTK/webkit-1.6/Source/WebCore/plugins/gtk/PluginViewGtk.cpp 2012-01-30 19:35:26 UTC (rev 106269)
@@ -407,6 +407,9 @@
if (!m_isStarted || m_status != PluginStatusLoadedSuccessfully)
return;
+ if (event->button() == RightButton && m_plugin->quirks().contains(PluginQuirkIgnoreRightClickInWindowlessMode))
+ return;
+
if (event->type() == eventNames().mousedownEvent) {
if (Page* page = m_parentFrame->page())
page->focusController()->setActive(true);
Modified: releases/WebKitGTK/webkit-1.6/Source/WebKit2/ChangeLog (106268 => 106269)
--- releases/WebKitGTK/webkit-1.6/Source/WebKit2/ChangeLog 2012-01-30 19:33:16 UTC (rev 106268)
+++ releases/WebKitGTK/webkit-1.6/Source/WebKit2/ChangeLog 2012-01-30 19:35:26 UTC (rev 106269)
@@ -1,3 +1,23 @@
+2012-01-30 Martin Robinson <[email protected]>
+
+ [GTK] The process freezes when you right click on windowless Flash
+ https://bugs.webkit.org/show_bug.cgi?id=69123
+
+ Reviewed by Xan Lopez.
+
+ Add a new plugin quirk for dealing with right-clicking on
+ windowless Flash on x86_64 machines. This already exists for
+ WebKit1.
+
+ * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+ (WebKit::NetscapePluginModule::determineQuirks): If the plugin is
+ Flash and we are on x86_64, then disable sending right-clicking
+ events while in windowless mode.
+ * Shared/Plugins/PluginQuirks.h: Add the new quirk.
+ * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+ (WebKit::NetscapePlugin::platformHandleMouseEvent): If the quirk
+ is active don't send right click events.
+
2011-09-19 Mark Rowe <[email protected]>
<http://webkit.org/b/68421> Stop calling UpdateSystemActivity in places where we hold power assertions that achieve the same effect
Modified: releases/WebKitGTK/webkit-1.6/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (106268 => 106269)
--- releases/WebKitGTK/webkit-1.6/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2012-01-30 19:33:16 UTC (rev 106268)
+++ releases/WebKitGTK/webkit-1.6/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2012-01-30 19:35:26 UTC (rev 106269)
@@ -172,6 +172,19 @@
void NetscapePluginModule::determineQuirks()
{
+#if CPU(X86_64)
+ PluginModuleInfo plugin;
+ if (!getPluginInfoForLoadedPlugin(plugin))
+ return;
+
+ Vector<MimeClassInfo> mimeTypes = plugin.info.mimes;
+ for (size_t i = 0; i < mimeTypes.size(); ++i) {
+ if (mimeTypes[i].type == "application/x-shockwave-flash") {
+ m_pluginQuirks.add(PluginQuirks::IgnoreRightClickInWindowlessMode);
+ break;
+ }
+ }
+#endif
}
} // namespace WebKit
Modified: releases/WebKitGTK/webkit-1.6/Source/WebKit2/Shared/Plugins/PluginQuirks.h (106268 => 106269)
--- releases/WebKitGTK/webkit-1.6/Source/WebKit2/Shared/Plugins/PluginQuirks.h 2012-01-30 19:33:16 UTC (rev 106268)
+++ releases/WebKitGTK/webkit-1.6/Source/WebKit2/Shared/Plugins/PluginQuirks.h 2012-01-30 19:35:26 UTC (rev 106269)
@@ -87,6 +87,10 @@
// NPN_GetValue even when it is a lie.
RequiresGTKToolKit,
+ // Some version 10 releases of Flash run under nspluginwrapper will completely
+ // freeze when sending right click events to them in windowed mode.
+ IgnoreRightClickInWindowlessMode,
+
// Windows specific quirks:
#elif PLUGIN_ARCHITECTURE(WIN)
// Whether NPN_UserAgent should always return a Mozilla user agent.
Modified: releases/WebKitGTK/webkit-1.6/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (106268 => 106269)
--- releases/WebKitGTK/webkit-1.6/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2012-01-30 19:33:16 UTC (rev 106268)
+++ releases/WebKitGTK/webkit-1.6/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2012-01-30 19:35:26 UTC (rev 106269)
@@ -408,6 +408,11 @@
if (m_isWindowed)
return false;
+ if ((event.type() == WebEvent::MouseDown || event.type() == WebEvent::MouseUp)
+ && event.button() == WebMouseEvent::RightButton
+ && quirks().contains(PluginQuirks::IgnoreRightClickInWindowlessMode))
+ return false;
+
XEvent xEvent;
initializeXEvent(xEvent);
