Remove NETWORK_PROCESS compile flag
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Nov 2015 22:10:52 +0000 (22:10 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Nov 2015 22:10:52 +0000 (22:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=151512

Reviewed by Tim Horton.

.:

* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFeatures.cmake:

Source/WebKit2:

* CMakeLists.txt:
* NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm:
(NetworkProcessMain):
* NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm:
(NetworkServiceInitializer):
* NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
(WebKit::NetworkBlobRegistry::filesInBlob):
* NetworkProcess/FileAPI/NetworkBlobRegistry.h:
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::blobSize):
* NetworkProcess/NetworkConnectionToWebProcess.h:
* NetworkProcess/NetworkConnectionToWebProcess.messages.in:
* NetworkProcess/NetworkLoad.cpp:
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/NetworkLoadClient.h:
* NetworkProcess/NetworkLoadParameters.cpp:
(WebKit::NetworkLoadParameters::NetworkLoadParameters):
* NetworkProcess/NetworkLoadParameters.h:
* NetworkProcess/NetworkProcess.cpp:
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:
* NetworkProcess/NetworkResourceLoader.cpp:
* NetworkProcess/NetworkResourceLoader.h:
* NetworkProcess/NetworkResourceLoader.messages.in:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::clearDiskCache):
* NetworkProcess/efl/NetworkProcessMainEfl.cpp:
(WebKit::NetworkProcessMainUnix):
* NetworkProcess/gtk/NetworkProcessMainGtk.cpp:
(WebKit::NetworkProcessMainUnix):
* NetworkProcess/ios/NetworkProcessIOS.mm:
* NetworkProcess/mac/NetworkLoadMac.mm:
* NetworkProcess/mac/NetworkProcessMac.mm:
* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
(WebKit::NetworkResourceLoader::willCacheResponseAsync):
* NetworkProcess/soup/NetworkProcessSoup.cpp:
(WebKit::NetworkProcess::platformTerminate):
* NetworkProcess/soup/RemoteNetworkingContextSoup.cpp:
(WebKit::RemoteNetworkingContext::storageSession):
* Shared/Authentication/AuthenticationManager.cpp:
(WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
* Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:
(WebKit::CustomProtocolManager::initialize):
(WebKit::CustomProtocolManager::addCustomProtocol):
* Shared/Network/CustomProtocols/CustomProtocolManager.h:
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp:
(WebKit::CustomProtocolManager::supplementName):
(WebKit::CustomProtocolManager::initialize):
(WebKit::CustomProtocolManager::registerScheme):
* Shared/Network/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::decode):
* Shared/Network/NetworkProcessCreationParameters.h:
* Shared/Network/NetworkProcessSupplement.h:
(WebKit::NetworkProcessSupplement::initialize):
* Shared/Network/NetworkResourceLoadParameters.cpp:
(WebKit::NetworkResourceLoadParameters::decode):
* Shared/Network/NetworkResourceLoadParameters.h:
* Shared/ProcessExecutablePath.h:
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* Shared/efl/ProcessExecutablePathEfl.cpp:
(WebKit::executablePathOfPluginProcess):
(WebKit::executablePathOfNetworkProcess):
(WebKit::executablePathOfDatabaseProcess):
* Shared/gtk/ProcessExecutablePathGtk.cpp:
(WebKit::executablePathOfPluginProcess):
(WebKit::executablePathOfNetworkProcess):
(WebKit::executablePathOfDatabaseProcess):
* Shared/mac/CookieStorageShim.h:
* Shared/mac/CookieStorageShim.mm:
(-[WKNSURLSessionLocal _getCookieHeadersForTask:completionHandler:]):
* Shared/mac/CookieStorageShimLibrary.cpp:
* Shared/mac/CookieStorageShimLibrary.h:
* UIProcess/API/APISession.cpp:
(API::Session::~Session):
* UIProcess/API/C/mac/WKContextPrivateMac.mm:
(WKContextGetNetworkProcessIdentifier):
* UIProcess/API/efl/ewk_context.cpp:
(ewk_context_process_model_set):
(ewk_context_process_model_get):
(ewk_context_tls_error_policy_get):
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::updateProcessSuppressionState):
(WebKit::WebProcessPool::platformInitializeWebProcess):
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
(WebKit::WebProcessPool::platformInvalidateContext):
* UIProcess/Downloads/DownloadProxy.cpp:
(WebKit::DownloadProxy::cancel):
* UIProcess/Launcher/ProcessLauncher.cpp:
(WebKit::ProcessLauncher::processTypeAsString):
(WebKit::ProcessLauncher::getProcessTypeFromString):
* UIProcess/Launcher/ProcessLauncher.h:
* UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
(WebKit::ProcessLauncher::launchProcess):
* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
(WebKit::ProcessLauncher::launchProcess):
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::computeProcessShimPath):
(WebKit::serviceName):
(WebKit::shouldLeakBoost):
(WebKit::createProcess):
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::setIsHoldingLockedFiles):
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/Network/NetworkProcessProxy.messages.in:
* UIProcess/Network/mac/NetworkProcessProxyMac.mm:
(WebKit::NetworkProcessProxy::platformGetLaunchOptions):
* UIProcess/Network/soup/NetworkProcessProxySoup.cpp:
(WebKit::NetworkProcessProxy::platformGetLaunchOptions):
* UIProcess/WebCookieManagerProxy.cpp:
(WebKit::WebCookieManagerProxy::setHTTPCookieAcceptPolicy):
(WebKit::WebCookieManagerProxy::getHTTPCookieAcceptPolicy):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::setSessionID):
(WebKit::WebPageProxy::initializeWebPage):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::WebProcessPool):
(WebKit::WebProcessPool::~WebProcessPool):
(WebKit::WebProcessPool::initializeClient):
(WebKit::WebProcessPool::networkingProcessConnection):
(WebKit::WebProcessPool::languageChanged):
(WebKit::WebProcessPool::setUsesNetworkProcess):
(WebKit::WebProcessPool::usesNetworkProcess):
(WebKit::WebProcessPool::ensureNetworkProcess):
(WebKit::WebProcessPool::getNetworkProcessConnection):
(WebKit::WebProcessPool::ensureDatabaseProcess):
(WebKit::WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled):
(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::download):
(WebKit::WebProcessPool::resumeDownload):
(WebKit::WebProcessPool::setAdditionalPluginsDirectory):
(WebKit::WebProcessPool::networkProcessIdentifier):
(WebKit::WebProcessPool::setAlwaysUsesComplexTextCodePath):
(WebKit::WebProcessPool::setCanHandleHTTPSServerTrustEvaluation):
(WebKit::WebProcessPool::registerURLSchemeAsLocal):
(WebKit::WebProcessPool::setCacheModel):
(WebKit::WebProcessPool::setDefaultRequestTimeoutInterval):
(WebKit::WebProcessPool::createDownloadProxy):
(WebKit::WebProcessPool::useTestingNetworkSession):
(WebKit::WebProcessPool::allowSpecificHTTPSCertificateForHost):
(WebKit::WebProcessPool::requestNetworkingStatistics):
(WebKit::WebProcessPool::handleMessage):
* UIProcess/WebProcessPool.h:
(WebKit::WebProcessPool::sendToNetworkingProcess):
(WebKit::WebProcessPool::sendToNetworkingProcessRelaunchingIfNecessary):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::getPluginProcessConnection):
(WebKit::WebProcessProxy::getNetworkProcessConnection):
(WebKit::WebProcessProxy::getDatabaseProcessConnection):
(WebKit::WebProcessProxy::createDownloadProxy):
(WebKit::WebProcessProxy::didCancelProcessSuspension):
(WebKit::WebProcessProxy::reinstateNetworkProcessAssertionState):
(WebKit::WebProcessProxy::didSetAssertionState):
* UIProcess/WebProcessProxy.h:
(WebKit::WebProcessProxy::throttler):
* UIProcess/WebProcessProxy.messages.in:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::~WebsiteDataStore):
(WebKit::WebsiteDataStore::cloneSessionData):
* UIProcess/gtk/WebProcessPoolGtk.cpp:
(WebKit::initInspectorServer):
(WebKit::WebProcessPool::setIgnoreTLSErrors):
* UIProcess/soup/WebProcessPoolSoup.cpp:
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
* WebKit2Prefix.h:
* WebProcess/FileAPI/BlobRegistryProxy.cpp:
(WebKit::BlobRegistryProxy::blobSize):
* WebProcess/FileAPI/BlobRegistryProxy.h:
* WebProcess/Network/NetworkProcessConnection.cpp:
* WebProcess/Network/NetworkProcessConnection.h:
* WebProcess/Network/NetworkProcessConnection.messages.in:
* WebProcess/Network/WebResourceLoadScheduler.cpp:
(WebKit::WebResourceLoadScheduler::networkProcessCrashed):
* WebProcess/Network/WebResourceLoadScheduler.h:
* WebProcess/Network/WebResourceLoader.cpp:
* WebProcess/Network/WebResourceLoader.h:
* WebProcess/Network/WebResourceLoader.messages.in:
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::initializeBrowserFuncs):
(WebKit::netscapeBrowserFuncs):
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::registerRedirect):
(WebKit::NetscapePlugin::urlRedirectResponse):
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::cookiesForDOM):
(WebKit::WebPlatformStrategies::setCookiesFromDOM):
(WebKit::WebPlatformStrategies::cookiesEnabled):
(WebKit::WebPlatformStrategies::cookieRequestHeaderFieldValue):
(WebKit::WebPlatformStrategies::getRawCookies):
(WebKit::WebPlatformStrategies::deleteCookie):
(WebKit::WebPlatformStrategies::resourceLoadScheduler):
(WebKit::WebPlatformStrategies::createBlobRegistry):
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::startDownload):
(WebKit::WebFrame::convertMainResourceLoadToDownload):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::ensureNetworkProcessConnection):
(WebKit::WebProcess::registerURLSchemeAsEmptyDocument):
(WebKit::WebProcess::usesNetworkProcess):
(WebKit::WebProcess::networkConnection):
(WebKit::WebProcess::webResourceLoadScheduler):
(WebKit::WebProcess::webToDatabaseProcessConnectionClosed):
(WebKit::WebProcess::prefetchDNS):
* WebProcess/WebProcess.h:
* config.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@192697 268f45cc-cd09-0410-ab3c-d52691b4dbfc

96 files changed:
ChangeLog
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm
Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm
Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp
Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h
Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp
Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h
Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in
Source/WebKit2/NetworkProcess/NetworkLoad.cpp
Source/WebKit2/NetworkProcess/NetworkLoad.h
Source/WebKit2/NetworkProcess/NetworkLoadClient.h
Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp
Source/WebKit2/NetworkProcess/NetworkLoadParameters.h
Source/WebKit2/NetworkProcess/NetworkProcess.cpp
Source/WebKit2/NetworkProcess/NetworkProcess.h
Source/WebKit2/NetworkProcess/NetworkProcess.messages.in
Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp
Source/WebKit2/NetworkProcess/NetworkResourceLoader.h
Source/WebKit2/NetworkProcess/NetworkResourceLoader.messages.in
Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm
Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp
Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp
Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm
Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm
Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm
Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm
Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp
Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp
Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp
Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm
Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h
Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp
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/ProcessExecutablePath.h
Source/WebKit2/Shared/WebProcessCreationParameters.cpp
Source/WebKit2/Shared/WebProcessCreationParameters.h
Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp
Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp
Source/WebKit2/Shared/mac/CookieStorageShim.h
Source/WebKit2/Shared/mac/CookieStorageShim.mm
Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp
Source/WebKit2/Shared/mac/CookieStorageShimLibrary.h
Source/WebKit2/UIProcess/API/APISession.cpp
Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm
Source/WebKit2/UIProcess/API/efl/ewk_context.cpp
Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp
Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp
Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h
Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp
Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp
Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm
Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp
Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h
Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in
Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm
Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp
Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp
Source/WebKit2/UIProcess/WebPageProxy.cpp
Source/WebKit2/UIProcess/WebProcessPool.cpp
Source/WebKit2/UIProcess/WebProcessPool.h
Source/WebKit2/UIProcess/WebProcessProxy.cpp
Source/WebKit2/UIProcess/WebProcessProxy.h
Source/WebKit2/UIProcess/WebProcessProxy.messages.in
Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp
Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp
Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp
Source/WebKit2/WebKit2Prefix.h
Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp
Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h
Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp
Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h
Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in
Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp
Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h
Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp
Source/WebKit2/WebProcess/Network/WebResourceLoader.h
Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp
Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h
Source/WebKit2/WebProcess/WebPage/WebFrame.cpp
Source/WebKit2/WebProcess/WebProcess.cpp
Source/WebKit2/WebProcess/WebProcess.h
Source/WebKit2/config.h
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsGTK.cmake
Source/cmake/OptionsMac.cmake
Source/cmake/WebKitFeatures.cmake

index 4203a9c..79a6bcf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2015-11-20  Alex Christensen  <achristensen@webkit.org>
+
+        Remove NETWORK_PROCESS compile flag
+        https://bugs.webkit.org/show_bug.cgi?id=151512
+
+        Reviewed by Tim Horton.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsMac.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+
 2015-11-20  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         [EFL] Enable FTL JIT by default on X86_64
index 03ffe98..a274dc8 100644 (file)
@@ -803,16 +803,13 @@ if (WebKit2_WebProcess_OUTPUT_NAME)
     set_target_properties(WebProcess PROPERTIES OUTPUT_NAME ${WebKit2_WebProcess_OUTPUT_NAME})
 endif ()
 
-if (ENABLE_NETWORK_PROCESS)
-    add_executable(NetworkProcess ${NetworkProcess_SOURCES})
-    add_webkit2_prefix_header(NetworkProcess)
-    target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
-    set_target_properties(NetworkProcess PROPERTIES FOLDER "WebKit")
-    install(TARGETS NetworkProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
-
-    if (WebKit2_NetworkProcess_OUTPUT_NAME)
-        set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
-    endif ()
+add_executable(NetworkProcess ${NetworkProcess_SOURCES})
+add_webkit2_prefix_header(NetworkProcess)
+target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
+set_target_properties(NetworkProcess PROPERTIES FOLDER "WebKit")
+
+if (WebKit2_NetworkProcess_OUTPUT_NAME)
+    set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
 endif ()
 
 if (ENABLE_PLUGIN_PROCESS)
@@ -847,7 +844,7 @@ set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${
 if (APPLE)
     WEBKIT_FRAMEWORK(WebKit2)
 else ()
-    install(TARGETS WebKit2 WebProcess
+    install(TARGETS WebKit2 WebProcess NetworkProcess
         LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
         RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}"
     )
index de09705..e9f7b17 100644 (file)
@@ -1,3 +1,223 @@
+2015-11-20  Alex Christensen  <achristensen@webkit.org>
+
+        Remove NETWORK_PROCESS compile flag
+        https://bugs.webkit.org/show_bug.cgi?id=151512
+
+        Reviewed by Tim Horton.
+
+        * CMakeLists.txt:
+        * NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm:
+        (NetworkProcessMain):
+        * NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm:
+        (NetworkServiceInitializer):
+        * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
+        (WebKit::NetworkBlobRegistry::filesInBlob):
+        * NetworkProcess/FileAPI/NetworkBlobRegistry.h:
+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+        (WebKit::NetworkConnectionToWebProcess::blobSize):
+        * NetworkProcess/NetworkConnectionToWebProcess.h:
+        * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+        * NetworkProcess/NetworkLoad.cpp:
+        * NetworkProcess/NetworkLoad.h:
+        * NetworkProcess/NetworkLoadClient.h:
+        * NetworkProcess/NetworkLoadParameters.cpp:
+        (WebKit::NetworkLoadParameters::NetworkLoadParameters):
+        * NetworkProcess/NetworkLoadParameters.h:
+        * NetworkProcess/NetworkProcess.cpp:
+        * NetworkProcess/NetworkProcess.h:
+        * NetworkProcess/NetworkProcess.messages.in:
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        * NetworkProcess/NetworkResourceLoader.h:
+        * NetworkProcess/NetworkResourceLoader.messages.in:
+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+        (WebKit::NetworkProcess::clearDiskCache):
+        * NetworkProcess/efl/NetworkProcessMainEfl.cpp:
+        (WebKit::NetworkProcessMainUnix):
+        * NetworkProcess/gtk/NetworkProcessMainGtk.cpp:
+        (WebKit::NetworkProcessMainUnix):
+        * NetworkProcess/ios/NetworkProcessIOS.mm:
+        * NetworkProcess/mac/NetworkLoadMac.mm:
+        * NetworkProcess/mac/NetworkProcessMac.mm:
+        * NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+        (WebKit::NetworkResourceLoader::willCacheResponseAsync):
+        * NetworkProcess/soup/NetworkProcessSoup.cpp:
+        (WebKit::NetworkProcess::platformTerminate):
+        * NetworkProcess/soup/RemoteNetworkingContextSoup.cpp:
+        (WebKit::RemoteNetworkingContext::storageSession):
+        * Shared/Authentication/AuthenticationManager.cpp:
+        (WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
+        * Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:
+        (WebKit::CustomProtocolManager::initialize):
+        (WebKit::CustomProtocolManager::addCustomProtocol):
+        * Shared/Network/CustomProtocols/CustomProtocolManager.h:
+        * Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp:
+        (WebKit::CustomProtocolManager::supplementName):
+        (WebKit::CustomProtocolManager::initialize):
+        (WebKit::CustomProtocolManager::registerScheme):
+        * Shared/Network/NetworkProcessCreationParameters.cpp:
+        (WebKit::NetworkProcessCreationParameters::decode):
+        * Shared/Network/NetworkProcessCreationParameters.h:
+        * Shared/Network/NetworkProcessSupplement.h:
+        (WebKit::NetworkProcessSupplement::initialize):
+        * Shared/Network/NetworkResourceLoadParameters.cpp:
+        (WebKit::NetworkResourceLoadParameters::decode):
+        * Shared/Network/NetworkResourceLoadParameters.h:
+        * Shared/ProcessExecutablePath.h:
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * Shared/efl/ProcessExecutablePathEfl.cpp:
+        (WebKit::executablePathOfPluginProcess):
+        (WebKit::executablePathOfNetworkProcess):
+        (WebKit::executablePathOfDatabaseProcess):
+        * Shared/gtk/ProcessExecutablePathGtk.cpp:
+        (WebKit::executablePathOfPluginProcess):
+        (WebKit::executablePathOfNetworkProcess):
+        (WebKit::executablePathOfDatabaseProcess):
+        * Shared/mac/CookieStorageShim.h:
+        * Shared/mac/CookieStorageShim.mm:
+        (-[WKNSURLSessionLocal _getCookieHeadersForTask:completionHandler:]):
+        * Shared/mac/CookieStorageShimLibrary.cpp:
+        * Shared/mac/CookieStorageShimLibrary.h:
+        * UIProcess/API/APISession.cpp:
+        (API::Session::~Session):
+        * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+        (WKContextGetNetworkProcessIdentifier):
+        * UIProcess/API/efl/ewk_context.cpp:
+        (ewk_context_process_model_set):
+        (ewk_context_process_model_get):
+        (ewk_context_tls_error_policy_get):
+        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+        (WebKit::WebProcessPool::updateProcessSuppressionState):
+        (WebKit::WebProcessPool::platformInitializeWebProcess):
+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+        (WebKit::WebProcessPool::platformInvalidateContext):
+        * UIProcess/Downloads/DownloadProxy.cpp:
+        (WebKit::DownloadProxy::cancel):
+        * UIProcess/Launcher/ProcessLauncher.cpp:
+        (WebKit::ProcessLauncher::processTypeAsString):
+        (WebKit::ProcessLauncher::getProcessTypeFromString):
+        * UIProcess/Launcher/ProcessLauncher.h:
+        * UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+        * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+        * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+        (WebKit::computeProcessShimPath):
+        (WebKit::serviceName):
+        (WebKit::shouldLeakBoost):
+        (WebKit::createProcess):
+        * UIProcess/Network/NetworkProcessProxy.cpp:
+        (WebKit::NetworkProcessProxy::setIsHoldingLockedFiles):
+        * UIProcess/Network/NetworkProcessProxy.h:
+        * UIProcess/Network/NetworkProcessProxy.messages.in:
+        * UIProcess/Network/mac/NetworkProcessProxyMac.mm:
+        (WebKit::NetworkProcessProxy::platformGetLaunchOptions):
+        * UIProcess/Network/soup/NetworkProcessProxySoup.cpp:
+        (WebKit::NetworkProcessProxy::platformGetLaunchOptions):
+        * UIProcess/WebCookieManagerProxy.cpp:
+        (WebKit::WebCookieManagerProxy::setHTTPCookieAcceptPolicy):
+        (WebKit::WebCookieManagerProxy::getHTTPCookieAcceptPolicy):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy):
+        (WebKit::WebPageProxy::setSessionID):
+        (WebKit::WebPageProxy::initializeWebPage):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::WebProcessPool):
+        (WebKit::WebProcessPool::~WebProcessPool):
+        (WebKit::WebProcessPool::initializeClient):
+        (WebKit::WebProcessPool::networkingProcessConnection):
+        (WebKit::WebProcessPool::languageChanged):
+        (WebKit::WebProcessPool::setUsesNetworkProcess):
+        (WebKit::WebProcessPool::usesNetworkProcess):
+        (WebKit::WebProcessPool::ensureNetworkProcess):
+        (WebKit::WebProcessPool::getNetworkProcessConnection):
+        (WebKit::WebProcessPool::ensureDatabaseProcess):
+        (WebKit::WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled):
+        (WebKit::WebProcessPool::createNewWebProcess):
+        (WebKit::WebProcessPool::download):
+        (WebKit::WebProcessPool::resumeDownload):
+        (WebKit::WebProcessPool::setAdditionalPluginsDirectory):
+        (WebKit::WebProcessPool::networkProcessIdentifier):
+        (WebKit::WebProcessPool::setAlwaysUsesComplexTextCodePath):
+        (WebKit::WebProcessPool::setCanHandleHTTPSServerTrustEvaluation):
+        (WebKit::WebProcessPool::registerURLSchemeAsLocal):
+        (WebKit::WebProcessPool::setCacheModel):
+        (WebKit::WebProcessPool::setDefaultRequestTimeoutInterval):
+        (WebKit::WebProcessPool::createDownloadProxy):
+        (WebKit::WebProcessPool::useTestingNetworkSession):
+        (WebKit::WebProcessPool::allowSpecificHTTPSCertificateForHost):
+        (WebKit::WebProcessPool::requestNetworkingStatistics):
+        (WebKit::WebProcessPool::handleMessage):
+        * UIProcess/WebProcessPool.h:
+        (WebKit::WebProcessPool::sendToNetworkingProcess):
+        (WebKit::WebProcessPool::sendToNetworkingProcessRelaunchingIfNecessary):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::getPluginProcessConnection):
+        (WebKit::WebProcessProxy::getNetworkProcessConnection):
+        (WebKit::WebProcessProxy::getDatabaseProcessConnection):
+        (WebKit::WebProcessProxy::createDownloadProxy):
+        (WebKit::WebProcessProxy::didCancelProcessSuspension):
+        (WebKit::WebProcessProxy::reinstateNetworkProcessAssertionState):
+        (WebKit::WebProcessProxy::didSetAssertionState):
+        * UIProcess/WebProcessProxy.h:
+        (WebKit::WebProcessProxy::throttler):
+        * UIProcess/WebProcessProxy.messages.in:
+        * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+        (WebKit::WebsiteDataStore::~WebsiteDataStore):
+        (WebKit::WebsiteDataStore::cloneSessionData):
+        * UIProcess/gtk/WebProcessPoolGtk.cpp:
+        (WebKit::initInspectorServer):
+        (WebKit::WebProcessPool::setIgnoreTLSErrors):
+        * UIProcess/soup/WebProcessPoolSoup.cpp:
+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+        * WebKit2Prefix.h:
+        * WebProcess/FileAPI/BlobRegistryProxy.cpp:
+        (WebKit::BlobRegistryProxy::blobSize):
+        * WebProcess/FileAPI/BlobRegistryProxy.h:
+        * WebProcess/Network/NetworkProcessConnection.cpp:
+        * WebProcess/Network/NetworkProcessConnection.h:
+        * WebProcess/Network/NetworkProcessConnection.messages.in:
+        * WebProcess/Network/WebResourceLoadScheduler.cpp:
+        (WebKit::WebResourceLoadScheduler::networkProcessCrashed):
+        * WebProcess/Network/WebResourceLoadScheduler.h:
+        * WebProcess/Network/WebResourceLoader.cpp:
+        * WebProcess/Network/WebResourceLoader.h:
+        * WebProcess/Network/WebResourceLoader.messages.in:
+        * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+        (WebKit::initializeBrowserFuncs):
+        (WebKit::netscapeBrowserFuncs):
+        * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+        (WebKit::NetscapePlugin::registerRedirect):
+        (WebKit::NetscapePlugin::urlRedirectResponse):
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+        (WebKit::WebPlatformStrategies::cookiesForDOM):
+        (WebKit::WebPlatformStrategies::setCookiesFromDOM):
+        (WebKit::WebPlatformStrategies::cookiesEnabled):
+        (WebKit::WebPlatformStrategies::cookieRequestHeaderFieldValue):
+        (WebKit::WebPlatformStrategies::getRawCookies):
+        (WebKit::WebPlatformStrategies::deleteCookie):
+        (WebKit::WebPlatformStrategies::resourceLoadScheduler):
+        (WebKit::WebPlatformStrategies::createBlobRegistry):
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::startDownload):
+        (WebKit::WebFrame::convertMainResourceLoadToDownload):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess):
+        (WebKit::WebProcess::initializeWebProcess):
+        (WebKit::WebProcess::ensureNetworkProcessConnection):
+        (WebKit::WebProcess::registerURLSchemeAsEmptyDocument):
+        (WebKit::WebProcess::usesNetworkProcess):
+        (WebKit::WebProcess::networkConnection):
+        (WebKit::WebProcess::webResourceLoadScheduler):
+        (WebKit::WebProcess::webToDatabaseProcessConnectionClosed):
+        (WebKit::WebProcess::prefetchDNS):
+        * WebProcess/WebProcess.h:
+        * config.h:
+
 2015-11-19  Simon Fraser  <simon.fraser@apple.com>
 
         Back-buffer to front-buffer copy fails for some buffer formats
index 87b9e40..403feaf 100644 (file)
@@ -25,8 +25,6 @@
 
 #import "config.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #import "ChildProcessEntryPoint.h"
 #import "NetworkProcess.h"
 #import "WKBase.h"
@@ -39,5 +37,3 @@ int NetworkProcessMain(int argc, char** argv)
 {
     return ChildProcessMain<NetworkProcess, ChildProcessMainDelegate>(argc, argv);
 }
-
-#endif // ENABLE(NETWORK_PROCESS)
index 41fb44e..7251035 100644 (file)
@@ -52,7 +52,6 @@ extern "C" WK_EXPORT void NetworkServiceInitializer(xpc_connection_t connection,
 
 void NetworkServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage)
 {
-#if ENABLE(NETWORK_PROCESS)
     // Remove the SecItemShim from the DYLD_INSERT_LIBRARIES environment variable so any processes spawned by
     // the this process don't try to insert the shim and crash.
     EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/SecItemShim.dylib");
@@ -69,5 +68,4 @@ void NetworkServiceInitializer(xpc_connection_t connection, xpc_object_t initial
 #if HAVE(OS_ACTIVITY)
     os_activity_end(activity);
 #endif
-#endif
 }
index cb197ce..3a6f452 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NetworkBlobRegistry.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "BlobDataFileReferenceWithSandboxExtension.h"
 #include "SandboxExtension.h"
 #include <WebCore/BlobPart.h>
@@ -151,5 +149,3 @@ Vector<RefPtr<BlobDataFileReference>> NetworkBlobRegistry::filesInBlob(NetworkCo
 }
 
 }
-
-#endif
index 16fdcee..a729578 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef NetworkBlobRegistry_h
 #define NetworkBlobRegistry_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include <WebCore/URLHash.h>
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
@@ -68,6 +66,4 @@ private:
 
 }
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // NetworkBlobRegistry_h
index c82e3f0..a64538c 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NetworkConnectionToWebProcess.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "NetworkBlobRegistry.h"
 #include "NetworkConnectionToWebProcessMessages.h"
 #include "NetworkLoad.h"
@@ -274,5 +272,3 @@ void NetworkConnectionToWebProcess::blobSize(const URL& url, uint64_t& resultSiz
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index 0fca5ce..e455bc7 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef NetworkConnectionToWebProcess_h
 #define NetworkConnectionToWebProcess_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "BlockingResponseMap.h"
 #include "Connection.h"
 #include "NetworkConnectionToWebProcessMessages.h"
@@ -102,6 +100,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // NetworkConnectionToWebProcess_h
index 7ce3971..ac770d2 100644 (file)
@@ -20,8 +20,6 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#if ENABLE(NETWORK_PROCESS)
-
 messages -> NetworkConnectionToWebProcess LegacyReceiver {
 
     ScheduleResourceLoad(WebKit::NetworkResourceLoadParameters resourceLoadParameters)
@@ -48,5 +46,3 @@ messages -> NetworkConnectionToWebProcess LegacyReceiver {
     UnregisterBlobURL(WebCore::URL url)
     BlobSize(WebCore::URL url) -> (uint64_t resultSize)
 }
-
-#endif // ENABLE(NETWORK_PROCESS)
index c9881b7..96d1606 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "config.h"
 
-#if ENABLE(NETWORK_PROCESS)
 #include "NetworkLoad.h"
 
 #include "AuthenticationManager.h"
@@ -371,5 +370,3 @@ void NetworkLoad::receivedCancellation(ResourceHandle* handle, const Authenticat
 #endif // !USE(NETWORK_SESSION)
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index 9b7d13f..ec1b24e 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef NetworkLoad_h
 #define NetworkLoad_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "NetworkLoadClient.h"
 #include "NetworkLoadParameters.h"
 #include "RemoteNetworkingContext.h"
@@ -126,6 +124,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // NetworkLoad_h
index ba486b7..b45d402 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef NetworkLoadClient_h
 #define NetworkLoadClient_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include <WebCore/ResourceError.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/ResourceResponse.h>
@@ -66,7 +64,5 @@ public:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // NetworkLoadClient_h
 
index d0b7b11..cc84875 100644 (file)
@@ -24,8 +24,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(NETWORK_PROCESS)
 #include "NetworkLoadParameters.h"
 
 #include "NetworkResourceLoadParameters.h"
@@ -47,5 +45,3 @@ NetworkLoadParameters::NetworkLoadParameters(const NetworkResourceLoadParameters
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index 7cb3762..130aaa3 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef NetworkLoadParameters_h
 #define NetworkLoadParameters_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include <WebCore/ResourceLoaderOptions.h>
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/SessionID.h>
@@ -55,6 +53,4 @@ public:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // NetworkLoadParameters_h
index 684a2e7..db70eb0 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NetworkProcess.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "ArgumentCoders.h"
 #include "Attachment.h"
 #include "AuthenticationManager.h"
@@ -554,5 +552,3 @@ void NetworkProcess::platformLowMemoryHandler(Critical)
 #endif
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index 23070d1..8dc8a63 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef NetworkProcess_h
 #define NetworkProcess_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "CacheModel.h"
 #include "ChildProcess.h"
 #include "DownloadManager.h"
@@ -197,6 +195,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // NetworkProcess_h
index 3bf29cf..017a28e 100644 (file)
@@ -20,8 +20,6 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#if ENABLE(NETWORK_PROCESS)
-
 messages -> NetworkProcess LegacyReceiver {
     # Initializes the network process.
     InitializeNetworkProcess(struct WebKit::NetworkProcessCreationParameters processCreationParameters)
@@ -63,5 +61,3 @@ messages -> NetworkProcess LegacyReceiver {
     CancelPrepareToSuspend()
     ProcessDidResume()
 }
-
-#endif // ENABLE(NETWORK_PROCESS)
index 3252163..9082e38 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NetworkResourceLoader.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "DataReference.h"
 #include "Logging.h"
 #include "NetworkBlobRegistry.h"
@@ -581,5 +579,3 @@ void NetworkResourceLoader::continueCanAuthenticateAgainstProtectionSpace(bool r
 #endif
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index ae8cac2..bf13683 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef NetworkResourceLoader_h
 #define NetworkResourceLoader_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "MessageSender.h"
 #include "NetworkConnectionToWebProcessMessages.h"
 #include "NetworkLoadClient.h"
@@ -169,6 +167,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // NetworkResourceLoader_h
index 79a35af..ebb8d7c 100644 (file)
@@ -20,8 +20,6 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#if ENABLE(NETWORK_PROCESS)
-
 messages -> NetworkResourceLoader LegacyReceiver {
 
     ContinueWillSendRequest(WebCore::ResourceRequest request)
@@ -30,5 +28,3 @@ messages -> NetworkResourceLoader LegacyReceiver {
     ContinueCanAuthenticateAgainstProtectionSpace(bool canAuthenticate)
 #endif
 }
-
-#endif // ENABLE(NETWORK_PROCESS)
index 5d55cea..3abcf69 100644 (file)
@@ -26,8 +26,6 @@
 #import "config.h"
 #import "NetworkProcess.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #import "NetworkCache.h"
 #import "NetworkProcessCreationParameters.h"
 #import "NetworkResourceLoader.h"
@@ -267,5 +265,3 @@ void NetworkProcess::clearDiskCache(std::chrono::system_clock::time_point modifi
 }
 
 }
-
-#endif
index 44e22ea..432c12a 100644 (file)
@@ -27,8 +27,6 @@
 #include "config.h"
 #include "NetworkProcessMainUnix.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "ChildProcessMain.h"
 #include "NetworkProcess.h"
 #include <Ecore.h>
@@ -70,5 +68,3 @@ int NetworkProcessMainUnix(int argc, char** argv)
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index 6855e31..aebc285 100644 (file)
@@ -27,8 +27,6 @@
 #include "config.h"
 #include "NetworkProcessMainUnix.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "ChildProcessMain.h"
 #include "NetworkProcess.h"
 #include <WebCore/SoupNetworkSession.h>
@@ -63,5 +61,3 @@ int NetworkProcessMainUnix(int argc, char** argv)
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index cd5dec6..bd04828 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "NetworkProcess.h"
 
-#if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
+#if PLATFORM(IOS)
 
 #import "NetworkCache.h"
 #import "NetworkProcessCreationParameters.h"
@@ -101,4 +101,4 @@ void NetworkProcess::platformTerminate()
 
 } // namespace WebKit
 
-#endif // PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
+#endif // PLATFORM(IOS)
index f98e490..f3c6ecb 100644 (file)
@@ -25,7 +25,6 @@
 
 #import "config.h"
 
-#if ENABLE(NETWORK_PROCESS)
 #import "NetworkLoad.h"
 
 #import <WebCore/CFNetworkSPI.h>
@@ -60,5 +59,3 @@ void NetworkLoad::willCacheResponseAsync(ResourceHandle* handle, NSCachedURLResp
 #endif // !USE(CFNETWORK)
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index fac11a4..284e5b7 100644 (file)
@@ -26,7 +26,7 @@
 #import "config.h"
 #import "NetworkProcess.h"
 
-#if PLATFORM(MAC) && ENABLE(NETWORK_PROCESS)
+#if PLATFORM(MAC)
 
 #import "NetworkCache.h"
 #import "NetworkProcessCreationParameters.h"
@@ -144,4 +144,4 @@ void NetworkProcess::platformTerminate()
 
 } // namespace WebKit
 
-#endif // PLATFORM(MAC) && ENABLE(NETWORK_PROCESS)
+#endif // PLATFORM(MAC)
index 8a286e6..c2417f9 100644 (file)
@@ -26,8 +26,6 @@
 #import "config.h"
 #import "NetworkResourceLoader.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #import "NetworkDiskCacheMonitor.h"
 #import "ShareableResource.h"
 #import <WebCore/CFNetworkSPI.h>
@@ -90,6 +88,3 @@ void NetworkResourceLoader::willCacheResponseAsync(CFCachedURLResponseRef cfResp
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
-
index f9a0ff8..c2fd1fc 100644 (file)
@@ -25,7 +25,6 @@
  */
 
 #include "config.h"
-#if ENABLE(NETWORK_PROCESS)
 #include "NetworkProcess.h"
 
 #include "NetworkCache.h"
@@ -170,5 +169,3 @@ void NetworkProcess::platformTerminate()
 }
 
 } // namespace WebKit
-
-#endif
index 6da4d68..6aecb7f 100644 (file)
@@ -26,7 +26,6 @@
  */
 
 #include "config.h"
-#if ENABLE(NETWORK_PROCESS)
 #include "RemoteNetworkingContext.h"
 
 #include <WebCore/NetworkStorageSession.h>
@@ -57,5 +56,3 @@ NetworkStorageSession& RemoteNetworkingContext::storageSession() const
 }
 
 }
-
-#endif // ENABLE(NETWORK_PROCESS)
index 716805a..a5184c9 100644 (file)
@@ -30,6 +30,7 @@
 #include "ChildProcess.h"
 #include "Download.h"
 #include "DownloadProxyMessages.h"
+#include "NetworkProcessProxyMessages.h"
 #include "WebCoreArgumentCoders.h"
 #include "WebFrame.h"
 #include "WebPage.h"
 #include <WebCore/AuthenticationChallenge.h>
 #include <WebCore/AuthenticationClient.h>
 
-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessProxyMessages.h"
-#endif
-
 using namespace WebCore;
 
 namespace WebKit {
@@ -128,7 +125,6 @@ void AuthenticationManager::didReceiveAuthenticationChallenge(WebFrame* frame, c
     m_process->send(Messages::WebPageProxy::DidReceiveAuthenticationChallenge(frame->frameID(), authenticationChallenge, challengeID), frame->page()->pageID());
 }
 
-#if ENABLE(NETWORK_PROCESS)
 #if USE(NETWORK_SESSION)
 void AuthenticationManager::didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const AuthenticationChallenge& authenticationChallenge, ChallengeCompletionHandler completionHandler)
 {
@@ -157,7 +153,6 @@ void AuthenticationManager::didReceiveAuthenticationChallenge(uint64_t pageID, u
     
     m_process->send(Messages::NetworkProcessProxy::DidReceiveAuthenticationChallenge(pageID, frameID, authenticationChallenge, challengeID));
 }
-#endif
 
 #if !USE(NETWORK_SESSION)
 void AuthenticationManager::didReceiveAuthenticationChallenge(Download* download, const AuthenticationChallenge& authenticationChallenge)
index e388255..1653bcd 100644 (file)
@@ -30,6 +30,7 @@
 #import "CustomProtocolManagerMessages.h"
 #import "CustomProtocolManagerProxyMessages.h"
 #import "DataReference.h"
+#import "NetworkProcessCreationParameters.h"
 #import "WebCoreArgumentCoders.h"
 #import "WebProcessCreationParameters.h"
 #import <WebCore/URL.h>
 #import <WebCore/ResourceRequest.h>
 #import <WebCore/ResourceResponse.h>
 
-#if ENABLE(NETWORK_PROCESS)
-#import "NetworkProcessCreationParameters.h"
-#endif
-
 #ifdef __has_include
 #if __has_include(<Foundation/NSURLConnectionPrivate.h>)
 #import <Foundation/NSURLConnectionPrivate.h>
@@ -137,14 +134,12 @@ void CustomProtocolManager::initializeConnection(IPC::Connection* connection)
 
 void CustomProtocolManager::initialize(const WebProcessCreationParameters& parameters)
 {
-#if ENABLE(NETWORK_PROCESS)
     ASSERT(parameters.urlSchemesRegisteredForCustomProtocols.isEmpty() || !parameters.usesNetworkProcess);
     if (parameters.usesNetworkProcess) {
         m_childProcess->parentProcessConnection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
         m_messageQueue = nullptr;
         return;
     }
-#endif
 
     [NSURLProtocol registerClass:[WKCustomProtocol class]];
 
@@ -152,7 +147,6 @@ void CustomProtocolManager::initialize(const WebProcessCreationParameters& param
         registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
 }
 
-#if ENABLE(NETWORK_PROCESS)
 void CustomProtocolManager::initialize(const NetworkProcessCreationParameters& parameters)
 {
     [NSURLProtocol registerClass:[WKCustomProtocol class]];
@@ -160,7 +154,6 @@ void CustomProtocolManager::initialize(const NetworkProcessCreationParameters& p
     for (size_t i = 0; i < parameters.urlSchemesRegisteredForCustomProtocols.size(); ++i)
         registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
 }
-#endif
 
 void CustomProtocolManager::addCustomProtocol(WKCustomProtocol *customProtocol)
 {
index 098009c..c4857b1 100644 (file)
@@ -83,10 +83,8 @@ private:
     // WebProcessSupplement
     void initialize(const WebProcessCreationParameters&) override;
 
-#if ENABLE(NETWORK_PROCESS)
     // NetworkProcessSupplement
     void initialize(const NetworkProcessCreationParameters&) override;
-#endif
 
     // IPC::MessageReceiver
     virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
index a65ca08..86137eb 100644 (file)
 #include "ChildProcess.h"
 #include "CustomProtocolManagerImpl.h"
 #include "CustomProtocolManagerMessages.h"
+#include "NetworkProcessCreationParameters.h"
 #include "WebProcessCreationParameters.h"
 #include <WebCore/NotImplemented.h>
 
-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessCreationParameters.h"
-#endif
-
 namespace WebKit {
 
 const char* CustomProtocolManager::supplementName()
@@ -51,25 +48,21 @@ void CustomProtocolManager::initializeConnection(IPC::Connection* connection)
 
 void CustomProtocolManager::initialize(const WebProcessCreationParameters& parameters)
 {
-#if ENABLE(NETWORK_PROCESS)
     ASSERT(parameters.urlSchemesRegisteredForCustomProtocols.isEmpty() || !parameters.usesNetworkProcess);
     if (parameters.usesNetworkProcess) {
         m_childProcess->parentProcessConnection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
         m_messageQueue = nullptr;
         return;
     }
-#endif
     for (size_t i = 0; i < parameters.urlSchemesRegisteredForCustomProtocols.size(); ++i)
         registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
 }
 
-#if ENABLE(NETWORK_PROCESS)
 void CustomProtocolManager::initialize(const NetworkProcessCreationParameters& parameters)
 {
     for (size_t i = 0; i < parameters.urlSchemesRegisteredForCustomProtocols.size(); ++i)
         registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
 }
-#endif
 
 void CustomProtocolManager::registerScheme(const String& scheme)
 {
index a37bbe3..751fbb1 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NetworkProcessCreationParameters.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "ArgumentCoders.h"
 
 #if PLATFORM(COCOA)
@@ -168,5 +166,3 @@ bool NetworkProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, Net
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index 90869c1..71d1333 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef NetworkProcessCreationParameters_h
 #define NetworkProcessCreationParameters_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "CacheModel.h"
 #include "SandboxExtension.h"
 #include <wtf/Vector.h>
@@ -103,6 +101,4 @@ struct NetworkProcessCreationParameters {
 
 } // namespace WebKit
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // NetworkProcessCreationParameters_h
index d6fbe5b..e2b46b3 100644 (file)
@@ -33,12 +33,10 @@ namespace WebKit {
 struct NetworkProcessCreationParameters;
 
 class NetworkProcessSupplement : public ChildProcessSupplement {
-#if ENABLE(NETWORK_PROCESS)
 public:
     virtual void initialize(const NetworkProcessCreationParameters&)
     {
     }
-#endif
 };
 
 } // namespace WebKit
index c5d8465..f4c58a5 100644 (file)
@@ -30,8 +30,6 @@
 #include "DataReference.h"
 #include "WebCoreArgumentCoders.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 using namespace WebCore;
 
 namespace WebKit {
@@ -160,5 +158,3 @@ bool NetworkResourceLoadParameters::decode(IPC::ArgumentDecoder& decoder, Networ
 }
     
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index 2e8b91c..2f1528a 100644 (file)
@@ -32,8 +32,6 @@
 #include <WebCore/ResourceRequest.h>
 #include <WebCore/SessionID.h>
 
-#if ENABLE(NETWORK_PROCESS)
-
 namespace IPC {
     class ArgumentDecoder;
     class ArgumentEncoder;
@@ -68,6 +66,4 @@ public:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // NetworkResourceLoadParameters_h
index 4ffd11b..b007584 100644 (file)
@@ -32,9 +32,7 @@ namespace WebKit {
 
 String executablePathOfWebProcess();
 String executablePathOfPluginProcess();
-#if ENABLE(NETWORK_PROCESS)
 String executablePathOfNetworkProcess();
-#endif
 #if ENABLE(DATABASE_PROCESS)
 String executablePathOfDatabaseProcess();
 #endif
index 1e631a0..22642ad 100644 (file)
@@ -43,9 +43,7 @@ WebProcessCreationParameters::WebProcessCreationParameters()
     , shouldEnableJIT(false)
     , shouldEnableFTLJIT(false)
 #endif
-#if ENABLE(NETWORK_PROCESS)
     , usesNetworkProcess(false)
-#endif
     , memoryCacheDisabled(false)
 #if ENABLE(SERVICE_CONTROLS)
     , hasImageServices(false)
@@ -133,9 +131,7 @@ void WebProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
     encoder << notificationPermissions;
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
     encoder << usesNetworkProcess;
-#endif
 
     encoder << plugInAutoStartOriginHashes;
     encoder << plugInAutoStartOrigins;
@@ -291,10 +287,8 @@ bool WebProcessCreationParameters::decode(IPC::ArgumentDecoder& decoder, WebProc
         return false;
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
     if (!decoder.decode(parameters.usesNetworkProcess))
         return false;
-#endif
 
     if (!decoder.decode(parameters.plugInAutoStartOriginHashes))
         return false;
index b838a97..0f68fe5 100644 (file)
@@ -154,9 +154,7 @@ struct WebProcessCreationParameters {
     HashMap<String, bool> notificationPermissions;
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
     bool usesNetworkProcess;
-#endif
 
     HashMap<WebCore::SessionID, HashMap<unsigned, double>> plugInAutoStartOriginHashes;
     Vector<String> plugInAutoStartOrigins;
index 3d53604..e5350fe 100644 (file)
@@ -81,14 +81,12 @@ String executablePathOfPluginProcess()
     return webKitPluginProcessName;
 }
 
-#if ENABLE(NETWORK_PROCESS)
 String executablePathOfNetworkProcess()
 {
     static NeverDestroyed<const String> webKitNetworkProcessName(findProcessPath(NETWORKPROCESSNAME));
 
     return webKitNetworkProcessName;
 }
-#endif
 
 #if ENABLE(DATABASE_PROCESS)
 String executablePathOfDatabaseProcess()
index 91fc580..22f705b 100644 (file)
@@ -79,12 +79,10 @@ String executablePathOfPluginProcess()
     return findWebKitProcess("WebKitPluginProcess");
 }
 
-#if ENABLE(NETWORK_PROCESS)
 String executablePathOfNetworkProcess()
 {
     return findWebKitProcess("WebKitNetworkProcess");
 }
-#endif
 
 #if ENABLE(DATABASE_PROCESS)
 String executablePathOfDatabaseProcess()
index ab34224..55ec761 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef CookieStorageShim_h
 #define CookieStorageShim_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include <wtf/Noncopyable.h>
 #include <wtf/NeverDestroyed.h>
 
@@ -49,6 +47,4 @@ private:
 
 }
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // CookieStorageShim_h
index 043d656..7011763 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "CookieStorageShim.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "CookieStorageShimLibrary.h"
 #include "NetworkConnectionToWebProcess.h"
 #include "NetworkProcessConnection.h"
@@ -135,5 +133,3 @@ using CompletionHandlerBlock = void(^)(CFDictionaryRef);
 }
 
 @end
-
-#endif // ENABLE(NETWORK_PROCESS)
index 677db27..df7f896 100644 (file)
@@ -26,7 +26,7 @@
 #include "config.h"
 #include "CookieStorageShimLibrary.h"
 
-#if ENABLE(NETWORK_PROCESS) && !PLATFORM(IOS)
+#if !PLATFORM(IOS)
 
 #include <WebCore/DynamicLinkerInterposing.h>
 
@@ -90,4 +90,4 @@ void WebKitCookieStorageShimInitialize(const CookieStorageShimCallbacks& callbac
     
 }
 
-#endif // ENABLE(NETWORK_PROCESS) && !PLATFORM(IOS)
+#endif // !PLATFORM(IOS)
index 3108e0a..7747fc9 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef CookieStorageShimLibrary_h
 #define CookieStorageShimLibrary_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 typedef struct OpaqueCFHTTPCookieStorage*  CFHTTPCookieStorageRef;
 
 namespace WebKit {
@@ -40,6 +38,4 @@ typedef void (*CookieStorageShimInitializeFunc)(const CookieStorageShimCallbacks
 
 }
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // CookieStorageShimLibrary_h
index a296e76..61553b1 100644 (file)
 #include "config.h"
 #include "APISession.h"
 
-#include <wtf/RunLoop.h>
-
-#if ENABLE(NETWORK_PROCESS)
 #include "NetworkProcessMessages.h"
 #include "WebProcessPool.h"
-#endif
+#include <wtf/RunLoop.h>
 
 namespace API {
 
@@ -80,12 +77,10 @@ WebCore::SessionID Session::getID() const
 
 Session::~Session()
 {
-#if ENABLE(NETWORK_PROCESS)
     if (m_sessionID.isEphemeral()) {
         for (auto& processPool : WebKit::WebProcessPool::allProcessPools())
             processPool->sendToNetworkingProcess(Messages::NetworkProcess::DestroyPrivateBrowsingSession(m_sessionID));
     }
-#endif
 }
 
 } // namespace API
index 9a28dab..43a2362 100644 (file)
@@ -166,10 +166,5 @@ bool WKContextShouldSuggestBlockWebGL()
 
 pid_t WKContextGetNetworkProcessIdentifier(WKContextRef contextRef)
 {
-#if ENABLE(NETWORK_PROCESS)
     return toImpl(contextRef)->networkProcessIdentifier();
-#else
-    UNUSED_PARAM(contextRef);
-    return 0;
-#endif
 }
index 8570350..69719d7 100644 (file)
@@ -570,29 +570,18 @@ void ewk_context_message_from_extensions_callback_set(Ewk_Context* ewkContext, E
 
 Eina_Bool ewk_context_process_model_set(Ewk_Context* ewkContext, Ewk_Process_Model processModel)
 {
-#if ENABLE(NETWORK_PROCESS)
     EWK_OBJ_GET_IMPL_OR_RETURN(EwkContext, ewkContext, impl, false);
 
     impl->setProcessModel(processModel);
 
     return true;
-#else
-    UNUSED_PARAM(ewkContext);
-    UNUSED_PARAM(processModel);
-    return false;
-#endif
 }
 
 Ewk_Process_Model ewk_context_process_model_get(const Ewk_Context* ewkContext)
 {
-#if ENABLE(NETWORK_PROCESS)
     EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, EWK_PROCESS_MODEL_SHARED_SECONDARY);
 
     return impl->processModel();
-#else
-    UNUSED_PARAM(ewkContext);
-    return EWK_PROCESS_MODEL_SHARED_SECONDARY;
-#endif
 }
 
 Ewk_TLS_Error_Policy ewk_context_tls_error_policy_get(const Ewk_Context* context)
index fd1083f..8013460 100644 (file)
@@ -26,6 +26,8 @@
 #import "config.h"
 #import "WebProcessPool.h"
 
+#import "NetworkProcessCreationParameters.h"
+#import "NetworkProcessProxy.h"
 #import "PluginProcessManager.h"
 #import "SandboxUtilities.h"
 #import "TextChecker.h"
 #import <WebCore/RuntimeApplicationChecks.h>
 #import <sys/param.h>
 
-#if ENABLE(NETWORK_PROCESS)
-#import "NetworkProcessCreationParameters.h"
-#import "NetworkProcessProxy.h"
-#endif
-
 #if PLATFORM(IOS)
 #import "ArgumentCodersCF.h"
 #import "WebMemoryPressureHandlerIOS.h"
@@ -76,10 +73,8 @@ static NSString *WebKitApplicationDidChangeAccessibilityEnhancedUserInterfaceNot
 // FIXME: <rdar://problem/9138817> - After this "backwards compatibility" radar is removed, this code should be removed to only return an empty String.
 NSString *WebIconDatabaseDirectoryDefaultsKey = @"WebIconDatabaseDirectoryDefaultsKey";
 
-#if ENABLE(NETWORK_PROCESS)
 static NSString * const WebKit2HTTPProxyDefaultsKey = @"WebKit2HTTPProxy";
 static NSString * const WebKit2HTTPSProxyDefaultsKey = @"WebKit2HTTPSProxy";
-#endif
 
 #if ENABLE(NETWORK_CACHE)
 static NSString * const WebKitNetworkCacheEnabledDefaultsKey = @"WebKitNetworkCacheEnabled";
@@ -119,10 +114,8 @@ static void registerUserDefaultsIfNeeded()
 
 void WebProcessPool::updateProcessSuppressionState()
 {
-#if ENABLE(NETWORK_PROCESS)
     if (usesNetworkProcess() && m_networkProcess)
         m_networkProcess->setProcessSuppressionEnabled(processSuppressionEnabled());
-#endif
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
     if (!m_processSuppressionDisabledForPageCounter.value())
@@ -197,14 +190,10 @@ void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters&
 
     parameters.uiProcessBundleIdentifier = String([[NSBundle mainBundle] bundleIdentifier]);
 
-#if ENABLE(NETWORK_PROCESS)
     if (!usesNetworkProcess()) {
-#endif
         for (const auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
             parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
-#if ENABLE(NETWORK_PROCESS)
     }
-#endif
 
     parameters.fontWhitelist = m_fontWhitelist;
 
@@ -236,7 +225,6 @@ void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters&
 #endif
 }
 
-#if ENABLE(NETWORK_PROCESS)
 void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters)
 {
     NSURLCache *urlCache = [NSURLCache sharedURLCache];
@@ -271,7 +259,6 @@ void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationPara
     parameters.uiProcessCookieStorageIdentifier.append(CFDataGetBytePtr(cookieStorageData.get()), CFDataGetLength(cookieStorageData.get()));
 #endif
 }
-#endif
 
 void WebProcessPool::platformInvalidateContext()
 {
index e505d04..27d709a 100644 (file)
 #include "AuthenticationChallengeProxy.h"
 #include "DataReference.h"
 #include "DownloadProxyMap.h"
+#include "NetworkProcessMessages.h"
+#include "NetworkProcessProxy.h"
 #include "WebProcessMessages.h"
 #include "WebProcessPool.h"
 #include <wtf/text/CString.h>
 #include <wtf/text/WTFString.h>
 
-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessMessages.h"
-#include "NetworkProcessProxy.h"
-#endif
-
 using namespace WebCore;
 
 namespace WebKit {
@@ -74,13 +71,11 @@ void DownloadProxy::cancel()
     if (!m_processPool)
         return;
 
-#if ENABLE(NETWORK_PROCESS)
     if (m_processPool->usesNetworkProcess()) {
         if (NetworkProcessProxy* networkProcess = m_processPool->networkProcess())
             networkProcess->connection()->send(Messages::NetworkProcess::CancelDownload(m_downloadID), 0);
         return;
     }
-#endif
 
     m_processPool->sendToAllProcesses(Messages::WebProcess::CancelDownload(m_downloadID));
 }
index 76ea71f..2e79851 100644 (file)
@@ -84,10 +84,8 @@ const char* ProcessLauncher::processTypeAsString(ProcessType processType)
     case PluginProcess:
         return "pluginprocess";
 #endif
-#if ENABLE(NETWORK_PROCESS)
     case NetworkProcess:
         return "networkprocess";
-#endif
 #if ENABLE(DATABASE_PROCESS)
     case DatabaseProcess:
         return "databaseprocess";
@@ -112,12 +110,10 @@ bool ProcessLauncher::getProcessTypeFromString(const char* string, ProcessType&
     }
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
     if (!strcmp(string, "networkprocess")) {
         processType = NetworkProcess;
         return true;
     }
-#endif
 
 #if ENABLE(DATABASE_PROCESS)
     if (!strcmp(string, "databaseprocess")) {
index fe7da8e..200dbae 100644 (file)
@@ -50,9 +50,7 @@ public:
 #if ENABLE(NETSCAPE_PLUGIN_API)
         PluginProcess,
 #endif
-#if ENABLE(NETWORK_PROCESS)
         NetworkProcess,
-#endif
 #if ENABLE(DATABASE_PROCESS)
         DatabaseProcess,
 #endif
index 4c601d2..e2a6096 100644 (file)
@@ -114,11 +114,9 @@ void ProcessLauncher::launchProcess()
         pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
         break;
 #endif
-#if ENABLE(NETWORK_PROCESS)
     case NetworkProcess:
         executablePath = executablePathOfNetworkProcess();
         break;
-#endif
 #if ENABLE(DATABASE_PROCESS)
     case DatabaseProcess:
         executablePath = executablePathOfDatabaseProcess();
index 9d416a8..435b137 100644 (file)
@@ -76,11 +76,9 @@ void ProcessLauncher::launchProcess()
         realPluginPath = fileSystemRepresentation(pluginPath);
         break;
 #endif
-#if ENABLE(NETWORK_PROCESS)
     case NetworkProcess:
         executablePath = executablePathOfNetworkProcess();
         break;
-#endif
 #if ENABLE(DATABASE_PROCESS)
     case DatabaseProcess:
         executablePath = executablePathOfDatabaseProcess();
index 4536848..6cc61b3 100644 (file)
@@ -105,14 +105,12 @@ static RetainPtr<NSString> computeProcessShimPath(const ProcessLauncher::LaunchO
     }
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
     if (launchOptions.processType == ProcessLauncher::NetworkProcess) {
         NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
         NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
 
         return [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"SecItemShim.dylib"];
     }
-#endif
 
     if (launchOptions.processType == ProcessLauncher::WebProcess) {
         NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"WebProcess.app"];
@@ -167,12 +165,10 @@ static const char* serviceName(const ProcessLauncher::LaunchOptions& launchOptio
         if (forDevelopment)
             return "com.apple.WebKit.WebContent.Development";
         return "com.apple.WebKit.WebContent";
-#if ENABLE(NETWORK_PROCESS)
     case ProcessLauncher::NetworkProcess:
         if (forDevelopment)
             return "com.apple.WebKit.Networking.Development";
         return "com.apple.WebKit.Networking";
-#endif
 #if ENABLE(DATABASE_PROCESS)
     case ProcessLauncher::DatabaseProcess:
         if (forDevelopment)
@@ -206,12 +202,9 @@ static bool shouldLeakBoost(const ProcessLauncher::LaunchOptions& launchOptions)
     // On iOS, leak a boost onto all child processes
     UNUSED_PARAM(launchOptions);
     return true;
-#elif ENABLE(NETWORK_PROCESS)
+#else
     // On Mac, leak a boost onto the NetworkProcess.
     return launchOptions.processType == ProcessLauncher::NetworkProcess;
-#else
-    UNUSED_PARAM(launchOptions);
-    return false;
 #endif
 }
     
@@ -483,11 +476,9 @@ static void createProcess(const ProcessLauncher::LaunchOptions& launchOptions, b
         processPath = [webKitBundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
         break;
 #endif
-#if ENABLE(NETWORK_PROCESS)
     case ProcessLauncher::NetworkProcess:
         processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
         break;
-#endif
 #if ENABLE(DATABASE_PROCESS)
     case ProcessLauncher::DatabaseProcess:
         processPath = [webKitBundle pathForAuxiliaryExecutable:@"DatabaseProcess.app"];
index 969867e..1aed5a1 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "NetworkProcessProxy.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "AuthenticationChallengeProxy.h"
 #include "CustomProtocolManagerProxyMessages.h"
 #include "DownloadProxyMessages.h"
@@ -377,5 +375,3 @@ void NetworkProcessProxy::setIsHoldingLockedFiles(bool isHoldingLockedFiles)
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index 364fc2f..bbdd7fb 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef NetworkProcessProxy_h
 #define NetworkProcessProxy_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "ChildProcessProxy.h"
 #include "CustomProtocolManagerProxy.h"
 #include "ProcessLauncher.h"
@@ -132,6 +130,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // NetworkProcessProxy_h
index ad3de35..dc93b84 100644 (file)
@@ -20,8 +20,6 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#if ENABLE(NETWORK_PROCESS)
-
 messages -> NetworkProcessProxy LegacyReceiver {
     DidCreateNetworkConnectionToWebProcess(IPC::Attachment connectionIdentifier)
 
@@ -39,5 +37,3 @@ messages -> NetworkProcessProxy LegacyReceiver {
     LogSampledDiagnosticMessageWithResult(uint64_t pageID, String message, String description, uint32_t result)
     LogSampledDiagnosticMessageWithValue(uint64_t pageID, String message, String description, String value)
 }
-
-#endif // ENABLE(NETWORK_PROCESS)
index b0df1b8..19f7225 100644 (file)
@@ -28,8 +28,6 @@
 
 #import "NetworkProcessMessages.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 using namespace WebCore;
 
 namespace WebKit {
@@ -59,5 +57,3 @@ void NetworkProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOption
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index 1bdf0ed..f0134bd 100644 (file)
@@ -24,7 +24,6 @@
  */
 
 #include "config.h"
-#if ENABLE(NETWORK_PROCESS)
 
 #include "NetworkProcessProxy.h"
 #include <glib.h>
@@ -43,5 +42,3 @@ void NetworkProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOption
 }
 
 }
-
-#endif // ENABLE(NETWORK_PROCESS)
index 12012fd..8c6194e 100644 (file)
@@ -163,10 +163,8 @@ void WebCookieManagerProxy::setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy pol
     // - When testing, we only have one WebProcess and one NetworkProcess, and WebKitTestRunner never restarts them;
     // - When not testing, Cocoa has the policy persisted, and thus new processes use it (even for ephemeral sessions).
     processPool()->sendToAllProcesses(Messages::WebCookieManager::SetHTTPCookieAcceptPolicy(policy));
-#if ENABLE(NETWORK_PROCESS)
     if (processPool()->usesNetworkProcess())
         processPool()->sendToNetworkingProcess(Messages::WebCookieManager::SetHTTPCookieAcceptPolicy(policy));
-#endif
 }
 
 void WebCookieManagerProxy::getHTTPCookieAcceptPolicy(std::function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)> callbackFunction)
index 4531639..70d8989 100644 (file)
@@ -60,6 +60,7 @@
 #include "NativeWebMouseEvent.h"
 #include "NativeWebWheelEvent.h"
 #include "NavigationActionData.h"
+#include "NetworkProcessMessages.h"
 #include "NotificationPermissionRequest.h"
 #include "NotificationPermissionRequestManager.h"
 #include "PageClient.h"
 #include <wtf/RefCountedLeakCounter.h>
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessMessages.h"
-#endif
-
 #if PLATFORM(COCOA)
 #include "RemoteLayerTreeDrawingAreaProxy.h"
 #include "RemoteLayerTreeScrollingPerformanceData.h"
@@ -487,10 +484,8 @@ WebPageProxy::WebPageProxy(PageClient& pageClient, WebProcessProxy& process, uin
 
     m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID, *this);
 
-#if ENABLE(NETWORK_PROCESS)
     if (m_sessionID.isEphemeral())
         m_process->processPool().sendToNetworkingProcess(Messages::NetworkProcess::EnsurePrivateBrowsingSession(m_sessionID));
-#endif
 
 #if PLATFORM(COCOA)
     const CFIndex viewStateChangeRunLoopOrder = (CFIndex)RunLoopObserver::WellKnownRunLoopOrders::CoreAnimationCommit - 1;
@@ -774,10 +769,8 @@ void WebPageProxy::setSessionID(SessionID sessionID)
     m_sessionID = sessionID;
     m_process->send(Messages::WebPage::SetSessionID(sessionID), m_pageID);
 
-#if ENABLE(NETWORK_PROCESS)
     if (sessionID.isEphemeral())
         m_process->processPool().sendToNetworkingProcess(Messages::NetworkProcess::EnsurePrivateBrowsingSession(sessionID));
-#endif
 }
 
 void WebPageProxy::initializeWebPage()
index 96bf429..9c25bc1 100644 (file)
@@ -35,6 +35,9 @@
 #include "DownloadProxy.h"
 #include "DownloadProxyMessages.h"
 #include "Logging.h"
+#include "NetworkProcessCreationParameters.h"
+#include "NetworkProcessMessages.h"
+#include "NetworkProcessProxy.h"
 #include "SandboxExtension.h"
 #include "StatisticsData.h"
 #include "TextChecker.h"
 #include "DatabaseProcessMessages.h"
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessCreationParameters.h"
-#include "NetworkProcessMessages.h"
-#include "NetworkProcessProxy.h"
-#endif
-
 #if ENABLE(SERVICE_CONTROLS)
 #include "ServicesController.h"
 #endif
@@ -159,10 +156,8 @@ WebProcessPool::WebProcessPool(API::ProcessPoolConfiguration& configuration)
 #endif
     , m_shouldUseTestingNetworkSession(false)
     , m_processTerminationEnabled(true)
-#if ENABLE(NETWORK_PROCESS)
     , m_canHandleHTTPSServerTrustEvaluation(true)
     , m_didNetworkProcessCrash(false)
-#endif
 #if USE(SOUP)
     , m_ignoreTLSErrors(true)
 #endif
@@ -254,10 +249,8 @@ WebProcessPool::~WebProcessPool()
     processPoolCounter.decrement();
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
     if (m_networkProcess)
         m_networkProcess->shutDownProcess();
-#endif
 }
 
 void WebProcessPool::initializeClient(const WKContextClientBase* client)
@@ -315,18 +308,12 @@ IPC::Connection* WebProcessPool::networkingProcessConnection()
 {
     switch (processModel()) {
     case ProcessModelSharedSecondaryProcess:
-#if ENABLE(NETWORK_PROCESS)
         if (usesNetworkProcess())
             return m_networkProcess->connection();
-#endif
         return m_processes[0]->connection();
     case ProcessModelMultipleSecondaryProcesses:
-#if ENABLE(NETWORK_PROCESS)
         ASSERT(usesNetworkProcess());
         return m_networkProcess->connection();
-#else
-        break;
-#endif
     }
     ASSERT_NOT_REACHED();
     return 0;
@@ -340,7 +327,7 @@ void WebProcessPool::languageChanged(void* context)
 void WebProcessPool::languageChanged()
 {
     sendToAllProcesses(Messages::WebProcess::UserPreferredLanguagesChanged(userPreferredLanguages()));
-#if USE(SOUP) && ENABLE(NETWORK_PROCESS)
+#if USE(SOUP)
     if (usesNetworkProcess() && m_networkProcess)
         m_networkProcess->send(Messages::NetworkProcess::UserPreferredLanguagesChanged(userPreferredLanguages()), 0);
 #endif
@@ -358,23 +345,14 @@ void WebProcessPool::textCheckerStateChanged()
 
 void WebProcessPool::setUsesNetworkProcess(bool usesNetworkProcess)
 {
-#if ENABLE(NETWORK_PROCESS)
     m_configuration->setUseNetworkProcess(usesNetworkProcess);
-#else
-    UNUSED_PARAM(usesNetworkProcess);
-#endif
 }
 
 bool WebProcessPool::usesNetworkProcess() const
 {
-#if ENABLE(NETWORK_PROCESS)
     return m_configuration->useNetworkProcess();
-#else
-    return false;
-#endif
 }
 
-#if ENABLE(NETWORK_PROCESS)
 NetworkProcessProxy& WebProcessPool::ensureNetworkProcess()
 {
     if (m_networkProcess)
@@ -459,7 +437,6 @@ void WebProcessPool::getNetworkProcessConnection(PassRefPtr<Messages::WebProcess
 
     m_networkProcess->getNetworkProcessConnection(reply);
 }
-#endif
 
 #if ENABLE(DATABASE_PROCESS)
 void WebProcessPool::ensureDatabaseProcess()
@@ -527,14 +504,12 @@ void WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled(bool private
 {
     m_iconDatabase->setPrivateBrowsingEnabled(privateBrowsingEnabled);
 
-#if ENABLE(NETWORK_PROCESS)
     if (usesNetworkProcess() && networkProcess()) {
         if (privateBrowsingEnabled)
             networkProcess()->send(Messages::NetworkProcess::EnsurePrivateBrowsingSession(SessionID::legacyPrivateSessionID()), 0);
         else
             networkProcess()->send(Messages::NetworkProcess::DestroyPrivateBrowsingSession(SessionID::legacyPrivateSessionID()), 0);
     }
-#endif // ENABLED(NETWORK_PROCESS)
 
     if (privateBrowsingEnabled)
         sendToAllProcesses(Messages::WebProcess::EnsurePrivateBrowsingSession(SessionID::legacyPrivateSessionID()));
@@ -579,10 +554,8 @@ WebProcessProxy& WebProcessPool::ensureSharedWebProcess()
 
 WebProcessProxy& WebProcessPool::createNewWebProcess()
 {
-#if ENABLE(NETWORK_PROCESS)
     if (usesNetworkProcess())
         ensureNetworkProcess();
-#endif
 
     Ref<WebProcessProxy> process = WebProcessProxy::create(*this);
 
@@ -659,9 +632,7 @@ WebProcessProxy& WebProcessPool::createNewWebProcess()
     supplement<WebNotificationManagerProxy>()->populateCopyOfNotificationPermissions(parameters.notificationPermissions);
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
     parameters.usesNetworkProcess = usesNetworkProcess();
-#endif
 
     parameters.plugInAutoStartOriginHashes = m_plugInAutoStartProvider.autoStartOriginHashesCopy();
     copyToVector(m_plugInAutoStartProvider.autoStartOrigins(), parameters.plugInAutoStartOrigins);
@@ -873,13 +844,11 @@ DownloadProxy* WebProcessPool::download(WebPageProxy* initiatingPage, const Reso
     uint64_t initiatingPageID = initiatingPage ? initiatingPage->pageID() : 0;
     SessionID sessionID = initiatingPage ? initiatingPage->sessionID() : SessionID::defaultSessionID();
 
-#if ENABLE(NETWORK_PROCESS)
     if (usesNetworkProcess() && networkProcess()) {
         // FIXME (NetworkProcess): Replicate whatever FrameLoader::setOriginalURLForDownloadRequest does with the request here.
         networkProcess()->send(Messages::NetworkProcess::DownloadRequest(sessionID, downloadProxy->downloadID(), request), 0);
         return downloadProxy;
     }
-#endif
 
     m_processes[0]->send(Messages::WebProcess::DownloadRequest(sessionID, downloadProxy->downloadID(), initiatingPageID, request), 0);
     return downloadProxy;
@@ -893,12 +862,10 @@ DownloadProxy* WebProcessPool::resumeDownload(const API::Data* resumeData, const
     if (!path.isEmpty())
         SandboxExtension::createHandle(path, SandboxExtension::ReadWrite, sandboxExtensionHandle);
 
-#if ENABLE(NETWORK_PROCESS)
     if (usesNetworkProcess() && networkProcess()) {
         networkProcess()->send(Messages::NetworkProcess::ResumeDownload(downloadProxy->downloadID(), resumeData->dataReference(), path, sandboxExtensionHandle), 0);
         return downloadProxy;
     }
-#endif
 
     m_processes[0]->send(Messages::WebProcess::ResumeDownload(downloadProxy->downloadID(), resumeData->dataReference(), path, sandboxExtensionHandle), 0);
     return downloadProxy;
@@ -940,7 +907,6 @@ void WebProcessPool::setAdditionalPluginsDirectory(const String& directory)
 }
 #endif // ENABLE(NETSCAPE_PLUGIN_API)
 
-#if ENABLE(NETWORK_PROCESS)
 PlatformProcessIdentifier WebProcessPool::networkProcessIdentifier()
 {
     if (!m_networkProcess)
@@ -948,7 +914,6 @@ PlatformProcessIdentifier WebProcessPool::networkProcessIdentifier()
 
     return m_networkProcess->processIdentifier();
 }
-#endif
 
 void WebProcessPool::setAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)
 {
@@ -988,15 +953,11 @@ void WebProcessPool::setDomainRelaxationForbiddenForURLScheme(const String& urlS
 
 void WebProcessPool::setCanHandleHTTPSServerTrustEvaluation(bool value)
 {
-#if ENABLE(NETWORK_PROCESS)
     m_canHandleHTTPSServerTrustEvaluation = value;
     if (usesNetworkProcess() && m_networkProcess) {
         m_networkProcess->send(Messages::NetworkProcess::SetCanHandleHTTPSServerTrustEvaluation(value), 0);
         return;
     }
-#else
-    UNUSED_PARAM(value);
-#endif
 }
 
 void WebProcessPool::registerURLSchemeAsLocal(const String& urlScheme)
@@ -1064,10 +1025,8 @@ void WebProcessPool::setCacheModel(CacheModel cacheModel)
     m_configuration->setCacheModel(cacheModel);
     sendToAllProcesses(Messages::WebProcess::SetCacheModel(cacheModel));
 
-#if ENABLE(NETWORK_PROCESS)
     if (usesNetworkProcess() && m_networkProcess)
         m_networkProcess->send(Messages::NetworkProcess::SetCacheModel(cacheModel), 0);
-#endif
 }
 
 void WebProcessPool::setDefaultRequestTimeoutInterval(double timeoutInterval)
@@ -1077,13 +1036,11 @@ void WebProcessPool::setDefaultRequestTimeoutInterval(double timeoutInterval)
 
 DownloadProxy* WebProcessPool::createDownloadProxy(const ResourceRequest& request)
 {
-#if ENABLE(NETWORK_PROCESS)
     if (usesNetworkProcess()) {
         ensureNetworkProcess();
         ASSERT(m_networkProcess);
         return m_networkProcess->createDownloadProxy(request);
     }
-#endif
 
     return ensureSharedWebProcess().createDownloadProxy(request);
 }
@@ -1182,12 +1139,10 @@ String WebProcessPool::cookieStorageDirectory() const
 void WebProcessPool::useTestingNetworkSession()
 {
     ASSERT(m_processes.isEmpty());
-#if ENABLE(NETWORK_PROCESS)
     ASSERT(!m_networkProcess);
 
     if (m_networkProcess)
         return;
-#endif
 
     if (!m_processes.isEmpty())
         return;
@@ -1197,12 +1152,10 @@ void WebProcessPool::useTestingNetworkSession()
 
 void WebProcessPool::allowSpecificHTTPSCertificateForHost(const WebCertificateInfo* certificate, const String& host)
 {
-#if ENABLE(NETWORK_PROCESS)
     if (usesNetworkProcess() && m_networkProcess) {
         m_networkProcess->send(Messages::NetworkProcess::AllowSpecificHTTPSCertificateForHost(certificate->certificateInfo(), host), 0);
         return;
     }
-#endif
 
 #if USE(SOUP)
     m_processes[0]->send(Messages::WebProcess::AllowSpecificHTTPSCertificateForHost(certificate->certificateInfo(), host), 0);
@@ -1268,25 +1221,14 @@ void WebProcessPool::requestWebContentStatistics(StatisticsRequest* request)
 
 void WebProcessPool::requestNetworkingStatistics(StatisticsRequest* request)
 {
-    bool networkProcessUnavailable;
-#if ENABLE(NETWORK_PROCESS)
-    networkProcessUnavailable = !usesNetworkProcess() || !m_networkProcess;
-#else
-    networkProcessUnavailable = true;
-#endif
-
-    if (networkProcessUnavailable) {
+    if (!usesNetworkProcess() || !m_networkProcess) {
         LOG_ERROR("Attempt to get NetworkProcess statistics but the NetworkProcess is unavailable");
         return;
     }
 
-#if ENABLE(NETWORK_PROCESS)
     uint64_t requestID = request->addOutstandingRequest();
     m_statisticsRequests.set(requestID, request);
     m_networkProcess->send(Messages::NetworkProcess::GetNetworkProcessStatistics(requestID), 0);
-#else
-    UNUSED_PARAM(request);
-#endif
 }
 
 void WebProcessPool::handleMessage(IPC::Connection& connection, const String& messageName, const WebKit::UserData& messageBody)
index cff06f1..5c14978 100644 (file)
@@ -34,6 +34,7 @@
 #include "GenericCallback.h"
 #include "MessageReceiver.h"
 #include "MessageReceiverMap.h"
+#include "NetworkProcessProxy.h"
 #include "PlugInAutoStartProvider.h"
 #include "PluginInfoStore.h"
 #include "ProcessModel.h"
 #include "DatabaseProcessProxy.h"
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessProxy.h"
-#endif
-
 #if ENABLE(MEDIA_SESSION)
 #include "WebMediaSessionFocusManager.h"
 #endif
@@ -86,15 +83,12 @@ class WebContextSupplement;
 class WebIconDatabase;
 class WebPageGroup;
 class WebPageProxy;
+struct NetworkProcessCreationParameters;
 struct StatisticsData;
 struct WebProcessCreationParameters;
     
 typedef GenericCallback<API::Dictionary*> DictionaryCallback;
 
-#if ENABLE(NETWORK_PROCESS)
-struct NetworkProcessCreationParameters;
-#endif
-
 #if PLATFORM(COCOA)
 int networkProcessLatencyQOS();
 int networkProcessThroughputQOS();
@@ -193,9 +187,7 @@ public:
     void clearPluginClientPolicies();
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
     PlatformProcessIdentifier networkProcessIdentifier();
-#endif
 
     void setAlwaysUsesComplexTextCodePath(bool);
     void setShouldUseFontSmoothing(bool);
@@ -289,13 +281,11 @@ public:
     void setUsesNetworkProcess(bool);
     bool usesNetworkProcess() const;
 
-#if ENABLE(NETWORK_PROCESS)
     NetworkProcessProxy& ensureNetworkProcess();
     NetworkProcessProxy* networkProcess() { return m_networkProcess.get(); }
     void networkProcessCrashed(NetworkProcessProxy*);
 
     void getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>);
-#endif
 
 #if ENABLE(DATABASE_PROCESS)
     void ensureDatabaseProcess();
@@ -378,9 +368,7 @@ private:
     void requestWebContentStatistics(StatisticsRequest*);
     void requestNetworkingStatistics(StatisticsRequest*);
 
-#if ENABLE(NETWORK_PROCESS)
     void platformInitializeNetworkProcess(NetworkProcessCreationParameters&);
-#endif
 
     void handleMessage(IPC::Connection&, const String& messageName, const UserData& messageBody);
     void handleSynchronousMessage(IPC::Connection&, const String& messageName, const UserData& messageBody, UserData& returnUserData);
@@ -500,11 +488,9 @@ private:
 
     bool m_processTerminationEnabled;
 
-#if ENABLE(NETWORK_PROCESS)
     bool m_canHandleHTTPSServerTrustEvaluation;
     bool m_didNetworkProcessCrash;
     RefPtr<NetworkProcessProxy> m_networkProcess;
-#endif
 
 #if ENABLE(DATABASE_PROCESS)
     RefPtr<DatabaseProcessProxy> m_databaseProcess;
@@ -541,24 +527,18 @@ void WebProcessPool::sendToNetworkingProcess(T&& message)
 {
     switch (processModel()) {
     case ProcessModelSharedSecondaryProcess:
-#if ENABLE(NETWORK_PROCESS)
         if (usesNetworkProcess()) {
             if (m_networkProcess && m_networkProcess->canSendMessage())
                 m_networkProcess->send(std::forward<T>(message), 0);
             return;
         }
-#endif
         if (!m_processes.isEmpty() && m_processes[0]->canSendMessage())
             m_processes[0]->send(std::forward<T>(message), 0);
         return;
     case ProcessModelMultipleSecondaryProcesses:
-#if ENABLE(NETWORK_PROCESS)
         if (m_networkProcess && m_networkProcess->canSendMessage())
             m_networkProcess->send(std::forward<T>(message), 0);
         return;
-#else
-        break;
-#endif
     }
     ASSERT_NOT_REACHED();
 }
@@ -568,24 +548,18 @@ void WebProcessPool::sendToNetworkingProcessRelaunchingIfNecessary(T&& message)
 {
     switch (processModel()) {
     case ProcessModelSharedSecondaryProcess:
-#if ENABLE(NETWORK_PROCESS)
         if (usesNetworkProcess()) {
             ensureNetworkProcess();
             m_networkProcess->send(std::forward<T>(message), 0);
             return;
         }
-#endif
         ensureSharedWebProcess();
         m_processes[0]->send(std::forward<T>(message), 0);
         return;
     case ProcessModelMultipleSecondaryProcesses:
-#if ENABLE(NETWORK_PROCESS)
         ensureNetworkProcess();
         m_networkProcess->send(std::forward<T>(message), 0);
         return;
-#else
-        break;
-#endif
     }
     ASSERT_NOT_REACHED();
 }
index 1912cda..0b8c29e 100644 (file)
@@ -427,12 +427,10 @@ void WebProcessProxy::getPluginProcessConnection(uint64_t pluginProcessToken, Pa
 }
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
 void WebProcessProxy::getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply)
 {
     m_processPool->getNetworkProcessConnection(reply);
 }
-#endif // ENABLE(NETWORK_PROCESS)
 
 #if ENABLE(DATABASE_PROCESS)
 void WebProcessProxy::getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply> reply)
@@ -704,9 +702,7 @@ void WebProcessProxy::updateTextCheckerState()
 
 DownloadProxy* WebProcessProxy::createDownloadProxy(const ResourceRequest& request)
 {
-#if ENABLE(NETWORK_PROCESS)
     ASSERT(!m_processPool->usesNetworkProcess());
-#endif
 
     if (!m_downloadProxyMap)
         m_downloadProxyMap = std::make_unique<DownloadProxyMap>(this);
@@ -947,7 +943,6 @@ void WebProcessProxy::didCancelProcessSuspension()
     m_throttler.didCancelProcessSuspension();
 }
 
-#if ENABLE(NETWORK_PROCESS)
 void WebProcessProxy::reinstateNetworkProcessAssertionState(NetworkProcessProxy& newNetworkProcessProxy)
 {
 #if PLATFORM(IOS)
@@ -962,11 +957,10 @@ void WebProcessProxy::reinstateNetworkProcessAssertionState(NetworkProcessProxy&
     UNUSED_PARAM(newNetworkProcessProxy);
 #endif
 }
-#endif
 
 void WebProcessProxy::didSetAssertionState(AssertionState state)
 {
-#if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
+#if PLATFORM(IOS)
     ASSERT(!m_backgroundTokenForNetworkProcess || !m_foregroundTokenForNetworkProcess);
 
     switch (state) {
index cc3eceb..5ab438b 100644 (file)
@@ -152,9 +152,7 @@ public:
 
     ProcessThrottler& throttler() { return m_throttler; }
 
-#if ENABLE(NETWORK_PROCESS)
     void reinstateNetworkProcessAssertionState(NetworkProcessProxy&);
-#endif
 
 private:
     explicit WebProcessProxy(WebProcessPool&);
@@ -186,9 +184,7 @@ private:
 #if ENABLE(NETSCAPE_PLUGIN_API)
     void getPluginProcessConnection(uint64_t pluginProcessToken, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);
 #endif
-#if ENABLE(NETWORK_PROCESS)
     void getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>);
-#endif
 #if ENABLE(DATABASE_PROCESS)
     void getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>);
 #endif
@@ -253,7 +249,7 @@ private:
     int m_numberOfTimesSuddenTerminationWasDisabled;
     ProcessThrottler m_throttler;
     ProcessThrottler::BackgroundActivityToken m_tokenForHoldingLockedFiles;
-#if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
+#if PLATFORM(IOS)
     ProcessThrottler::ForegroundActivityToken m_foregroundTokenForNetworkProcess;
     ProcessThrottler::BackgroundActivityToken m_backgroundTokenForNetworkProcess;
 #endif
index 74509e0..21dbfd4 100644 (file)
@@ -38,9 +38,7 @@ messages -> WebProcessProxy LegacyReceiver {
     GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins, Vector<WebCore::PluginInfo> applicationPlugins)
     GetPluginProcessConnection(uint64_t pluginProcessToken) -> (IPC::Attachment connectionHandle, bool supportsAsynchronousInitialization) Delayed
 #endif
-#if ENABLE(NETWORK_PROCESS)
     GetNetworkProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
-#endif
 #if ENABLE(DATABASE_PROCESS)
     GetDatabaseProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
 #endif
index 5305f88..936162a 100644 (file)
@@ -94,12 +94,10 @@ WebsiteDataStore::~WebsiteDataStore()
 {
     platformDestroy();
 
-#if ENABLE(NETWORK_PROCESS)
     if (m_sessionID.isEphemeral()) {
         for (auto& processPool : WebProcessPool::allProcessPools())
             processPool->sendToNetworkingProcess(Messages::NetworkProcess::DestroyPrivateBrowsingSession(m_sessionID));
     }
-#endif
 }
 
 void WebsiteDataStore::cloneSessionData(WebPageProxy& sourcePage, WebPageProxy& newPage)
index 14a8c73..76c4379 100644 (file)
@@ -30,6 +30,7 @@
 
 #include "APIProcessPoolConfiguration.h"
 #include "Logging.h"
+#include "NetworkProcessMessages.h"
 #include "WebCookieManagerProxy.h"
 #include "WebInspectorServer.h"
 #include "WebProcessCreationParameters.h"
 #include <wtf/glib/GUniquePtr.h>
 #include <wtf/text/CString.h>
 
-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessMessages.h"
-#endif
-
 namespace WebKit {
 
 static void initInspectorServer()
@@ -149,12 +146,10 @@ String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory()
 void WebProcessPool::setIgnoreTLSErrors(bool ignoreTLSErrors)
 {
     m_ignoreTLSErrors = ignoreTLSErrors;
-#if ENABLE(NETWORK_PROCESS)
     if (usesNetworkProcess() && networkProcess()) {
         networkProcess()->send(Messages::NetworkProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors), 0);
         return;
     }
-#endif
     sendToAllProcesses(Messages::WebProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors));
 }
 
index c3db0a1..72682ed 100644 (file)
@@ -24,7 +24,6 @@
  */
 
 #include "config.h"
-#if ENABLE(NETWORK_PROCESS)
 #include "WebProcessPool.h"
 
 #include "NetworkProcessCreationParameters.h"
@@ -47,5 +46,3 @@ void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationPara
 }
 
 }
-
-#endif
index 8b21f8f..a9f1521 100644 (file)
@@ -36,8 +36,6 @@
 
 #define ENABLE_WEB_PROCESS_SANDBOX 1
 
-#define ENABLE_NETWORK_PROCESS 1
-
 #define ENABLE_DATABASE_PROCESS 1
 
 #define ENABLE_MEMORY_SAMPLER 1
@@ -59,7 +57,6 @@
 #endif
 
 #if PLATFORM(GTK)
-#define ENABLE_NETWORK_PROCESS 1
 #define ENABLE_SHAREABLE_RESOURCE 1
 #endif
 
index dace573..b408de6 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "BlobRegistryProxy.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "NetworkConnectionToWebProcessMessages.h"
 #include "NetworkProcessConnection.h"
 #include "WebCoreArgumentCoders.h"
@@ -90,5 +88,3 @@ unsigned long long BlobRegistryProxy::blobSize(const URL& url)
 }
 
 }
-
-#endif // ENABLE(NETWORK_PROCESS)
index 8cc069a..ad1a7c5 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef BlobRegistryProxy_h
 #define BlobRegistryProxy_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include <WebCore/BlobRegistry.h>
 
 namespace WebKit {
@@ -44,6 +42,4 @@ public:
 
 }
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // BlobRegistryProxy_h
index 714865d..de3e5c0 100644 (file)
@@ -37,8 +37,6 @@
 #include <WebCore/SessionID.h>
 #include <WebCore/SharedBuffer.h>
 
-#if ENABLE(NETWORK_PROCESS)
-
 using namespace WebCore;
 
 namespace WebKit {
@@ -98,5 +96,3 @@ void NetworkProcessConnection::didCacheResource(const ResourceRequest& request,
 #endif
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index 0d5ad08..cae80a3 100644 (file)
@@ -31,8 +31,6 @@
 #include <wtf/RefCounted.h>
 #include <wtf/text/WTFString.h>
 
-#if ENABLE(NETWORK_PROCESS)
-
 namespace IPC {
 class DataReference;
 }
@@ -82,7 +80,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETWORK_PROCESS)
-
-
 #endif // NetworkProcessConnection_h
index c1f78c4..c2407f2 100644 (file)
@@ -20,8 +20,6 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#if ENABLE(NETWORK_PROCESS)
-
 messages -> NetworkProcessConnection LegacyReceiver {
 
 #if ENABLE(SHAREABLE_RESOURCE)
@@ -29,5 +27,3 @@ messages -> NetworkProcessConnection LegacyReceiver {
 #endif
 
 }
-
-#endif // ENABLE(NETWORK_PROCESS)
index 6e3af30..85778a8 100644 (file)
@@ -52,8 +52,6 @@
 #include <WebCore/SubresourceLoader.h>
 #include <wtf/text/CString.h>
 
-#if ENABLE(NETWORK_PROCESS)
-
 using namespace WebCore;
 
 namespace WebKit {
@@ -286,5 +284,3 @@ void WebResourceLoadScheduler::networkProcessCrashed()
 }
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index c32309c..221e174 100644 (file)
@@ -32,8 +32,6 @@
 #include <WebCore/ResourceLoader.h>
 #include <wtf/RunLoop.h>
 
-#if ENABLE(NETWORK_PROCESS)
-
 namespace WebKit {
 
 class NetworkProcessConnection;
@@ -77,6 +75,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // WebResourceLoadScheduler_h
index 3753797..f41b779 100644 (file)
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "WebResourceLoader.h"
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "DataReference.h"
 #include "Logging.h"
 #include "NetworkProcessConnection.h"
@@ -221,5 +219,3 @@ void WebResourceLoader::canAuthenticateAgainstProtectionSpace(const ProtectionSp
 #endif
 
 } // namespace WebKit
-
-#endif // ENABLE(NETWORK_PROCESS)
index 796806e..3a62009 100644 (file)
@@ -26,8 +26,6 @@
 #ifndef WebResourceLoader_h
 #define WebResourceLoader_h
 
-#if ENABLE(NETWORK_PROCESS)
-
 #include "Connection.h"
 #include "MessageSender.h"
 #include "ShareableResource.h"
@@ -94,6 +92,4 @@ private:
 
 } // namespace WebKit
 
-#endif // ENABLE(NETWORK_PROCESS)
-
 #endif // WebResourceLoader_h
index 3994d97..67fd0d9 100644 (file)
@@ -20,8 +20,6 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#if ENABLE(NETWORK_PROCESS)
-
 messages -> WebResourceLoader LegacyReceiver {
     WillSendRequest(WebCore::ResourceRequest request, WebCore::ResourceResponse redirectResponse)
     DidSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent)
@@ -39,5 +37,3 @@ messages -> WebResourceLoader LegacyReceiver {
     DidReceiveResource(WebKit::ShareableResource::Handle resource, double finishTime)
 #endif
 }
-
-#endif // ENABLE(NETWORK_PROCESS)
index 8e84f80..cc6e74d 100644 (file)
@@ -1053,11 +1053,7 @@ static void initializeBrowserFuncs(NPNetscapeFuncs &netscapeFuncs)
     netscapeFuncs.popupcontextmenu = 0;
     netscapeFuncs.convertpoint = 0;
 #endif
-#if ENABLE(NETWORK_PROCESS)
     netscapeFuncs.urlredirectresponse = NPN_URLRedirectResponse;
-#else
-    netscapeFuncs.urlredirectresponse = 0;
-#endif
 }
     
 NPNetscapeFuncs* netscapeBrowserFuncs()
index 5f78963..bd95b43 100644 (file)
@@ -400,16 +400,12 @@ bool NetscapePlugin::getAuthenticationInfo(const ProtectionSpace& protectionSpac
 
 void NetscapePlugin::registerRedirect(NetscapePluginStream* stream, const URL& requestURL, int redirectResponseStatus, void* notificationData)
 {
-#if ENABLE(NETWORK_PROCESS)
     // NPP_URLRedirectNotify may synchronously request this stream back out, so set it first
     m_redirects.set(notificationData, std::make_pair(stream, requestURL.string()));
     if (!NPP_URLRedirectNotify(requestURL.string().utf8().data(), redirectResponseStatus, notificationData)) {
         m_redirects.take(notificationData);
         controller()->continueStreamLoad(stream->streamID());
     }
-#else
-    controller()->continueStreamLoad(stream->streamID());
-#endif
 }
 
 void NetscapePlugin::urlRedirectResponse(void* notifyData, bool allow)
index 443aceb..3eeb2e8 100644 (file)
 #include "config.h"
 #include "WebPlatformStrategies.h"
 
+#include "BlobRegistryProxy.h"
 #include "BlockingResponseMap.h"
 #include "DataReference.h"
 #include "HangDetectionDisabler.h"
+#include "NetworkConnectionToWebProcessMessages.h"
+#include "NetworkProcessConnection.h"
 #include "NetworkResourceLoadParameters.h"
 #include "PluginInfoStore.h"
 #include "SessionTracker.h"
@@ -44,6 +47,7 @@
 #include "WebPasteboardProxyMessages.h"
 #include "WebProcess.h"
 #include "WebProcessProxyMessages.h"
+#include "WebResourceLoadScheduler.h"
 #include <WebCore/Color.h>
 #include <WebCore/DocumentLoader.h>
 #include <WebCore/IDBFactoryBackendInterface.h>
 #include <WebCore/URL.h>
 #include <wtf/Atomics.h>
 
-#if ENABLE(NETWORK_PROCESS)
-#include "BlobRegistryProxy.h"
-#include "NetworkConnectionToWebProcessMessages.h"
-#include "NetworkProcessConnection.h"
-#include "WebResourceLoadScheduler.h"
-#endif
-
 using namespace WebCore;
 
 namespace WebKit {
@@ -112,7 +109,6 @@ PluginStrategy* WebPlatformStrategies::createPluginStrategy()
 
 String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
 {
-#if ENABLE(NETWORK_PROCESS)
     auto& webProcess = WebProcess::singleton();
     if (webProcess.usesNetworkProcess()) {
         String result;
@@ -120,27 +116,23 @@ String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session
             return String();
         return result;
     }
-#endif
 
     return WebCore::cookiesForDOM(session, firstParty, url);
 }
 
 void WebPlatformStrategies::setCookiesFromDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, const String& cookieString)
 {
-#if ENABLE(NETWORK_PROCESS)
     auto& webProcess = WebProcess::singleton();
     if (webProcess.usesNetworkProcess()) {
         webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetCookiesFromDOM(SessionTracker::sessionID(session), firstParty, url, cookieString), 0);
         return;
     }
-#endif
 
     WebCore::setCookiesFromDOM(session, firstParty, url, cookieString);
 }
 
 bool WebPlatformStrategies::cookiesEnabled(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
 {
-#if ENABLE(NETWORK_PROCESS)
     auto& webProcess = WebProcess::singleton();
     if (webProcess.usesNetworkProcess()) {
         bool result;
@@ -148,14 +140,12 @@ bool WebPlatformStrategies::cookiesEnabled(const NetworkStorageSession& session,
             return false;
         return result;
     }
-#endif
 
     return WebCore::cookiesEnabled(session, firstParty, url);
 }
 
 String WebPlatformStrategies::cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
 {
-#if ENABLE(NETWORK_PROCESS)
     auto& webProcess = WebProcess::singleton();
     if (webProcess.usesNetworkProcess()) {
         String result;
@@ -163,41 +153,35 @@ String WebPlatformStrategies::cookieRequestHeaderFieldValue(const NetworkStorage
             return String();
         return result;
     }
-#endif
 
     return WebCore::cookieRequestHeaderFieldValue(session, firstParty, url);
 }
 
 bool WebPlatformStrategies::getRawCookies(const NetworkStorageSession& session, const URL& firstParty, const URL& url, Vector<Cookie>& rawCookies)
 {
-#if ENABLE(NETWORK_PROCESS)
     auto& webProcess = WebProcess::singleton();
     if (webProcess.usesNetworkProcess()) {
         if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::GetRawCookies(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::GetRawCookies::Reply(rawCookies), 0))
             return false;
         return true;
     }
-#endif
 
     return WebCore::getRawCookies(session, firstParty, url, rawCookies);
 }
 
 void WebPlatformStrategies::deleteCookie(const NetworkStorageSession& session, const URL& url, const String& cookieName)
 {
-#if ENABLE(NETWORK_PROCESS)
     auto& webProcess = WebProcess::singleton();
     if (webProcess.usesNetworkProcess()) {
         webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::DeleteCookie(SessionTracker::sessionID(session), url, cookieName), 0);
         return;
     }
-#endif
 
     WebCore::deleteCookie(session, url, cookieName);
 }
 
 // LoaderStrategy
 
-#if ENABLE(NETWORK_PROCESS)
 ResourceLoadScheduler* WebPlatformStrategies::resourceLoadScheduler()
 {
     static ResourceLoadScheduler* scheduler;
@@ -282,7 +266,6 @@ BlobRegistry* WebPlatformStrategies::createBlobRegistry()
         return LoaderStrategy::createBlobRegistry();
     return new BlobRegistryProxy;    
 }
-#endif
 
 // PluginStrategy
 
index c5841aa..eb9a132 100644 (file)
@@ -59,12 +59,10 @@ private:
     virtual void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&) override;
 
     // WebCore::LoaderStrategy
-#if ENABLE(NETWORK_PROCESS)
     virtual WebCore::ResourceLoadScheduler* resourceLoadScheduler() override;
     virtual void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long resourceLoadIdentifier, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>& data) override;
     virtual WebCore::BlobRegistry* createBlobRegistry() override;
     virtual void createPingHandle(WebCore::NetworkingContext*, WebCore::ResourceRequest&, bool shouldUseCredentialStorage) override;
-#endif
 
     // WebCore::PluginStrategy
     virtual void refreshPlugins() override;
index fa05407..427c835 100644 (file)
 #include "InjectedBundleNodeHandle.h"
 #include "InjectedBundleRangeHandle.h"
 #include "InjectedBundleScriptWorld.h"
+#include "NetworkConnectionToWebProcessMessages.h"
+#include "NetworkProcessConnection.h"
 #include "PluginView.h"
 #include "WKAPICast.h"
 #include "WKBundleAPICast.h"
 #include "WebChromeClient.h"
+#include "WebCoreArgumentCoders.h"
 #include "WebDocumentLoader.h"
 #include "WebPage.h"
 #include "WebPageProxyMessages.h"
 #include <WebCore/LegacyWebArchive.h>
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkConnectionToWebProcessMessages.h"
-#include "NetworkProcessConnection.h"
-#include "WebCoreArgumentCoders.h"
-#endif
-
 #ifndef NDEBUG
 #include <wtf/RefCountedLeakCounter.h>
 #endif
@@ -261,12 +258,10 @@ void WebFrame::startDownload(const WebCore::ResourceRequest& request)
     ASSERT(webProcess.usesNetworkProcess());
 #endif
     SessionID sessionID = page() ? page()->sessionID() : SessionID::defaultSessionID();
-#if ENABLE(NETWORK_PROCESS)
     if (webProcess.usesNetworkProcess()) {
         webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::StartDownload(sessionID, policyDownloadID, request), 0);
         return;
     }
-#endif
 
 #if USE(NETWORK_SESSION)
     // Using NETWORK_SESSION requires the use of a network process.
@@ -286,7 +281,6 @@ void WebFrame::convertMainResourceLoadToDownload(DocumentLoader* documentLoader,
     SubresourceLoader* mainResourceLoader = documentLoader->mainResourceLoader();
 
     auto& webProcess = WebProcess::singleton();
-#if ENABLE(NETWORK_PROCESS)
 #if USE(NETWORK_SESSION)
     ASSERT(webProcess.usesNetworkProcess());
 #endif
@@ -303,7 +297,6 @@ void WebFrame::convertMainResourceLoadToDownload(DocumentLoader* documentLoader,
         webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ConvertMainResourceLoadToDownload(sessionID, mainResourceLoadIdentifier, policyDownloadID, request, response), 0);
         return;
     }
-#endif
 
     if (!mainResourceLoader) {
         // The main resource has already been loaded. Start a new download instead.
index 38a4d8f..bf140f8 100644 (file)
@@ -37,6 +37,7 @@
 #include "InjectedBundle.h"
 #include "Logging.h"
 #include "NetworkConnectionToWebProcessMessages.h"
+#include "NetworkProcessConnection.h"
 #include "PluginProcessConnectionManager.h"
 #include "SessionTracker.h"
 #include "StatisticsData.h"
@@ -60,6 +61,7 @@
 #include "WebProcessMessages.h"
 #include "WebProcessPoolMessages.h"
 #include "WebProcessProxyMessages.h"
+#include "WebResourceLoadScheduler.h"
 #include "WebsiteData.h"
 #include "WebsiteDataTypes.h"
 #include <JavaScriptCore/JSLock.h>
 #include "ObjCObjectGraph.h"
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
 #if PLATFORM(COCOA)
 #include "CookieStorageShim.h"
 #endif
-#include "NetworkProcessConnection.h"
-#endif
 
 #if ENABLE(SEC_ITEM_SHIM)
 #include "SecItemShim.h"
 #include "WebBatteryManager.h"
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
-#include "WebResourceLoadScheduler.h"
-#endif
-
 #if ENABLE(REMOTE_INSPECTOR)
 #include <JavaScriptCore/RemoteInspector.h>
 #endif
@@ -161,11 +156,9 @@ WebProcess::WebProcess()
     , m_fullKeyboardAccessEnabled(false)
     , m_textCheckerState()
     , m_iconDatabaseProxy(new WebIconDatabaseProxy(this))
-#if ENABLE(NETWORK_PROCESS)
     , m_usesNetworkProcess(false)
     , m_webResourceLoadScheduler(new WebResourceLoadScheduler)
     , m_dnsPrefetchHystereris([this](HysteresisState state) { if (state == HysteresisState::Stopped) m_dnsPrefetchedHosts.clear(); })
-#endif
 #if ENABLE(NETSCAPE_PLUGIN_API)
     , m_pluginProcessConnectionManager(PluginProcessConnectionManager::create())
 #endif
@@ -276,9 +269,7 @@ void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters)
 {
     ASSERT(m_pageMap.isEmpty());
 
-#if ENABLE(NETWORK_PROCESS)
     m_usesNetworkProcess = parameters.usesNetworkProcess;
-#endif
 
 #if OS(LINUX)
     WebCore::MemoryPressureHandler::ReliefLogger::setLoggingEnabled(parameters.shouldEnableMemoryPressureReliefLogging);
@@ -358,14 +349,12 @@ void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters)
     if (parameters.shouldUseTestingNetworkSession)
         NetworkStorageSession::switchToNewTestingSession();
 
-#if ENABLE(NETWORK_PROCESS)
     ensureNetworkProcessConnection();
 
 #if PLATFORM(COCOA)
     if (usesNetworkProcess())
         CookieStorageShim::singleton().initialize();
 #endif
-#endif
     setTerminationTimeout(parameters.terminationTimeout);
 
     resetPlugInAutoStartOriginHashes(parameters.plugInAutoStartOriginHashes);
@@ -396,7 +385,6 @@ void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters)
 #endif
 }
 
-#if ENABLE(NETWORK_PROCESS)
 void WebProcess::ensureNetworkProcessConnection()
 {
     if (!m_usesNetworkProcess)
@@ -422,7 +410,6 @@ void WebProcess::ensureNetworkProcessConnection()
         return;
     m_networkProcessConnection = NetworkProcessConnection::create(connectionIdentifier);
 }
-#endif // ENABLE(NETWORK_PROCESS)
 
 void WebProcess::registerURLSchemeAsEmptyDocument(const String& urlScheme)
 {
@@ -1027,14 +1014,9 @@ void WebProcess::setInjectedBundleParameters(const IPC::DataReference& value)
 
 bool WebProcess::usesNetworkProcess() const
 {
-#if ENABLE(NETWORK_PROCESS)
     return m_usesNetworkProcess;
-#else
-    return false;
-#endif
 }
 
-#if ENABLE(NETWORK_PROCESS)
 NetworkProcessConnection* WebProcess::networkConnection()
 {
     ASSERT(m_usesNetworkProcess);
@@ -1064,7 +1046,6 @@ WebResourceLoadScheduler& WebProcess::webResourceLoadScheduler()
 {
     return *m_webResourceLoadScheduler;
 }
-#endif // ENABLED(NETWORK_PROCESS)
 
 #if ENABLE(DATABASE_PROCESS)
 void WebProcess::webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection* connection)
@@ -1470,7 +1451,6 @@ void WebProcess::prefetchDNS(const String& hostname)
     if (hostname.isEmpty())
         return;
 
-#if ENABLE(NETWORK_PROCESS)
     if (usesNetworkProcess()) {
         if (m_dnsPrefetchedHosts.add(hostname).isNewEntry)
             networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::PrefetchDNS(hostname), 0);
@@ -1480,7 +1460,6 @@ void WebProcess::prefetchDNS(const String& hostname)
         m_dnsPrefetchHystereris.impulse();
         return;
     }
-#endif
     WebCore::prefetchDNS(hostname);
 }
 
index 27006e5..2200ca4 100644 (file)
@@ -74,6 +74,7 @@ namespace WebKit {
 class DownloadManager;
 class EventDispatcher;
 class InjectedBundle;
+class NetworkProcessConnection;
 class ObjCObjectGraph;
 class UserData;
 class WebConnectionToUIProcess;
@@ -82,16 +83,12 @@ class WebIconDatabaseProxy;
 class WebPage;
 class WebPageGroupProxy;
 class WebProcessSupplement;
+class WebResourceLoadScheduler;
 struct WebPageCreationParameters;
 struct WebPageGroupData;
 struct WebPreferencesStore;
 struct WebProcessCreationParameters;
 
-#if ENABLE(NETWORK_PROCESS)
-class NetworkProcessConnection;
-class WebResourceLoadScheduler;
-#endif
-
 #if ENABLE(DATABASE_PROCESS)
 class WebToDatabaseProcessConnection;
 #endif
@@ -159,11 +156,9 @@ public:
 
     bool usesNetworkProcess() const;
 
-#if ENABLE(NETWORK_PROCESS)
     NetworkProcessConnection* networkConnection();
     void networkProcessConnectionClosed(NetworkProcessConnection*);
     WebResourceLoadScheduler& webResourceLoadScheduler();
-#endif
 
 #if ENABLE(DATABASE_PROCESS)
     void webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection*);
@@ -359,14 +354,12 @@ private:
 
     WebIconDatabaseProxy* m_iconDatabaseProxy;
 
-#if ENABLE(NETWORK_PROCESS)
     void ensureNetworkProcessConnection();
     RefPtr<NetworkProcessConnection> m_networkProcessConnection;
     bool m_usesNetworkProcess;
     WebResourceLoadScheduler* m_webResourceLoadScheduler;
     HashSet<String> m_dnsPrefetchedHosts;
     WebCore::HysteresisActivity m_dnsPrefetchHystereris;
-#endif
 
 #if ENABLE(DATABASE_PROCESS)
     void ensureWebToDatabaseProcessConnection();
index 0d640c8..24e30a4 100644 (file)
@@ -91,7 +91,7 @@
 #endif
 
 #ifndef ENABLE_NETWORK_CACHE
-#if ENABLE(NETWORK_PROCESS) && (PLATFORM(COCOA) || PLATFORM(GTK))
+#if PLATFORM(COCOA) || PLATFORM(GTK)
 #define ENABLE_NETWORK_CACHE 1
 #else
 #define ENABLE_NETWORK_CACHE 0
index 33b61c1..a375832 100644 (file)
@@ -113,7 +113,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MOUSE_CURSOR_SCALE PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_HWCONCURRENCY PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PUBLIC ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOSNIFF PUBLIC ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
index 986afff..ff44193 100644 (file)
@@ -186,7 +186,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIEW_MODE_CSS_MEDIA PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THREADED_COMPOSITOR PRIVATE OFF)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHADOW_DOM PRIVATE OFF)
 
index ae64450..f654f66 100644 (file)
@@ -220,7 +220,6 @@ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_IOS_AIRPLAY_iphonesimulator PRIVATE OFF)
 
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SANDBOX_EXTENSIONS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_PROCESS_SANDBOX PRIVATE ON)
-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PLUGIN_PROCESS PRIVATE ON)
 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
index 9395a66..d96224d 100644 (file)
@@ -128,7 +128,6 @@ macro(WEBKIT_OPTION_BEGIN)
     WEBKIT_OPTION_DEFINE(ENABLE_NAVIGATOR_HWCONCURRENCY "Toggle Navigator hardware concurrency support" PRIVATE ON)
     WEBKIT_OPTION_DEFINE(ENABLE_NOSNIFF "Toggle support for 'X-Content-Type-Options: nosniff'" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_NETSCAPE_PLUGIN_API "Toggle Netscape Plugin support" PRIVATE ON)
-    WEBKIT_OPTION_DEFINE(ENABLE_NETWORK_PROCESS "Toggle dedicated network process support in WebKit2" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_NOTIFICATIONS "Toggle Desktop Notifications Support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_ORIENTATION_EVENTS "Toggle Orientation Events support" PRIVATE OFF)
     WEBKIT_OPTION_DEFINE(ENABLE_PDFKIT_PLUGIN "Toggle PDFKit plugin support" PRIVATE OFF)