Changeset 160989 in webkit

Timestamp:

Dec 23, 2013 1:07:46 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

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

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/GNUmakefile.am (modified) (4 diffs)
• Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (modified) (1 diff)
• Source/WebKit2/WebKit2Prefix.h (modified) (1 diff)
• Source/autotools/SetupAutomake.m4 (modified) (1 diff)
• Source/autotools/SetupWebKitFeatures.m4 (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitperl/FeatureList.pm (modified) (2 diffs)

trunk/ChangeLog

@@ +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.
+
+        * 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>
 

trunk/Source/WebKit2/ChangeLog

@@ +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.
+
+        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>
 

trunk/Source/WebKit2/GNUmakefile.am

@@ -46 +46 @@
         $(global_cppflags) \
         -fno-strict-aliasing \
+        -include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
         -I$(srcdir)/Source/WebKit2 \
         -I$(srcdir)/Source \
@@ -462 +463 @@
         $(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
 
-if ENABLE_NETWORK_PROCESS
+if ENABLE_WEBKIT2
 libexec_PROGRAMS += \
         Programs/WebKitNetworkProcess
@@ -468 +469 @@
 
 Programs_WebKitNetworkProcess_CPPFLAGS = \
+        -include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
         -I$(srcdir)/Source/WebKit2 \
         -I$(srcdir)/Source/WebKit2/UIProcess/API/C \
@@ -500 +502 @@
 
 Programs_WebKitWebProcess_CPPFLAGS = \
+        -include $(srcdir)/Source/WebKit2/WebKit2Prefix.h \
         -I$(srcdir)/Source/WebKit2 \
         -I$(srcdir)/Source/WebKit2/UIProcess/API/C \

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

@@ -207 +207 @@
     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;

trunk/Source/WebKit2/WebKit2Prefix.h

@@ -69 +69 @@
 #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

trunk/Source/autotools/SetupAutomake.m4

@@ -14 +14 @@
 # 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.

trunk/Source/autotools/SetupWebKitFeatures.m4

@@ -156 +156 @@
     ENABLE_NETSCAPE_PLUGIN_API=1 \
     ENABLE_NETWORK_INFO=0 \
-    ENABLE_NETWORK_PROCESS=0 \
     ENABLE_NOTIFICATIONS=0 \
     ENABLE_ORIENTATION_EVENTS=0 \

trunk/Tools/ChangeLog

@@ +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>
 

trunk/Tools/Scripts/webkitperl/FeatureList.pm

@@ -112 +112 @@
     $netscapePluginAPISupport,
     $networkInfoSupport,
-    $networkProcessSupport,
     $nosniffSupport,
     $notificationsSupport,
@@ -486 +485 @@
     { 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 },
 );