<!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>[213132] releases/WebKitGTK/webkit-2.16/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/213132">213132</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-28 01:10:08 -0800 (Tue, 28 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/212891">r212891</a> - [GTK] Crash attempting to load Flash plugin in Wayland
https://bugs.webkit.org/show_bug.cgi?id=163159
Reviewed by Michael Catanzaro.
The problem is that we check if the current diplay is X11 or Wayland also in the plugin process, but with GTK2
plugins the display is always X11. We should early reject plugins requiring GTK2 in the UI process when the
current display is Wayland.
* UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:
(WebKit::PluginInfoStore::getPluginInfo):
* UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
(WebKit::PluginProcessProxy::scanPlugin):
* UIProcess/gtk/WebPageProxyGtk.cpp:
(WebKit::WebPageProxy::createPluginContainer): Add an assert to ensure this message is never received on a
non-X11 display.
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::createPluginContainer): Never send CreatePluginContainer message to the UI process if the
display is not X11.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2UIProcessPluginsunixPluginInfoStoreUnixcpp">releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2UIProcessPluginsunixPluginProcessProxyUnixcpp">releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2UIProcessgtkWebPageProxyGtkcpp">releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebKit2WebProcessPluginsPluginViewcpp">releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog (213131 => 213132)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-02-28 09:09:14 UTC (rev 213131)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/ChangeLog 2017-02-28 09:10:08 UTC (rev 213132)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-23 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Crash attempting to load Flash plugin in Wayland
+ https://bugs.webkit.org/show_bug.cgi?id=163159
+
+ Reviewed by Michael Catanzaro.
+
+ The problem is that we check if the current diplay is X11 or Wayland also in the plugin process, but with GTK2
+ plugins the display is always X11. We should early reject plugins requiring GTK2 in the UI process when the
+ current display is Wayland.
+
+ * UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp:
+ (WebKit::PluginInfoStore::getPluginInfo):
+ * UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp:
+ (WebKit::PluginProcessProxy::scanPlugin):
+ * UIProcess/gtk/WebPageProxyGtk.cpp:
+ (WebKit::WebPageProxy::createPluginContainer): Add an assert to ensure this message is never received on a
+ non-X11 display.
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::createPluginContainer): Never send CreatePluginContainer message to the UI process if the
+ display is not X11.
+
</ins><span class="cx"> 2017-02-23 Tomas Popela <tpopela@redhat.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Drag and drop is always moving the content even if copy is requested
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebKit2UIProcessPluginsunixPluginInfoStoreUnixcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp (213131 => 213132)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp 2017-02-28 09:09:14 UTC (rev 213131)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp 2017-02-28 09:10:08 UTC (rev 213132)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "PluginSearchPath.h"
</span><span class="cx"> #include "ProcessExecutablePath.h"
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><ins>+#include <WebCore/PlatformDisplay.h>
</ins><span class="cx"> #include <limits.h>
</span><span class="cx"> #include <stdlib.h>
</span><span class="cx">
</span><span class="lines">@@ -75,6 +76,8 @@
</span><span class="cx"> if (PluginInfoCache::singleton().getPluginInfo(pluginPath, plugin)) {
</span><span class="cx"> #if ENABLE(PLUGIN_PROCESS_GTK2)
</span><span class="cx"> if (plugin.requiresGtk2) {
</span><ins>+ if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
+ return false;
</ins><span class="cx"> String pluginProcessPath = executablePathOfPluginProcess();
</span><span class="cx"> pluginProcessPath.append('2');
</span><span class="cx"> if (!fileExists(pluginProcessPath))
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebKit2UIProcessPluginsunixPluginProcessProxyUnixcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp (213131 => 213132)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2017-02-28 09:09:14 UTC (rev 213131)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/Plugins/unix/PluginProcessProxyUnix.cpp 2017-02-28 09:10:08 UTC (rev 213132)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "PluginProcessCreationParameters.h"
</span><span class="cx"> #include "ProcessExecutablePath.h"
</span><span class="cx"> #include <WebCore/FileSystem.h>
</span><ins>+#include <WebCore/PlatformDisplay.h>
</ins><span class="cx"> #include <sys/wait.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -84,6 +85,8 @@
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> bool requiresGtk2 = pluginRequiresGtk2(pluginPath);
</span><span class="cx"> if (requiresGtk2) {
</span><ins>+ if (PlatformDisplay::sharedDisplay().type() != PlatformDisplay::Type::X11)
+ return false;
</ins><span class="cx"> #if ENABLE(PLUGIN_PROCESS_GTK2)
</span><span class="cx"> pluginProcessPath.append('2');
</span><span class="cx"> if (!fileExists(pluginProcessPath))
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebKit2UIProcessgtkWebPageProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp (213131 => 213132)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp 2017-02-28 09:09:14 UTC (rev 213131)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp 2017-02-28 09:10:08 UTC (rev 213132)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "WebPasteboardProxy.h"
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> #include "WebsiteDataStore.h"
</span><ins>+#include <WebCore/PlatformDisplay.h>
</ins><span class="cx"> #include <WebCore/UserAgent.h>
</span><span class="cx"> #include <gtk/gtkx.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="lines">@@ -102,6 +103,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::createPluginContainer(uint64_t& windowID)
</span><span class="cx"> {
</span><ins>+ RELEASE_ASSERT(WebCore::PlatformDisplay::sharedDisplay().type() == WebCore::PlatformDisplay::Type::X11);
</ins><span class="cx"> GtkWidget* socket = gtk_socket_new();
</span><span class="cx"> g_signal_connect(socket, "plug-removed", G_CALLBACK(pluginContainerPlugRemoved), 0);
</span><span class="cx"> gtk_container_add(GTK_CONTAINER(viewWidget()), socket);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (213131 => 213132)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2017-02-28 09:09:14 UTC (rev 213131)
+++ releases/WebKitGTK/webkit-2.16/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2017-02-28 09:10:08 UTC (rev 213132)
</span><span class="lines">@@ -72,6 +72,10 @@
</span><span class="cx"> #include <bindings/ScriptValue.h>
</span><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><ins>+#if PLUGIN_ARCHITECTURE(X11)
+#include <WebCore/PlatformDisplay.h>
+#endif
+
</ins><span class="cx"> using namespace JSC;
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -1677,7 +1681,8 @@
</span><span class="cx"> uint64_t PluginView::createPluginContainer()
</span><span class="cx"> {
</span><span class="cx"> uint64_t windowID = 0;
</span><del>- m_webPage->sendSync(Messages::WebPageProxy::CreatePluginContainer(), Messages::WebPageProxy::CreatePluginContainer::Reply(windowID));
</del><ins>+ if (PlatformDisplay::sharedDisplay().type() == PlatformDisplay::Type::X11)
+ m_webPage->sendSync(Messages::WebPageProxy::CreatePluginContainer(), Messages::WebPageProxy::CreatePluginContainer::Reply(windowID));
</ins><span class="cx"> return windowID;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>