<!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>[215106] trunk</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/215106">215106</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2017-04-07 11:52:58 -0700 (Fri, 07 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Various build errors when plugin support is disabled
https://bugs.webkit.org/show_bug.cgi?id=170015
Reviewed by Carlos Garcia Campos.
.:
Allow building with ENABLE_NETSCAPE_PLUGIN_API=ON and ENABLE_X11_TARGET=OFF. This should be
possible as Carlos worked to ensure windowless plugins work properly outside X11. The GTK2
plugin process still depends on ENABLE_X11_TARGET because a plugin that uses GTK+ surely
wants to display a window, and is not going to work outside X11. (If the plugin links to
GTK+ but does not display a window, it's dumb and deserves to be broken.)
Also, make ENABLE_PLUGIN_PROCESS conditional on ENABLE_NETSCAPE_PLUGIN_API, not
ENABLE_X11_TARGET.
* Source/cmake/OptionsGTK.cmake:
Source/WebKit2:
* PluginProcess/unix/PluginControllerProxyUnix.cpp:
* UIProcess/API/gtk/WebKitWebsiteData.cpp:
(recordContainsSupportedDataTypes):
(toWebKitWebsiteDataTypes):
* UIProcess/API/gtk/WebKitWebsiteDataManager.cpp:
(toWebsiteDataTypes):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PluginProcessunixPluginControllerProxyUnixcpp">trunk/Source/WebKit2/PluginProcess/unix/PluginControllerProxyUnix.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebsiteDatacpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteData.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebsiteDataManagercpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (215105 => 215106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2017-04-07 18:49:57 UTC (rev 215105)
+++ trunk/ChangeLog 2017-04-07 18:52:58 UTC (rev 215106)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-04-07 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] Various build errors when plugin support is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=170015
+
+ Reviewed by Carlos Garcia Campos.
+
+ Allow building with ENABLE_NETSCAPE_PLUGIN_API=ON and ENABLE_X11_TARGET=OFF. This should be
+ possible as Carlos worked to ensure windowless plugins work properly outside X11. The GTK2
+ plugin process still depends on ENABLE_X11_TARGET because a plugin that uses GTK+ surely
+ wants to display a window, and is not going to work outside X11. (If the plugin links to
+ GTK+ but does not display a window, it's dumb and deserves to be broken.)
+
+ Also, make ENABLE_PLUGIN_PROCESS conditional on ENABLE_NETSCAPE_PLUGIN_API, not
+ ENABLE_X11_TARGET.
+
+ * Source/cmake/OptionsGTK.cmake:
+
</ins><span class="cx"> 2017-04-07 Fujii Hironori <Hironori.Fujii@sony.com>
</span><span class="cx">
</span><span class="cx"> [CMake][Windows] WebKitGUID.lib should be built with the release CRT
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (215105 => 215106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-04-07 18:49:57 UTC (rev 215105)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-07 18:52:58 UTC (rev 215106)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-04-07 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] Various build errors when plugin support is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=170015
+
+ Reviewed by Carlos Garcia Campos.
+
+ * PluginProcess/unix/PluginControllerProxyUnix.cpp:
+ * UIProcess/API/gtk/WebKitWebsiteData.cpp:
+ (recordContainsSupportedDataTypes):
+ (toWebKitWebsiteDataTypes):
+ * UIProcess/API/gtk/WebKitWebsiteDataManager.cpp:
+ (toWebsiteDataTypes):
+
</ins><span class="cx"> 2017-04-07 John Wilander <wilander@apple.com>
</span><span class="cx">
</span><span class="cx"> WebSocket streams should have network usage attributed to correct process
</span></span></pre></div>
<a id="trunkSourceWebKit2PluginProcessunixPluginControllerProxyUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PluginProcess/unix/PluginControllerProxyUnix.cpp (215105 => 215106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PluginProcess/unix/PluginControllerProxyUnix.cpp 2017-04-07 18:49:57 UTC (rev 215105)
+++ trunk/Source/WebKit2/PluginProcess/unix/PluginControllerProxyUnix.cpp 2017-04-07 18:52:58 UTC (rev 215106)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "PluginControllerProxy.h"
</span><span class="cx">
</span><del>-#if ENABLE(PLUGIN_PROCESS)
</del><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx">
</span><span class="lines">@@ -51,4 +51,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(PLUGIN_PROCESS)
</del><ins>+#endif // ENABLE(NETSCAPE_PLUGIN_API)
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebsiteDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteData.cpp (215105 => 215106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteData.cpp 2017-04-07 18:49:57 UTC (rev 215105)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteData.cpp 2017-04-07 18:52:58 UTC (rev 215106)
</span><span class="lines">@@ -73,7 +73,9 @@
</span><span class="cx"> WebsiteDataType::LocalStorage,
</span><span class="cx"> WebsiteDataType::WebSQLDatabases,
</span><span class="cx"> WebsiteDataType::IndexedDBDatabases,
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> WebsiteDataType::PlugInData,
</span><ins>+#endif
</ins><span class="cx"> WebsiteDataType::Cookies
</span><span class="cx"> };
</span><span class="cx"> return record.types.contains(typesSupported);
</span><span class="lines">@@ -96,8 +98,10 @@
</span><span class="cx"> returnValue |= WEBKIT_WEBSITE_DATA_WEBSQL_DATABASES;
</span><span class="cx"> if (types.contains(WebsiteDataType::IndexedDBDatabases))
</span><span class="cx"> returnValue |= WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES;
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> if (types.contains(WebsiteDataType::PlugInData))
</span><span class="cx"> returnValue |= WEBKIT_WEBSITE_DATA_PLUGIN_DATA;
</span><ins>+#endif
</ins><span class="cx"> if (types.contains(WebsiteDataType::Cookies))
</span><span class="cx"> returnValue |= WEBKIT_WEBSITE_DATA_COOKIES;
</span><span class="cx"> return static_cast<WebKitWebsiteDataTypes>(returnValue);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebsiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp (215105 => 215106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp 2017-04-07 18:49:57 UTC (rev 215105)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebsiteDataManager.cpp 2017-04-07 18:52:58 UTC (rev 215106)
</span><span class="lines">@@ -641,8 +641,10 @@
</span><span class="cx"> returnValue |= WebsiteDataType::WebSQLDatabases;
</span><span class="cx"> if (types & WEBKIT_WEBSITE_DATA_INDEXEDDB_DATABASES)
</span><span class="cx"> returnValue |= WebsiteDataType::IndexedDBDatabases;
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> if (types & WEBKIT_WEBSITE_DATA_PLUGIN_DATA)
</span><span class="cx"> returnValue |= WebsiteDataType::PlugInData;
</span><ins>+#endif
</ins><span class="cx"> if (types & WEBKIT_WEBSITE_DATA_COOKIES)
</span><span class="cx"> returnValue |= WebsiteDataType::Cookies;
</span><span class="cx"> return returnValue;
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (215105 => 215106)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2017-04-07 18:49:57 UTC (rev 215105)
+++ trunk/Source/cmake/OptionsGTK.cmake 2017-04-07 18:52:58 UTC (rev 215106)
</span><span class="lines">@@ -101,7 +101,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_OPENGL)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_ACCELERATED_2D_CANVAS ENABLE_OPENGL)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_OPENGL)
</span><del>-WEBKIT_OPTION_DEPEND(ENABLE_NETSCAPE_PLUGIN_API ENABLE_X11_TARGET)
</del><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_PLUGIN_PROCESS_GTK2 ENABLE_X11_TARGET)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(ENABLE_WEBGL ENABLE_OPENGL)
</span><span class="cx"> WEBKIT_OPTION_DEPEND(USE_REDIRECTED_XCOMPOSITE_WINDOW ENABLE_OPENGL)
</span><span class="lines">@@ -182,14 +181,12 @@
</span><span class="cx"> # only their definedness is. They should only be defined in the true case.
</span><span class="cx"> if (${ENABLE_X11_TARGET})
</span><span class="cx"> SET_AND_EXPOSE_TO_BUILD(MOZ_X11 1)
</span><del>-endif ()
-if (${WTF_OS_UNIX})
</del><span class="cx"> SET_AND_EXPOSE_TO_BUILD(XP_UNIX 1)
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> set(ENABLE_WEBKIT OFF)
</span><span class="cx"> set(ENABLE_WEBKIT2 ON)
</span><del>-set(ENABLE_PLUGIN_PROCESS ${ENABLE_X11_TARGET})
</del><ins>+set(ENABLE_PLUGIN_PROCESS ${ENABLE_NETSCAPE_PLUGIN_API})
</ins><span class="cx">
</span><span class="cx"> add_definitions(-DBUILDING_GTK__=1)
</span><span class="cx"> add_definitions(-DGETTEXT_PACKAGE="WebKit2GTK-${WEBKITGTK_API_VERSION}")
</span></span></pre>
</div>
</div>
</body>
</html>