Changeset 160302 in webkit


Ignore:
Timestamp:
Dec 9, 2013 1:37:23 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[WK2][Gtk] Add support for ENABLE_NETWORK_PROCESS to the build system
https://bugs.webkit.org/show_bug.cgi?id=118231

Patch by Brian Holt <brian.holt@samsung.com> on 2013-12-09
Reviewed by Martin Robinson.

Original patch by Kwang Yul Seo <skyul@company100.net>.

.:

Disabled ENABLE_NETWORK_PROCESS by default.

  • Source/autotools/SetupAutomake.m4:
  • Source/autotools/SetupWebKitFeatures.m4:

Source/WebKit2:

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):

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r160215 r160302  
     12013-12-09  Brian Holt  <brian.holt@samsung.com>
     2
     3        [WK2][Gtk] Add support for ENABLE_NETWORK_PROCESS to the build system
     4        https://bugs.webkit.org/show_bug.cgi?id=118231
     5
     6        Reviewed by Martin Robinson.
     7
     8        Original patch by Kwang Yul Seo  <skyul@company100.net>.
     9
     10        Disabled ENABLE_NETWORK_PROCESS by default.
     11
     12        * Source/autotools/SetupAutomake.m4:
     13        * Source/autotools/SetupWebKitFeatures.m4:
     14
    1152013-12-06  Alberto Garcia  <berto@igalia.com>
    216
  • trunk/Source/WebKit2/ChangeLog

    r160301 r160302  
     12013-12-09  Brian Holt  <brian.holt@samsung.com>
     2
     3        [WK2][Gtk] Add support for ENABLE_NETWORK_PROCESS to the build system
     4        https://bugs.webkit.org/show_bug.cgi?id=118231
     5
     6        Reviewed by Martin Robinson.
     7
     8        Original patch by Kwang Yul Seo  <skyul@company100.net>.
     9
     10        Add source files to the build system and build NetworkProcess executable.
     11
     12        * GNUmakefile.am:
     13        * GNUmakefile.list.am:
     14        * NetworkProcess/unix/NetworkProcessMainUnix.cpp:
     15        * UIProcess/gtk/WebContextGtk.cpp:
     16        (WebKit::WebContext::platformInitializeWebProcess):
     17
    1182013-12-08  Ryuan Choi  <ryuan.choi@samsung.com>
    219
  • trunk/Source/WebKit2/GNUmakefile.am

    r159127 r160302  
    9898        -I$(srcdir)/Source/WebKit2/gtk \
    9999        -I$(srcdir)/Source/WebKit2/NetworkProcess \
     100        -I$(srcdir)/Source/WebKit2/NetworkProcess/FileAPI \
    100101        -I$(srcdir)/Source/WebKit2/Platform \
    101102        -I$(srcdir)/Source/WebKit2/Platform/CoreIPC \
     
    113114        -I$(srcdir)/Source/WebKit2/Shared/Downloads \
    114115        -I$(srcdir)/Source/WebKit2/Shared/Downloads/soup \
     116        -I$(srcdir)/Source/WebKit2/Shared/FileAPI \
    115117        -I$(srcdir)/Source/WebKit2/Shared/Databases \
    116118        -I$(srcdir)/Source/WebKit2/Shared/Databases/IndexedDB \
    117119        -I$(srcdir)/Source/WebKit2/Shared/gtk \
    118120        -I$(srcdir)/Source/WebKit2/Shared/Network \
     121        -I$(srcdir)/Source/WebKit2/Shared/Network/CustomProtocols \
    119122        -I$(srcdir)/Source/WebKit2/Shared/Plugins \
    120123        -I$(srcdir)/Source/WebKit2/Shared/Plugins/Netscape \
     
    146149        -I$(srcdir)/Source/WebKit2/WebProcess/Databases \
    147150        -I$(srcdir)/Source/WebKit2/WebProcess/Databases/IndexedDB \
     151        -I$(srcdir)/Source/WebKit2/WebProcess/FileAPI \
    148152        -I$(srcdir)/Source/WebKit2/WebProcess/FullScreen \
    149153        -I$(srcdir)/Source/WebKit2/WebProcess/Geolocation \
     
    159163        -I$(srcdir)/Source/WebKit2/WebProcess/Launching \
    160164        -I$(srcdir)/Source/WebKit2/WebProcess/MediaCache \
     165        -I$(srcdir)/Source/WebKit2/WebProcess/Network \
    161166        -I$(srcdir)/Source/WebKit2/WebProcess/NetworkInfo \
    162167        -I$(srcdir)/Source/WebKit2/WebProcess/Notifications \
     
    367372
    368373vpath %.messages.in = \
     374        $(WebKit2)/NetworkProcess \
    369375        $(WebKit2)/PluginProcess \
    370376        $(WebKit2)/Shared \
     
    375381        $(WebKit2)/UIProcess/Downloads \
    376382        $(WebKit2)/UIProcess/Geolocation \
     383        $(WebKit2)/UIProcess/Network \
    377384        $(WebKit2)/UIProcess/Network/CustomProtocols \
    378385        $(WebKit2)/UIProcess/Plugins \
     
    458465        $(top_builddir)/stamp-webkit2marshal.cpp \
    459466        $(top_builddir)/stamp-webkit2marshal.h \
     467        $(top_builddir)/Programs/WebKitNetworkProcess \
    460468        $(top_builddir)/Programs/WebKitWebProcess
    461469
    462470DISTCLEANFILES += \
    463471        $(top_builddir)/WebKit2/webkit2gtk-@WEBKITGTK_API_VERSION@.pc
     472
     473if ENABLE_NETWORK_PROCESS
     474libexec_PROGRAMS += \
     475        Programs/WebKitNetworkProcess
     476endif
     477
     478Programs_WebKitNetworkProcess_CPPFLAGS = \
     479        -I$(srcdir)/Source/WebKit2 \
     480        -I$(srcdir)/Source/WebKit2/UIProcess/API/C \
     481        -I$(srcdir)/Source/WebKit2/NetworkProcess/unix \
     482        -I$(top_builddir)/DerivedSources/WebKit2 \
     483        -I$(top_builddir)/DerivedSources/WebKit2/include \
     484        -I$(top_builddir)/DerivedSources/WebKit2/include/WebCore \
     485        $(global_cppflags) \
     486        $(javascriptcore_cppflags)
     487
     488Programs_WebKitNetworkProcess_CFLAGS = \
     489        $(global_cflags) \
     490        $(GLIB_CFLAGS) \
     491        $(GTK_CFLAGS) \
     492        $(LIBSOUP_CFLAGS)
     493
     494Programs_WebKitNetworkProcess_SOURCES = \
     495        Source/WebKit2/unix/NetworkMainUnix.cpp
     496
     497Programs_WebKitNetworkProcess_LDADD = \
     498        libjavascriptcoregtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
     499        libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la \
     500        $(GLIB_LIBS) \
     501        $(GTK_LIBS) \
     502        $(LIBSOUP_LIBS)
     503
    464504
    465505if ENABLE_WEBKIT2
     
    736776        $(WebKit2)/UIProcess/InspectorServer/front-end/inspectorPageIndex.html \
    737777        $(WebKit2)/Scripts/generate-forwarding-headers.pl \
     778        $(shell ls $(WebKit2)/NetworkProcess/*.in) \
    738779        $(shell ls $(WebKit2)/PluginProcess/*.in) \
    739780        $(shell ls $(WebKit2)/Shared/*.in) \
    740781        $(shell ls $(WebKit2)/Shared/Authentication/*.in) \
     782        $(shell ls $(WebKit2)/Shared/Network/CustomProtocols/*.in) \
    741783        $(shell ls $(WebKit2)/Shared/Plugins/*.in) \
    742784        $(shell ls $(WebKit2)/UIProcess/*.in) \
    743785        $(shell ls $(WebKit2)/UIProcess/Downloads/*.in) \
     786        $(shell ls $(WebKit2)/UIProcess/Network/*.in) \
    744787        $(shell ls $(WebKit2)/UIProcess/Network/CustomProtocols/*.in) \
    745788        $(shell ls $(WebKit2)/UIProcess/Plugins/*.in) \
  • trunk/Source/WebKit2/GNUmakefile.list.am

    r160075 r160302  
    160160        DerivedSources/WebKit2/EventDispatcherMessageReceiver.cpp \
    161161        DerivedSources/WebKit2/EventDispatcherMessages.h \
     162        DerivedSources/WebKit2/NetworkConnectionToWebProcessMessageReceiver.cpp \
     163        DerivedSources/WebKit2/NetworkConnectionToWebProcessMessages.h \
     164        DerivedSources/WebKit2/NetworkProcessConnectionMessageReceiver.cpp \
     165        DerivedSources/WebKit2/NetworkProcessConnectionMessages.h \
     166        DerivedSources/WebKit2/NetworkProcessMessageReceiver.cpp \
     167        DerivedSources/WebKit2/NetworkProcessMessages.h \
     168        DerivedSources/WebKit2/NetworkProcessProxyMessageReceiver.cpp \
     169        DerivedSources/WebKit2/NetworkProcessProxyMessages.h \
     170        DerivedSources/WebKit2/NetworkResourceLoaderMessageReceiver.cpp \
     171        DerivedSources/WebKit2/NetworkResourceLoaderMessages.h \
    162172        DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
    163173        DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
     
    234244        DerivedSources/WebKit2/WebPageMessageReceiver.cpp \
    235245        DerivedSources/WebKit2/WebPageMessages.h \
    236         DerivedSources/WebKit2/WebResourceCacheManagerMessageReceiver.cpp \
    237         DerivedSources/WebKit2/WebResourceCacheManagerMessages.h \
    238         DerivedSources/WebKit2/WebResourceCacheManagerProxyMessageReceiver.cpp \
    239         DerivedSources/WebKit2/WebResourceCacheManagerProxyMessages.h \
    240246        DerivedSources/WebKit2/WebProcessConnectionMessageReceiver.cpp \
    241247        DerivedSources/WebKit2/WebProcessConnectionMessages.h \
     
    244250        DerivedSources/WebKit2/WebProcessProxyMessageReceiver.cpp \
    245251        DerivedSources/WebKit2/WebProcessProxyMessages.h \
     252        DerivedSources/WebKit2/WebResourceCacheManagerMessageReceiver.cpp \
     253        DerivedSources/WebKit2/WebResourceCacheManagerMessages.h \
     254        DerivedSources/WebKit2/WebResourceCacheManagerProxyMessageReceiver.cpp \
     255        DerivedSources/WebKit2/WebResourceCacheManagerProxyMessages.h \
    246256        DerivedSources/WebKit2/WebResourceLoaderMessageReceiver.cpp \
    247257        DerivedSources/WebKit2/WebResourceLoaderMessages.h \
     
    305315webkit2_sources += \
    306316        Source/WebKit2/config.h \
     317        Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp \
     318        Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h \
    307319        Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp \
     320        Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.cpp \
     321        Source/WebKit2/NetworkProcess/AsynchronousNetworkLoaderClient.h \
     322        Source/WebKit2/NetworkProcess/HostRecord.cpp \
     323        Source/WebKit2/NetworkProcess/HostRecord.h \
     324        Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp \
     325        Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h \
     326        Source/WebKit2/NetworkProcess/NetworkLoaderClient.h \
     327        Source/WebKit2/NetworkProcess/NetworkProcess.cpp \
     328        Source/WebKit2/NetworkProcess/NetworkProcess.h \
     329        Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.cpp \
     330        Source/WebKit2/NetworkProcess/NetworkProcessPlatformStrategies.h \
     331        Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp \
     332        Source/WebKit2/NetworkProcess/NetworkResourceLoader.h \
     333        Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp \
     334        Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.h \
     335        Source/WebKit2/NetworkProcess/RemoteNetworkingContext.h \
    308336        Source/WebKit2/NetworkProcess/soup/NetworkResourceLoadSchedulerSoup.cpp \
     337        Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp \
     338        Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.cpp \
     339        Source/WebKit2/NetworkProcess/SynchronousNetworkLoaderClient.h \
     340        Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp \
     341        Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.h \
    309342        Source/WebKit2/PluginProcess/PluginControllerProxy.cpp \
    310343        Source/WebKit2/PluginProcess/PluginControllerProxy.h \
     
    399432        Source/WebKit2/Shared/ShareableBitmap.cpp \
    400433        Source/WebKit2/Shared/ShareableBitmap.h \
     434        Source/WebKit2/Shared/ShareableResource.cpp \
     435        Source/WebKit2/Shared/ShareableResource.h \
    401436        Source/WebKit2/Shared/CacheModel.cpp \
    402437        Source/WebKit2/Shared/CacheModel.h \
     
    421456        Source/WebKit2/Shared/EditorState.cpp \
    422457        Source/WebKit2/Shared/EditorState.h \
     458        Source/WebKit2/Shared/FileAPI/BlobRegistrationData.cpp \
     459        Source/WebKit2/Shared/FileAPI/BlobRegistrationData.h \
    423460        Source/WebKit2/Shared/FilterIterator.h \
    424461        Source/WebKit2/Shared/FontSmoothingLevel.h \
     
    445482        Source/WebKit2/Shared/NativeWebMouseEvent.h \
    446483        Source/WebKit2/Shared/NativeWebWheelEvent.h \
     484        Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h \
     485        Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp \
     486        Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h \
    447487        Source/WebKit2/Shared/Network/NetworkProcessSupplement.h \
     488        Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp \
    448489        Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h \
    449490        Source/WebKit2/Shared/OriginAndDatabases.cpp \
     
    866907        Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp \
    867908        Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h \
     909        Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp \
     910        Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h \
    868911        Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp \
    869912        Source/WebKit2/UIProcess/Notifications/NotificationPermissionRequest.cpp \
     
    10411084        Source/WebKit2/WebProcess/Cookies/soup/WebKitSoupCookieJarSqlite.h \
    10421085        Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h \
     1086        Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp \
     1087        Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h \
    10431088        Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.cpp \
    10441089        Source/WebKit2/WebProcess/FullScreen/WebFullScreenManager.h \
     
    11441189        Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.cpp \
    11451190        Source/WebKit2/WebProcess/MediaCache/WebMediaCacheManager.h \
     1191        Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp \
     1192        Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h \
     1193        Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp \
     1194        Source/WebKit2/WebProcess/Network/WebResourceLoader.h \
     1195        Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp \
     1196        Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h \
    11461197        Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.cpp \
    11471198        Source/WebKit2/WebProcess/NetworkInfo/WebNetworkInfoManager.h \
  • trunk/Source/WebKit2/NetworkProcess/unix/NetworkProcessMainUnix.cpp

    r159001 r160302  
    3333#include "WKBase.h"
    3434#include "WebKit2Initialize.h"
     35#include <WebCore/ResourceHandle.h>
    3536#include <WebKit2/NetworkProcess.h>
    3637#include <error.h>
  • trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp

    r155714 r160302  
    100100    parameters.ignoreTLSErrors = m_ignoreTLSErrors;
    101101    parameters.shouldTrackVisitedLinks = true;
     102#if ENABLE(NETWORK_PROCESS)
     103    parameters.usesNetworkProcess = true;
     104#endif
    102105}
    103106
  • trunk/Source/autotools/SetupAutomake.m4

    r156271 r160302  
    1414# enabled because it determines if we build leveldb or not.
    1515AM_WEBKIT_FEATURE_CONDITIONAL([ENABLE_INDEXED_DATABASE])
     16AM_WEBKIT_FEATURE_CONDITIONAL([ENABLE_NETWORK_PROCESS])
    1617
    1718# OS conditionals.
  • trunk/Source/autotools/SetupWebKitFeatures.m4

    r160156 r160302  
    156156    ENABLE_NETSCAPE_PLUGIN_API=1 \
    157157    ENABLE_NETWORK_INFO=0 \
     158    ENABLE_NETWORK_PROCESS=0 \
    158159    ENABLE_NOTIFICATIONS=0 \
    159160    ENABLE_ORIENTATION_EVENTS=0 \
Note: See TracChangeset for help on using the changeset viewer.