<!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>[160989] 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/160989">160989</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-23 01:07:46 -0800 (Mon, 23 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Build with network process unconditionally
https://bugs.webkit.org/show_bug.cgi?id=126128
Reviewed by Martin Robinson.
.:
* Source/autotools/SetupAutomake.m4: Remove network process
conditional for Makefiles.
* Source/autotools/SetupWebKitFeatures.m4: Remove network process
feature.
Source/WebKit2:
Build always with the network process enabled and decide whether
to use it or not using an environment variable. This makes a lot
easier to work on the network process and also to switch between
using it or not.
* GNUmakefile.am: Make sure we always include the WebKit2Prefix.h.
* UIProcess/API/gtk/WebKitWebContext.cpp:
(createDefaultWebContext): Use the network process when
WEBKIT_USE_NETWORK_PROCESS environment variable is present.
* WebKit2Prefix.h: Always enable network process for GTK port.
Tools:
* Scripts/webkitperl/FeatureList.pm: Remove network-process
feature command line option.</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="#trunkSourceWebKit2GNUmakefileam">trunk/Source/WebKit2/GNUmakefile.am</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2Prefixh">trunk/Source/WebKit2/WebKit2Prefix.h</a></li>
<li><a href="#trunkSourceautotoolsSetupAutomakem4">trunk/Source/autotools/SetupAutomake.m4</a></li>
<li><a href="#trunkSourceautotoolsSetupWebKitFeaturesm4">trunk/Source/autotools/SetupWebKitFeatures.m4</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlFeatureListpm">trunk/Tools/Scripts/webkitperl/FeatureList.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (160988 => 160989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2013-12-23 08:41:08 UTC (rev 160988)
+++ trunk/ChangeLog 2013-12-23 09:07:46 UTC (rev 160989)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-23 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Build with network process unconditionally
+ https://bugs.webkit.org/show_bug.cgi?id=126128
+
+ Reviewed by Martin Robinson.
+
+ * Source/autotools/SetupAutomake.m4: Remove network process
+ conditional for Makefiles.
+ * Source/autotools/SetupWebKitFeatures.m4: Remove network process
+ feature.
+
</ins><span class="cx"> 2013-12-18 Gustavo Noronha Silva <gns@gnome.org>
</span><span class="cx">
</span><span class="cx"> [GTK][CMake] make libjavascriptcoregtk a public shared library again
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160988 => 160989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-23 08:41:08 UTC (rev 160988)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-23 09:07:46 UTC (rev 160989)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2013-12-23 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Build with network process unconditionally
+ https://bugs.webkit.org/show_bug.cgi?id=126128
+
+ Reviewed by Martin Robinson.
+
+ Build always with the network process enabled and decide whether
+ to use it or not using an environment variable. This makes a lot
+ easier to work on the network process and also to switch between
+ using it or not.
+
+ * GNUmakefile.am: Make sure we always include the WebKit2Prefix.h.
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ (createDefaultWebContext): Use the network process when
+ WEBKIT_USE_NETWORK_PROCESS environment variable is present.
+ * WebKit2Prefix.h: Always enable network process for GTK port.
+
</ins><span class="cx"> 2013-12-23 Brian Holt <brian.holt@samsung.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Implement platform specific Resource Response for SOUP
</span></span></pre></div>
<a id="trunkSourceWebKit2GNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/GNUmakefile.am (160988 => 160989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/GNUmakefile.am 2013-12-23 08:41:08 UTC (rev 160988)
+++ trunk/Source/WebKit2/GNUmakefile.am 2013-12-23 09:07:46 UTC (rev 160989)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> -DBUILDING_WEBKIT \
</span><span class="cx"> $(global_cppflags) \
</span><span class="cx"> -fno-strict-aliasing \
</span><ins>+ -include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
</ins><span class="cx"> -I$(srcdir)/Source/WebKit2 \
</span><span class="cx"> -I$(srcdir)/Source \
</span><span class="cx"> -I$(srcdir)/Source/WTF \
</span><span class="lines">@@ -461,12 +462,13 @@
</span><span class="cx"> DISTCLEANFILES += \
</span><span class="cx"> $(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
</span><span class="cx">
</span><del>-if ENABLE_NETWORK_PROCESS
</del><ins>+if ENABLE_WEBKIT2
</ins><span class="cx"> libexec_PROGRAMS += \
</span><span class="cx"> Programs/WebKitNetworkProcess
</span><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> Programs_WebKitNetworkProcess_CPPFLAGS = \
</span><ins>+ -include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
</ins><span class="cx"> -I$(srcdir)/Source/WebKit2 \
</span><span class="cx"> -I$(srcdir)/Source/WebKit2/UIProcess/API/C \
</span><span class="cx"> -I$(srcdir)/Source/WebKit2/NetworkProcess/unix \
</span><span class="lines">@@ -499,6 +501,7 @@
</span><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> Programs_WebKitWebProcess_CPPFLAGS = \
</span><ins>+ -include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
</ins><span class="cx"> -I$(srcdir)/Source/WebKit2 \
</span><span class="cx"> -I$(srcdir)/Source/WebKit2/UIProcess/API/C \
</span><span class="cx"> -I$(srcdir)/Source/WebKit2/WebProcess/gtk \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (160988 => 160989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2013-12-23 08:41:08 UTC (rev 160988)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2013-12-23 09:07:46 UTC (rev 160989)
</span><span class="lines">@@ -206,7 +206,8 @@
</span><span class="cx"> priv->requestManager = webContext->priv->context->supplement<WebSoupRequestManagerProxy>();
</span><span class="cx"> priv->context->setCacheModel(CacheModelPrimaryWebBrowser);
</span><span class="cx"> #if ENABLE(NETWORK_PROCESS)
</span><del>- priv->context->setUsesNetworkProcess(true);
</del><ins>+ // FIXME: Temporary use an env var until we have API to set the process model. See https://bugs.webkit.org/show_bug.cgi?id=125463.
+ priv->context->setUsesNetworkProcess(g_getenv("WEBKIT_USE_NETWORK_PROCESS"));
</ins><span class="cx"> #endif
</span><span class="cx"> priv->tlsErrorsPolicy = WEBKIT_TLS_ERRORS_POLICY_IGNORE;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2Prefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2Prefix.h (160988 => 160989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2Prefix.h 2013-12-23 08:41:08 UTC (rev 160988)
+++ trunk/Source/WebKit2/WebKit2Prefix.h 2013-12-23 09:07:46 UTC (rev 160989)
</span><span class="lines">@@ -68,6 +68,10 @@
</span><span class="cx"> #define WTF_USE_XPC_SERVICES 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(GTK)
+#define ENABLE_NETWORK_PROCESS 1
+#endif
+
</ins><span class="cx"> /* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
</span><span class="cx"> * to allow C++ code that expects exceptions to build. These definitions
</span><span class="cx"> * interfere with Objective-C++ uses of Objective-C exception handlers, which
</span></span></pre></div>
<a id="trunkSourceautotoolsSetupAutomakem4"></a>
<div class="modfile"><h4>Modified: trunk/Source/autotools/SetupAutomake.m4 (160988 => 160989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/autotools/SetupAutomake.m4 2013-12-23 08:41:08 UTC (rev 160988)
+++ trunk/Source/autotools/SetupAutomake.m4 2013-12-23 09:07:46 UTC (rev 160989)
</span><span class="lines">@@ -13,7 +13,6 @@
</span><span class="cx"> # For the moment we need to check whether or not indexed database is
</span><span class="cx"> # enabled because it determines if we build leveldb or not.
</span><span class="cx"> AM_WEBKIT_FEATURE_CONDITIONAL([ENABLE_INDEXED_DATABASE])
</span><del>-AM_WEBKIT_FEATURE_CONDITIONAL([ENABLE_NETWORK_PROCESS])
</del><span class="cx">
</span><span class="cx"> # OS conditionals.
</span><span class="cx"> AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
</span></span></pre></div>
<a id="trunkSourceautotoolsSetupWebKitFeaturesm4"></a>
<div class="modfile"><h4>Modified: trunk/Source/autotools/SetupWebKitFeatures.m4 (160988 => 160989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/autotools/SetupWebKitFeatures.m4 2013-12-23 08:41:08 UTC (rev 160988)
+++ trunk/Source/autotools/SetupWebKitFeatures.m4 2013-12-23 09:07:46 UTC (rev 160989)
</span><span class="lines">@@ -155,7 +155,6 @@
</span><span class="cx"> ENABLE_NAVIGATOR_CONTENT_UTILS=0 \
</span><span class="cx"> ENABLE_NETSCAPE_PLUGIN_API=1 \
</span><span class="cx"> ENABLE_NETWORK_INFO=0 \
</span><del>- ENABLE_NETWORK_PROCESS=0 \
</del><span class="cx"> ENABLE_NOTIFICATIONS=0 \
</span><span class="cx"> ENABLE_ORIENTATION_EVENTS=0 \
</span><span class="cx"> ENABLE_PAGE_VISIBILITY_API=1 \
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160988 => 160989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-23 08:41:08 UTC (rev 160988)
+++ trunk/Tools/ChangeLog 2013-12-23 09:07:46 UTC (rev 160989)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2013-12-23 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Build with network process unconditionally
+ https://bugs.webkit.org/show_bug.cgi?id=126128
+
+ Reviewed by Martin Robinson.
+
+ * Scripts/webkitperl/FeatureList.pm: Remove network-process
+ feature command line option.
+
+2013-12-23 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] run-gtk-tests should always run glib tests with -k option
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126132
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlFeatureListpm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/FeatureList.pm (160988 => 160989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/FeatureList.pm 2013-12-23 08:41:08 UTC (rev 160988)
+++ trunk/Tools/Scripts/webkitperl/FeatureList.pm 2013-12-23 09:07:46 UTC (rev 160989)
</span><span class="lines">@@ -111,7 +111,6 @@
</span><span class="cx"> $mouseCursorScaleSupport,
</span><span class="cx"> $netscapePluginAPISupport,
</span><span class="cx"> $networkInfoSupport,
</span><del>- $networkProcessSupport,
</del><span class="cx"> $nosniffSupport,
</span><span class="cx"> $notificationsSupport,
</span><span class="cx"> $orientationEventsSupport,
</span><span class="lines">@@ -485,9 +484,6 @@
</span><span class="cx">
</span><span class="cx"> { option => "cloop", desc => "Force use of the llint c loop",
</span><span class="cx"> define => "ENABLE_LLINT_C_LOOP", default => 0, value => \$forceCLoop },
</span><del>-
- { option => "network-process", desc => "Toggle Network Process support",
- define => "ENABLE_NETWORK_PROCESS", default => 0, value => \$networkProcessSupport },
</del><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> sub getFeatureOptionList()
</span></span></pre>
</div>
</div>
</body>
</html>