Commit b568378f authored by carlosgc@webkit.org's avatar carlosgc@webkit.org

[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.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160989 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 61186dff
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.
2013-12-18 Gustavo Noronha Silva <gns@gnome.org>
[GTK][CMake] make libjavascriptcoregtk a public shared library again
......
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.
2013-12-23 Brian Holt <brian.holt@samsung.com>
[WK2] Implement platform specific Resource Response for SOUP
......
......@@ -45,6 +45,7 @@ libWebKit2Platform_la_CPPFLAGS = \
-DBUILDING_WEBKIT \
$(global_cppflags) \
-fno-strict-aliasing \
-include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
-I$(srcdir)/Source/WebKit2 \
-I$(srcdir)/Source \
-I$(srcdir)/Source/WTF \
......@@ -461,12 +462,13 @@ CLEANFILES += \
DISTCLEANFILES += \
$(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
if ENABLE_NETWORK_PROCESS
if ENABLE_WEBKIT2
libexec_PROGRAMS += \
Programs/WebKitNetworkProcess
endif
Programs_WebKitNetworkProcess_CPPFLAGS = \
-include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
-I$(srcdir)/Source/WebKit2 \
-I$(srcdir)/Source/WebKit2/UIProcess/API/C \
-I$(srcdir)/Source/WebKit2/NetworkProcess/unix \
......@@ -499,6 +501,7 @@ libexec_PROGRAMS += \
endif
Programs_WebKitWebProcess_CPPFLAGS = \
-include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
-I$(srcdir)/Source/WebKit2 \
-I$(srcdir)/Source/WebKit2/UIProcess/API/C \
-I$(srcdir)/Source/WebKit2/WebProcess/gtk \
......
......@@ -206,7 +206,8 @@ static gpointer createDefaultWebContext(gpointer)
priv->requestManager = webContext->priv->context->supplement<WebSoupRequestManagerProxy>();
priv->context->setCacheModel(CacheModelPrimaryWebBrowser);
#if ENABLE(NETWORK_PROCESS)
priv->context->setUsesNetworkProcess(true);
// 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"));
#endif
priv->tlsErrorsPolicy = WEBKIT_TLS_ERRORS_POLICY_IGNORE;
......
......@@ -68,6 +68,10 @@
#define WTF_USE_XPC_SERVICES 1
#endif
#if PLATFORM(GTK)
#define ENABLE_NETWORK_PROCESS 1
#endif
/* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
* to allow C++ code that expects exceptions to build. These definitions
* interfere with Objective-C++ uses of Objective-C exception handlers, which
......
......@@ -13,7 +13,6 @@ AM_CONDITIONAL([GTK_API_VERSION_2],[test "$GTK_API_VERSION" = "2.0"])
# For the moment we need to check whether or not indexed database is
# enabled because it determines if we build leveldb or not.
AM_WEBKIT_FEATURE_CONDITIONAL([ENABLE_INDEXED_DATABASE])
AM_WEBKIT_FEATURE_CONDITIONAL([ENABLE_NETWORK_PROCESS])
# OS conditionals.
AM_CONDITIONAL([OS_WIN32],[test "$os_win32" = "yes"])
......
......@@ -155,7 +155,6 @@ $srcdir/Tools/gtk/generate-feature-defines-files $CONFIGURABLE_FEATURE_DEFINES \
ENABLE_NAVIGATOR_CONTENT_UTILS=0 \
ENABLE_NETSCAPE_PLUGIN_API=1 \
ENABLE_NETWORK_INFO=0 \
ENABLE_NETWORK_PROCESS=0 \
ENABLE_NOTIFICATIONS=0 \
ENABLE_ORIENTATION_EVENTS=0 \
ENABLE_PAGE_VISIBILITY_API=1 \
......
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.
* Scripts/webkitperl/FeatureList.pm: Remove network-process
feature command line option.
2013-12-23 Carlos Garcia Campos <cgarcia@igalia.com>
[GTK] run-gtk-tests should always run glib tests with -k option
......
......@@ -111,7 +111,6 @@ my (
$mouseCursorScaleSupport,
$netscapePluginAPISupport,
$networkInfoSupport,
$networkProcessSupport,
$nosniffSupport,
$notificationsSupport,
$orientationEventsSupport,
......@@ -485,9 +484,6 @@ my @features = (
{ option => "cloop", desc => "Force use of the llint c loop",
define => "ENABLE_LLINT_C_LOOP", default => 0, value => \$forceCLoop },
{ option => "network-process", desc => "Toggle Network Process support",
define => "ENABLE_NETWORK_PROCESS", default => 0, value => \$networkProcessSupport },
);
sub getFeatureOptionList()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment