<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[167759] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/167759">167759</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-24 08:59:37 -0700 (Thu, 24 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] wmode='transparent' for flash plugin doesn't work
https://bugs.webkit.org/show_bug.cgi?id=120055
Reviewed by Gustavo Noronha Silva.
Force opaque window mode for flash plugin when wmode='transparent',
since X11 backend doesn't support transparency. We should add
proper transparency support because forcing opaque window mode
doesn't really work. Handle this as a plugin quirk instead of
adding X11 specific code to WebFrameLoaderClient::createPlugin().
* Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
(WebKit::NetscapePluginModule::determineQuirks): Add
ForceFlashWindowlessMode quirk for flash in case of EFL platform
because EFL port doesn't support windowed plugins.
* Shared/Plugins/PluginQuirks.h: Add ForceFlashWindowlessMode X11
plugin quirk.
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::initialize): Modify or add wmode
parameter for flash plugin, to force opaque window mode when
transparent mode is specified or when ForceFlashWindowlessMode
quirk is present.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::createPlugin): Remove X11 specific code.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapex11NetscapePluginModuleX11cpp">trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsPluginQuirksh">trunk/Source/WebKit2/Shared/Plugins/PluginQuirks.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167758 => 167759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-24 15:56:00 UTC (rev 167758)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-24 15:59:37 UTC (rev 167759)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-04-24 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] wmode='transparent' for flash plugin doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=120055
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Force opaque window mode for flash plugin when wmode='transparent',
+ since X11 backend doesn't support transparency. We should add
+ proper transparency support because forcing opaque window mode
+ doesn't really work. Handle this as a plugin quirk instead of
+ adding X11 specific code to WebFrameLoaderClient::createPlugin().
+
+ * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+ (WebKit::NetscapePluginModule::determineQuirks): Add
+ ForceFlashWindowlessMode quirk for flash in case of EFL platform
+ because EFL port doesn't support windowed plugins.
+ * Shared/Plugins/PluginQuirks.h: Add ForceFlashWindowlessMode X11
+ plugin quirk.
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::initialize): Modify or add wmode
+ parameter for flash plugin, to force opaque window mode when
+ transparent mode is specified or when ForceFlashWindowlessMode
+ quirk is present.
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::createPlugin): Remove X11 specific code.
+
</ins><span class="cx"> 2014-04-23 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Missing content inside long overflow-scrolling:touch
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapex11NetscapePluginModuleX11cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (167758 => 167759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2014-04-24 15:56:00 UTC (rev 167758)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp 2014-04-24 15:59:37 UTC (rev 167759)
</span><span class="lines">@@ -176,7 +176,6 @@
</span><span class="cx">
</span><span class="cx"> void NetscapePluginModule::determineQuirks()
</span><span class="cx"> {
</span><del>-#if CPU(X86_64)
</del><span class="cx"> RawPluginMetaData metaData;
</span><span class="cx"> if (!getPluginInfoForLoadedPlugin(metaData))
</span><span class="cx"> return;
</span><span class="lines">@@ -185,11 +184,15 @@
</span><span class="cx"> parseMIMEDescription(metaData.mimeDescription, mimeTypes);
</span><span class="cx"> for (size_t i = 0; i < mimeTypes.size(); ++i) {
</span><span class="cx"> if (mimeTypes[i].type == "application/x-shockwave-flash") {
</span><ins>+#if CPU(X86_64)
</ins><span class="cx"> m_pluginQuirks.add(PluginQuirks::IgnoreRightClickInWindowlessMode);
</span><ins>+#endif
+#if PLATFORM(EFL)
+ m_pluginQuirks.add(PluginQuirks::ForceFlashWindowlessMode);
+#endif
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void writeByte(char byte)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsPluginQuirksh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/PluginQuirks.h (167758 => 167759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/PluginQuirks.h 2014-04-24 15:56:00 UTC (rev 167758)
+++ trunk/Source/WebKit2/Shared/Plugins/PluginQuirks.h 2014-04-24 15:59:37 UTC (rev 167759)
</span><span class="lines">@@ -89,6 +89,9 @@
</span><span class="cx"> // freeze when sending right click events to them in windowed mode.
</span><span class="cx"> IgnoreRightClickInWindowlessMode,
</span><span class="cx">
</span><ins>+ // Some ports don't support windowed plugins.
+ ForceFlashWindowlessMode,
+
</ins><span class="cx"> // Windows specific quirks:
</span><span class="cx"> #elif PLUGIN_ARCHITECTURE(WIN)
</span><span class="cx"> // Whether NPN_UserAgent should always return a Mozilla user agent.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (167758 => 167759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2014-04-24 15:56:00 UTC (rev 167758)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2014-04-24 15:59:37 UTC (rev 167759)
</span><span class="lines">@@ -600,6 +600,21 @@
</span><span class="cx"> paramValues.append(parameters.values[i].utf8());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if PLUGIN_ARCHITECTURE(X11)
+ if (equalIgnoringCase(parameters.mimeType, "application/x-shockwave-flash")) {
+ size_t wmodeIndex = parameters.names.find("wmode");
+ if (wmodeIndex != notFound) {
+ // Transparent window mode is not supported by X11 backend.
+ if (equalIgnoringCase(parameters.values[wmodeIndex], "transparent")
+ || (m_pluginModule->pluginQuirks().contains(PluginQuirks::ForceFlashWindowlessMode) && equalIgnoringCase(parameters.values[wmodeIndex], "window")))
+ paramValues[wmodeIndex] = "opaque";
+ } else if (m_pluginModule->pluginQuirks().contains(PluginQuirks::ForceFlashWindowlessMode)) {
+ paramNames.append("wmode");
+ paramValues.append("opaque");
+ }
+ }
+#endif
+
</ins><span class="cx"> // The strings that these pointers point to are kept alive by paramNames and paramValues.
</span><span class="cx"> Vector<const char*> names;
</span><span class="cx"> Vector<const char*> values;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (167758 => 167759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-04-24 15:56:00 UTC (rev 167758)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2014-04-24 15:59:37 UTC (rev 167759)
</span><span class="lines">@@ -1321,23 +1321,6 @@
</span><span class="cx"> parameters.layerHostingMode = m_frame->page()->layerHostingMode();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLUGIN_ARCHITECTURE(X11)
- // FIXME: This should really be X11-specific plug-in quirks.
- if (equalIgnoringCase(mimeType, "application/x-shockwave-flash")) {
- // Currently we don't support transparency and windowed mode.
- // Inject wmode=opaque to make Flash work in these conditions.
- size_t wmodeIndex = parameters.names.find("wmode");
- if (wmodeIndex == notFound) {
- parameters.names.append("wmode");
- parameters.values.append("opaque");
- } else if (equalIgnoringCase(parameters.values[wmodeIndex], "window"))
- parameters.values[wmodeIndex] = "opaque";
- } else if (equalIgnoringCase(mimeType, "application/x-webkit-test-netscape")) {
- parameters.names.append("windowedPlugin");
- parameters.values.append("false");
- }
-#endif
-
</del><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> RefPtr<Plugin> plugin = m_frame->page()->createPlugin(m_frame, pluginElement, parameters, parameters.mimeType);
</span><span class="cx"> if (!plugin)
</span></span></pre>
</div>
</div>
</body>
</html>