Diff
Modified: trunk/ChangeLog (160301 => 160302)
--- trunk/ChangeLog 2013-12-09 07:46:56 UTC (rev 160301)
+++ trunk/ChangeLog 2013-12-09 09:37:23 UTC (rev 160302)
@@ -1,3 +1,17 @@
+2013-12-09 Brian Holt <[email protected]>
+
+ [WK2][Gtk] Add support for ENABLE_NETWORK_PROCESS to the build system
+ https://bugs.webkit.org/show_bug.cgi?id=118231
+
+ Reviewed by Martin Robinson.
+
+ Original patch by Kwang Yul Seo <[email protected]>.
+
+ Disabled ENABLE_NETWORK_PROCESS by default.
+
+ * Source/autotools/SetupAutomake.m4:
+ * Source/autotools/SetupWebKitFeatures.m4:
+
2013-12-06 Alberto Garcia <[email protected]>
[GTK] Enable web audio by default
Modified: trunk/Source/WebKit2/ChangeLog (160301 => 160302)
--- trunk/Source/WebKit2/ChangeLog 2013-12-09 07:46:56 UTC (rev 160301)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-09 09:37:23 UTC (rev 160302)
@@ -1,3 +1,20 @@
+2013-12-09 Brian Holt <[email protected]>
+
+ [WK2][Gtk] Add support for ENABLE_NETWORK_PROCESS to the build system
+ https://bugs.webkit.org/show_bug.cgi?id=118231
+
+ Reviewed by Martin Robinson.
+
+ Original patch by Kwang Yul Seo <[email protected]>.
+
+ Add source files to the build system and build NetworkProcess executable.
+
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+ * NetworkProcess/unix/NetworkProcessMainUnix.cpp:
+ * UIProcess/gtk/WebContextGtk.cpp:
+ (WebKit::WebContext::platformInitializeWebProcess):
+
2013-12-08 Ryuan Choi <[email protected]>
[EFL][WK2] Move FullScreenManager logic to WebViewEfl
Modified: trunk/Source/WebKit2/GNUmakefile.am (160301 => 160302)
--- trunk/Source/WebKit2/GNUmakefile.am 2013-12-09 07:46:56 UTC (rev 160301)
+++ trunk/Source/WebKit2/GNUmakefile.am 2013-12-09 09:37:23 UTC (rev 160302)
@@ -97,6 +97,7 @@
-I$(srcdir)/Source/WebKit2 \
-I$(srcdir)/Source/WebKit2/gtk \
-I$(srcdir)/Source/WebKit2/NetworkProcess \
+ -I$(srcdir)/Source/WebKit2/NetworkProcess/FileAPI \
-I$(srcdir)/Source/WebKit2/Platform \
-I$(srcdir)/Source/WebKit2/Platform/CoreIPC \
-I$(srcdir)/Source/WebKit2/Platform/CoreIPC/gtk \
@@ -112,10 +113,12 @@
-I$(srcdir)/Source/WebKit2/Shared/CoreIPCSupport \
-I$(srcdir)/Source/WebKit2/Shared/Downloads \
-I$(srcdir)/Source/WebKit2/Shared/Downloads/soup \
+ -I$(srcdir)/Source/WebKit2/Shared/FileAPI \
-I$(srcdir)/Source/WebKit2/Shared/Databases \
-I$(srcdir)/Source/WebKit2/Shared/Databases/IndexedDB \
-I$(srcdir)/Source/WebKit2/Shared/gtk \
-I$(srcdir)/Source/WebKit2/Shared/Network \
+ -I$(srcdir)/Source/WebKit2/Shared/Network/CustomProtocols \
-I$(srcdir)/Source/WebKit2/Shared/Plugins \
-I$(srcdir)/Source/WebKit2/Shared/Plugins/Netscape \
-I$(srcdir)/Source/WebKit2/Shared/Plugins/Netscape/x11 \
@@ -145,6 +148,7 @@
-I$(srcdir)/Source/WebKit2/WebProcess/Cookies \
-I$(srcdir)/Source/WebKit2/WebProcess/Databases \
-I$(srcdir)/Source/WebKit2/WebProcess/Databases/IndexedDB \
+ -I$(srcdir)/Source/WebKit2/WebProcess/FileAPI \
-I$(srcdir)/Source/WebKit2/WebProcess/FullScreen \
-I$(srcdir)/Source/WebKit2/WebProcess/Geolocation \
-I$(srcdir)/Source/WebKit2/WebProcess/gtk \
@@ -158,6 +162,7 @@
-I$(srcdir)/Source/WebKit2/WebProcess/KeyValueStorage \
-I$(srcdir)/Source/WebKit2/WebProcess/Launching \
-I$(srcdir)/Source/WebKit2/WebProcess/MediaCache \
+ -I$(srcdir)/Source/WebKit2/WebProcess/Network \
-I$(srcdir)/Source/WebKit2/WebProcess/NetworkInfo \
-I$(srcdir)/Source/WebKit2/WebProcess/Notifications \
-I$(srcdir)/Source/WebKit2/WebProcess/OriginData \
@@ -366,6 +371,7 @@
$(GENSOURCES_WEBKIT2)/webkit2gtk/include/webkit2
vpath %.messages.in = \
+ $(WebKit2)/NetworkProcess \
$(WebKit2)/PluginProcess \
$(WebKit2)/Shared \
$(WebKit2)/Shared/Authentication \
@@ -374,6 +380,7 @@
$(WebKit2)/UIProcess/ApplicationCache \
$(WebKit2)/UIProcess/Downloads \
$(WebKit2)/UIProcess/Geolocation \
+ $(WebKit2)/UIProcess/Network \
$(WebKit2)/UIProcess/Network/CustomProtocols \
$(WebKit2)/UIProcess/Plugins \
$(WebKit2)/UIProcess/ResourceCache \
@@ -457,11 +464,44 @@
$(top_builddir)/stamp-webkit2enumtypes \
$(top_builddir)/stamp-webkit2marshal.cpp \
$(top_builddir)/stamp-webkit2marshal.h \
+ $(top_builddir)/Programs/WebKitNetworkProcess \
$(top_builddir)/Programs/WebKitWebProcess
DISTCLEANFILES += \
$(top_builddir)/WebKit2/webkit2gtk-@[email protected]
+if ENABLE_NETWORK_PROCESS
+libexec_PROGRAMS += \
+ Programs/WebKitNetworkProcess
+endif
+
+Programs_WebKitNetworkProcess_CPPFLAGS = \
+ -I$(srcdir)/Source/WebKit2 \
+ -I$(srcdir)/Source/WebKit2/UIProcess/API/C \
+ -I$(srcdir)/Source/WebKit2/NetworkProcess/unix \
+ -I$(top_builddir)/DerivedSources/WebKit2 \
+ -I$(top_builddir)/DerivedSources/WebKit2/include \
+ -I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \
+ $(global_cppflags) \
+ $(_javascript_core_cppflags)
+
+Programs_WebKitNetworkProcess_CFLAGS = \
+ $(global_cflags) \
+ $(GLIB_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(LIBSOUP_CFLAGS)
+
+Programs_WebKitNetworkProcess_SOURCES = \
+ Source/WebKit2/unix/NetworkMainUnix.cpp
+
+Programs_WebKitNetworkProcess_LDADD = \
+ libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
+ libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected] \
+ $(GLIB_LIBS) \
+ $(GTK_LIBS) \
+ $(LIBSOUP_LIBS)
+
+
if ENABLE_WEBKIT2
libexec_PROGRAMS += \
Programs/WebKitWebProcess
@@ -735,12 +775,15 @@
$(WebKit2)/UIProcess/API/gtk/WebKitEnumTypes.cpp.template \
$(WebKit2)/UIProcess/InspectorServer/front-end/inspectorPageIndex.html \
$(WebKit2)/Scripts/generate-forwarding-headers.pl \
+ $(shell ls $(WebKit2)/NetworkProcess/*.in) \
$(shell ls $(WebKit2)/PluginProcess/*.in) \
$(shell ls $(WebKit2)/Shared/*.in) \
$(shell ls $(WebKit2)/Shared/Authentication/*.in) \
+ $(shell ls $(WebKit2)/Shared/Network/CustomProtocols/*.in) \
$(shell ls $(WebKit2)/Shared/Plugins/*.in) \
$(shell ls $(WebKit2)/UIProcess/*.in) \
$(shell ls $(WebKit2)/UIProcess/Downloads/*.in) \
+ $(shell ls $(WebKit2)/UIProcess/Network/*.in) \
$(shell ls $(WebKit2)/UIProcess/Network/CustomProtocols/*.in) \
$(shell ls $(WebKit2)/UIProcess/Plugins/*.in) \
$(shell ls $(WebKit2)/UIProcess/Storage/*.in) \
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (160301 => 160302)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2013-12-09 07:46:56 UTC (rev 160301)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2013-12-09 09:37:23 UTC (rev 160302)
@@ -159,6 +159,16 @@
DerivedSources/WebKit2/DrawingAreaProxyMessages.h \
DerivedSources/WebKit2/EventDispatcherMessageReceiver.cpp \
DerivedSources/WebKit2/EventDispatcherMessages.h \
+ DerivedSources/WebKit2/NetworkConnectionToWebProcessMessageReceiver.cpp \
+ DerivedSources/WebKit2/NetworkConnectionToWebProcessMessages.h \
+ DerivedSources/WebKit2/NetworkProcessConnectionMessageReceiver.cpp \
+ DerivedSources/WebKit2/NetworkProcessConnectionMessages.h \
+ DerivedSources/WebKit2/NetworkProcessMessageReceiver.cpp \
+ DerivedSources/WebKit2/NetworkProcessMessages.h \
+ DerivedSources/WebKit2/NetworkProcessProxyMessageReceiver.cpp \
+ DerivedSources/WebKit2/NetworkProcessProxyMessages.h \
+ DerivedSources/WebKit2/NetworkResourceLoaderMessageReceiver.cpp \
+ DerivedSources/WebKit2/NetworkResourceLoaderMessages.h \
DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
DerivedSources/WebKit2/PluginControllerProxyMessageReceiver.cpp \
@@ -233,16 +243,16 @@
DerivedSources/WebKit2/WebPageProxyMessages.h \
DerivedSources/WebKit2/WebPageMessageReceiver.cpp \
DerivedSources/WebKit2/WebPageMessages.h \
- DerivedSources/WebKit2/WebResourceCacheManagerMessageReceiver.cpp \
- DerivedSources/WebKit2/WebResourceCacheManagerMessages.h \
- DerivedSources/WebKit2/WebResourceCacheManagerProxyMessageReceiver.cpp \
- DerivedSources/WebKit2/WebResourceCacheManagerProxyMessages.h \
DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp \
DerivedSources/WebKit2/WebProcessConnectionMessages.h \
DerivedSources/WebKit2/WebProcessMessageReceiver.cpp \
DerivedSources/WebKit2/WebProcessMessages.h \
DerivedSources/WebKit2/WebProcessProxyMessageReceiver.cpp \
DerivedSources/WebKit2/WebProcessProxyMessages.h \
+ DerivedSources/WebKit2/WebResourceCacheManagerMessageReceiver.cpp \
+ DerivedSources/WebKit2/WebResourceCacheManagerMessages.h \
+ DerivedSources/WebKit2/WebResourceCacheManagerProxyMessageReceiver.cpp \
+ DerivedSources/WebKit2/WebResourceCacheManagerProxyMessages.h \
DerivedSources/WebKit2/WebResourceLoaderMessageReceiver.cpp \
DerivedSources/WebKit2/WebResourceLoaderMessages.h \
DerivedSources/WebKit2/WebSoupRequestManagerMessageReceiver.cpp \
@@ -304,8 +314,31 @@
webkit2_sources += \
Source/WebKit2/config.h \
+ Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp \
+ Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h \
Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp \
+ Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp \
+ Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.h \
+ Source/WebKit2/NetworkProcess/HostRecord.cpp \
+ Source/WebKit2/NetworkProcess/HostRecord.h \
+ Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp \
+ Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h \
+ Source/WebKit2/NetworkProcess/NetworkLoaderClient.h \
+ Source/WebKit2/NetworkProcess/NetworkProcess.cpp \
+ Source/WebKit2/NetworkProcess/NetworkProcess.h \
+ Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp \
+ Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h \
+ Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp \
+ Source/WebKit2/NetworkProcess/NetworkResourceLoader.h \
+ Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp \
+ Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h \
+ Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h \
Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp \
+ Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp \
+ Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp \
+ Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h \
+ Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp \
+ Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.h \
Source/WebKit2/PluginProcess/PluginControllerProxy.cpp \
Source/WebKit2/PluginProcess/PluginControllerProxy.h \
Source/WebKit2/PluginProcess/PluginCreationParameters.cpp \
@@ -398,6 +431,8 @@
Source/WebKit2/Shared/BlockingResponseMap.h \
Source/WebKit2/Shared/ShareableBitmap.cpp \
Source/WebKit2/Shared/ShareableBitmap.h \
+ Source/WebKit2/Shared/ShareableResource.cpp \
+ Source/WebKit2/Shared/ShareableResource.h \
Source/WebKit2/Shared/CacheModel.cpp \
Source/WebKit2/Shared/CacheModel.h \
Source/WebKit2/Shared/ChildProcess.cpp \
@@ -420,6 +455,8 @@
Source/WebKit2/Shared/Downloads/soup/DownloadSoupErrors.h \
Source/WebKit2/Shared/EditorState.cpp \
Source/WebKit2/Shared/EditorState.h \
+ Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp \
+ Source/WebKit2/Shared/FileAPI/BlobRegistrationData.h \
Source/WebKit2/Shared/FilterIterator.h \
Source/WebKit2/Shared/FontSmoothingLevel.h \
Source/WebKit2/Shared/ProcessExecutablePath.h \
@@ -444,7 +481,11 @@
Source/WebKit2/Shared/NativeWebKeyboardEvent.h \
Source/WebKit2/Shared/NativeWebMouseEvent.h \
Source/WebKit2/Shared/NativeWebWheelEvent.h \
+ Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h \
+ Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp \
+ Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h \
Source/WebKit2/Shared/Network/NetworkProcessSupplement.h \
+ Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp \
Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h \
Source/WebKit2/Shared/OriginAndDatabases.cpp \
Source/WebKit2/Shared/OriginAndDatabases.h \
@@ -865,6 +906,8 @@
Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp \
Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h \
+ Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp \
+ Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h \
Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp \
Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.cpp \
Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.h \
@@ -1040,6 +1083,8 @@
Source/WebKit2/WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.cpp \
Source/WebKit2/WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.h \
Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h \
+ Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp \
+ Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h \
Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp \
Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h \
Source/WebKit2/WebProcess/Geolocation/GeolocationPermissionRequestManager.cpp \
@@ -1143,6 +1188,12 @@
Source/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h \
Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp \
Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h \
+ Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp \
+ Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h \
+ Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp \
+ Source/WebKit2/WebProcess/Network/WebResourceLoader.h \
+ Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp \
+ Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h \
Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp \
Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h \
Source/WebKit2/WebProcess/Notifications/NotificationPermissionRequestManager.cpp \
Modified: trunk/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp (160301 => 160302)
--- trunk/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp 2013-12-09 07:46:56 UTC (rev 160301)
+++ trunk/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp 2013-12-09 09:37:23 UTC (rev 160302)
@@ -32,6 +32,7 @@
#include "ProxyResolverSoup.h"
#include "WKBase.h"
#include "WebKit2Initialize.h"
+#include <WebCore/ResourceHandle.h>
#include <WebKit2/NetworkProcess.h>
#include <error.h>
#include <runtime/InitializeThreading.h>
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (160301 => 160302)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2013-12-09 07:46:56 UTC (rev 160301)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2013-12-09 09:37:23 UTC (rev 160302)
@@ -99,6 +99,9 @@
parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
parameters.ignoreTLSErrors = m_ignoreTLSErrors;
parameters.shouldTrackVisitedLinks = true;
+#if ENABLE(NETWORK_PROCESS)
+ parameters.usesNetworkProcess = true;
+#endif
}
void WebContext::platformInvalidateContext()
Modified: trunk/Source/autotools/SetupAutomake.m4 (160301 => 160302)
--- trunk/Source/autotools/SetupAutomake.m4 2013-12-09 07:46:56 UTC (rev 160301)
+++ trunk/Source/autotools/SetupAutomake.m4 2013-12-09 09:37:23 UTC (rev 160302)
@@ -13,6 +13,7 @@
# 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"])
Modified: trunk/Source/autotools/SetupWebKitFeatures.m4 (160301 => 160302)
--- trunk/Source/autotools/SetupWebKitFeatures.m4 2013-12-09 07:46:56 UTC (rev 160301)
+++ trunk/Source/autotools/SetupWebKitFeatures.m4 2013-12-09 09:37:23 UTC (rev 160302)
@@ -155,6 +155,7 @@
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 \
