Remove the non-NetworkProcess configurations
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Nov 2015 00:51:43 +0000 (00:51 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 20 Nov 2015 00:51:43 +0000 (00:51 +0000)
https://bugs.webkit.org/show_bug.cgi?id=151418

Patch by Alex Christensen <achristensen@webkit.org> on 2015-11-19
Reviewed by Geoffrey Garen.

.:

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

Source/WebKit2:

This patch assumes ENABLE(NETWORK_PROCESS) is always 1, usesNetworkProcess is always true,
and ProcessModel is always ProcessModelMultipleSecondaryProcesses.  It does this by removing
the checks and the code that would be executed with other configurations.

* 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:
* NetworkProcess/soup/NetworkProcessSoup.cpp:
(WebKit::NetworkProcess::platformTerminate):
* NetworkProcess/soup/RemoteNetworkingContextSoup.cpp:
(WebKit::RemoteNetworkingContext::storageSession):
* Shared/API/c/WKDeprecatedFunctions.cpp:
(WKInspectorToggleJavaScriptProfiling):
(WKContextSetProcessModel):
(WKContextGetProcessModel):
(WKContextSetUsesNetworkProcess):
(WKGraphicsContextGetCGContext):
* 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/APIProcessPoolConfiguration.cpp:
(API::ProcessPoolConfiguration::createWithLegacyOptions):
(API::ProcessPoolConfiguration::copy):
* UIProcess/API/APIProcessPoolConfiguration.h:
* UIProcess/API/APISession.cpp:
(API::Session::~Session):
* UIProcess/API/C/WKAPICast.h:
(WebKit::toAPI):
(WebKit::toFontSmoothingLevel):
(WebKit::toProcessModel): Deleted.
* UIProcess/API/C/WKContext.cpp:
(WKContextGetCacheModel):
(WKContextSetMaximumNumberOfProcesses):
(WKContextSetJavaScriptGarbageCollectorTimerEnabled):
(WKContextUseTestingNetworkSession):
(WKContextSetProcessModel): Deleted.
(WKContextGetProcessModel): Deleted.
(WKContextSetUsesNetworkProcess): Deleted.
* UIProcess/API/C/WKContext.h:
* UIProcess/API/C/mac/WKContextPrivateMac.mm:
(WKContextGetNetworkProcessIdentifier):
* UIProcess/API/Cocoa/WKProcessGroup.mm:
(-[WKProcessGroup initWithInjectedBundleURL:]):
* UIProcess/API/Cocoa/WKProcessPool.mm:
* 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):
(WebKit::DownloadProxy::invalidate):
* 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/ProcessModel.h: Removed.
* UIProcess/WebCookieManagerProxy.cpp:
(WebKit::WebCookieManagerProxy::shouldTerminate):
(WebKit::WebCookieManagerProxy::refWebContextSupplement):
(WebKit::WebCookieManagerProxy::setHTTPCookieAcceptPolicy):
(WebKit::WebCookieManagerProxy::getHTTPCookieAcceptPolicy):
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::inspectorProcessPool):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::reattachToWebProcess):
(WebKit::WebPageProxy::setSessionID):
(WebKit::WebPageProxy::initializeWebPage):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::create):
(WebKit::WebProcessPool::WebProcessPool):
(WebKit::WebProcessPool::~WebProcessPool):
(WebKit::WebProcessPool::initializeClient):
(WebKit::WebProcessPool::setDownloadClient):
(WebKit::WebProcessPool::setMaximumNumberOfProcesses):
(WebKit::WebProcessPool::networkingProcessConnection):
(WebKit::WebProcessPool::languageChanged):
(WebKit::WebProcessPool::textCheckerStateChanged):
(WebKit::WebProcessPool::ensureNetworkProcess):
(WebKit::WebProcessPool::getNetworkProcessConnection):
(WebKit::WebProcessPool::ensureDatabaseProcess):
(WebKit::WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled):
(WebKit::WebProcessPool::processDidCachePage):
(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::disconnectProcess):
(WebKit::WebProcessPool::createWebPage):
(WebKit::WebProcessPool::download):
(WebKit::WebProcessPool::resumeDownload):
(WebKit::WebProcessPool::postMessageToInjectedBundle):
(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::addMessageReceiver):
(WebKit::WebProcessPool::useTestingNetworkSession):
(WebKit::WebProcessPool::allowSpecificHTTPSCertificateForHost):
(WebKit::WebProcessPool::requestWebContentStatistics):
(WebKit::WebProcessPool::requestNetworkingStatistics):
(WebKit::WebProcessPool::handleMessage):
(WebKit::WebProcessPool::setProcessModel): Deleted.
(WebKit::WebProcessPool::setUsesNetworkProcess): Deleted.
(WebKit::WebProcessPool::usesNetworkProcess): Deleted.
(WebKit::WebProcessPool::ensureSharedWebProcess): Deleted.
* UIProcess/WebProcessPool.h:
(WebKit::WebProcessPool::sendToNetworkingProcess):
(WebKit::WebProcessPool::sendToNetworkingProcessRelaunchingIfNecessary):
(WebKit::WebProcessPool::sendToAllProcessesRelaunchingThemIfNecessary):
(WebKit::WebProcessPool::sendToOneProcess):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::removeWebPage):
(WebKit::WebProcessProxy::getPluginProcessConnection):
(WebKit::WebProcessProxy::getNetworkProcessConnection):
(WebKit::WebProcessProxy::getDatabaseProcessConnection):
(WebKit::WebProcessProxy::updateTextCheckerState):
(WebKit::WebProcessProxy::didSaveToPageCache):
(WebKit::WebProcessProxy::didCancelProcessSuspension):
(WebKit::WebProcessProxy::reinstateNetworkProcessAssertionState):
(WebKit::WebProcessProxy::didSetAssertionState):
(WebKit::WebProcessProxy::createDownloadProxy): Deleted.
* 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::platformInitializeWebProcess):
(WebKit::WebProcessPool::setIgnoreTLSErrors):
* UIProcess/soup/WebProcessPoolSoup.cpp:
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
* WebKit2.xcodeproj/project.pbxproj:
* WebKit2Prefix.h:
* WebProcess/FileAPI/BlobRegistryProxy.cpp:
(WebKit::BlobRegistryProxy::registerFileBlobURL):
(WebKit::BlobRegistryProxy::registerBlobURL):
(WebKit::BlobRegistryProxy::unregisterBlobURL):
(WebKit::BlobRegistryProxy::registerBlobURLForSlice):
(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::loadResourceSynchronously):
(WebKit::WebPlatformStrategies::createPingHandle):
(WebKit::WebPlatformStrategies::createBlobRegistry):
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::startDownload):
(WebKit::WebFrame::convertMainResourceLoadToDownload):
(WebKit::WebFrame::source):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::initializeConnection):
(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::ensureNetworkProcessConnection):
(WebKit::WebProcess::registerURLSchemeAsEmptyDocument):
(WebKit::WebProcess::destroyPrivateBrowsingSession):
(WebKit::WebProcess::pluginProcessConnectionManager):
(WebKit::WebProcess::shouldTerminate):
(WebKit::WebProcess::setInjectedBundleParameters):
(WebKit::WebProcess::networkConnection):
(WebKit::WebProcess::webResourceLoadScheduler):
(WebKit::WebProcess::webToDatabaseProcessConnectionClosed):
(WebKit::WebProcess::setEnhancedAccessibility):
(WebKit::WebProcess::prefetchDNS):
(WebKit::WebProcess::didCreateDownload): Deleted.
(WebKit::WebProcess::didDestroyDownload): Deleted.
(WebKit::WebProcess::downloadProxyConnection): Deleted.
(WebKit::WebProcess::downloadsAuthenticationManager): Deleted.
(WebKit::WebProcess::downloadManager): Deleted.
(WebKit::WebProcess::usesNetworkProcess): Deleted.
(WebKit::WebProcess::downloadRequest): Deleted.
(WebKit::WebProcess::resumeDownload): Deleted.
(WebKit::WebProcess::cancelDownload): Deleted.
* WebProcess/WebProcess.h:
(WebKit::WebProcess::textCheckerState):
(WebKit::WebProcess::eventDispatcher):
* WebProcess/WebProcess.messages.in:
* WebProcess/soup/WebProcessSoup.cpp:
(WebKit::WebProcess::platformSetCacheModel):
(WebKit::WebProcess::platformClearResourceCaches):
(WebKit::WebProcess::platformInitializeWebProcess):
(WebKit::WebProcess::platformTerminate):
(WebKit::WebProcess::setIgnoreTLSErrors):
(WebKit::WebProcess::allowSpecificHTTPSCertificateForHost):
(WebKit::getCacheDiskFreeSize): Deleted.
(WebKit::setSoupSessionAcceptLanguage): Deleted.
(WebKit::languageChanged): Deleted.
* config.h:

Tools:

* TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp:
(TestWebKitAPI::TEST):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::generatePageConfiguration):

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

112 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/API/c/WKDeprecatedFunctions.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/APIProcessPoolConfiguration.cpp
Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h
Source/WebKit2/UIProcess/API/APISession.cpp
Source/WebKit2/UIProcess/API/C/WKAPICast.h
Source/WebKit2/UIProcess/API/C/WKContext.cpp
Source/WebKit2/UIProcess/API/C/WKContext.h
Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm
Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm
Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.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/ProcessModel.h [deleted file]
Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp
Source/WebKit2/UIProcess/WebInspectorProxy.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/WebKit2.xcodeproj/project.pbxproj
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/WebProcess/WebProcess.messages.in
Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp
Source/WebKit2/config.h
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsGTK.cmake
Source/cmake/OptionsMac.cmake
Source/cmake/WebKitFeatures.cmake
Tools/ChangeLog
Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp
Tools/WebKitTestRunner/TestController.cpp

index 24b05cc..078ab95 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2015-11-19  Alex Christensen  <achristensen@webkit.org>
+
+        Remove the non-NetworkProcess configurations
+        https://bugs.webkit.org/show_bug.cgi?id=151418
+
+        Reviewed by Geoffrey Garen.
+
+        * Source/cmake/OptionsEfl.cmake:
+        * Source/cmake/OptionsGTK.cmake:
+        * Source/cmake/OptionsMac.cmake:
+        * Source/cmake/WebKitFeatures.cmake:
+
 2015-11-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         REGRESSION(r192459): [GTK] User agent string is broken after r192459
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 964acaa..4833969 100644 (file)
@@ -1,3 +1,312 @@
+2015-11-19  Alex Christensen  <achristensen@webkit.org>
+
+        Remove the non-NetworkProcess configurations
+        https://bugs.webkit.org/show_bug.cgi?id=151418
+
+        Reviewed by Geoffrey Garen.
+
+        This patch assumes ENABLE(NETWORK_PROCESS) is always 1, usesNetworkProcess is always true, 
+        and ProcessModel is always ProcessModelMultipleSecondaryProcesses.  It does this by removing
+        the checks and the code that would be executed with other configurations.
+
+        * 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:
+        * NetworkProcess/soup/NetworkProcessSoup.cpp:
+        (WebKit::NetworkProcess::platformTerminate):
+        * NetworkProcess/soup/RemoteNetworkingContextSoup.cpp:
+        (WebKit::RemoteNetworkingContext::storageSession):
+        * Shared/API/c/WKDeprecatedFunctions.cpp:
+        (WKInspectorToggleJavaScriptProfiling):
+        (WKContextSetProcessModel):
+        (WKContextGetProcessModel):
+        (WKContextSetUsesNetworkProcess):
+        (WKGraphicsContextGetCGContext):
+        * 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/APIProcessPoolConfiguration.cpp:
+        (API::ProcessPoolConfiguration::createWithLegacyOptions):
+        (API::ProcessPoolConfiguration::copy):
+        * UIProcess/API/APIProcessPoolConfiguration.h:
+        * UIProcess/API/APISession.cpp:
+        (API::Session::~Session):
+        * UIProcess/API/C/WKAPICast.h:
+        (WebKit::toAPI):
+        (WebKit::toFontSmoothingLevel):
+        (WebKit::toProcessModel): Deleted.
+        * UIProcess/API/C/WKContext.cpp:
+        (WKContextGetCacheModel):
+        (WKContextSetMaximumNumberOfProcesses):
+        (WKContextSetJavaScriptGarbageCollectorTimerEnabled):
+        (WKContextUseTestingNetworkSession):
+        (WKContextSetProcessModel): Deleted.
+        (WKContextGetProcessModel): Deleted.
+        (WKContextSetUsesNetworkProcess): Deleted.
+        * UIProcess/API/C/WKContext.h:
+        * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+        (WKContextGetNetworkProcessIdentifier):
+        * UIProcess/API/Cocoa/WKProcessGroup.mm:
+        (-[WKProcessGroup initWithInjectedBundleURL:]):
+        * UIProcess/API/Cocoa/WKProcessPool.mm:
+        * 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):
+        (WebKit::DownloadProxy::invalidate):
+        * 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/ProcessModel.h: Removed.
+        * UIProcess/WebCookieManagerProxy.cpp:
+        (WebKit::WebCookieManagerProxy::shouldTerminate):
+        (WebKit::WebCookieManagerProxy::refWebContextSupplement):
+        (WebKit::WebCookieManagerProxy::setHTTPCookieAcceptPolicy):
+        (WebKit::WebCookieManagerProxy::getHTTPCookieAcceptPolicy):
+        * UIProcess/WebInspectorProxy.cpp:
+        (WebKit::WebInspectorProxy::inspectorProcessPool):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy):
+        (WebKit::WebPageProxy::reattachToWebProcess):
+        (WebKit::WebPageProxy::setSessionID):
+        (WebKit::WebPageProxy::initializeWebPage):
+        * UIProcess/WebProcessPool.cpp:
+        (WebKit::WebProcessPool::create):
+        (WebKit::WebProcessPool::WebProcessPool):
+        (WebKit::WebProcessPool::~WebProcessPool):
+        (WebKit::WebProcessPool::initializeClient):
+        (WebKit::WebProcessPool::setDownloadClient):
+        (WebKit::WebProcessPool::setMaximumNumberOfProcesses):
+        (WebKit::WebProcessPool::networkingProcessConnection):
+        (WebKit::WebProcessPool::languageChanged):
+        (WebKit::WebProcessPool::textCheckerStateChanged):
+        (WebKit::WebProcessPool::ensureNetworkProcess):
+        (WebKit::WebProcessPool::getNetworkProcessConnection):
+        (WebKit::WebProcessPool::ensureDatabaseProcess):
+        (WebKit::WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled):
+        (WebKit::WebProcessPool::processDidCachePage):
+        (WebKit::WebProcessPool::createNewWebProcess):
+        (WebKit::WebProcessPool::disconnectProcess):
+        (WebKit::WebProcessPool::createWebPage):
+        (WebKit::WebProcessPool::download):
+        (WebKit::WebProcessPool::resumeDownload):
+        (WebKit::WebProcessPool::postMessageToInjectedBundle):
+        (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::addMessageReceiver):
+        (WebKit::WebProcessPool::useTestingNetworkSession):
+        (WebKit::WebProcessPool::allowSpecificHTTPSCertificateForHost):
+        (WebKit::WebProcessPool::requestWebContentStatistics):
+        (WebKit::WebProcessPool::requestNetworkingStatistics):
+        (WebKit::WebProcessPool::handleMessage):
+        (WebKit::WebProcessPool::setProcessModel): Deleted.
+        (WebKit::WebProcessPool::setUsesNetworkProcess): Deleted.
+        (WebKit::WebProcessPool::usesNetworkProcess): Deleted.
+        (WebKit::WebProcessPool::ensureSharedWebProcess): Deleted.
+        * UIProcess/WebProcessPool.h:
+        (WebKit::WebProcessPool::sendToNetworkingProcess):
+        (WebKit::WebProcessPool::sendToNetworkingProcessRelaunchingIfNecessary):
+        (WebKit::WebProcessPool::sendToAllProcessesRelaunchingThemIfNecessary):
+        (WebKit::WebProcessPool::sendToOneProcess):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::removeWebPage):
+        (WebKit::WebProcessProxy::getPluginProcessConnection):
+        (WebKit::WebProcessProxy::getNetworkProcessConnection):
+        (WebKit::WebProcessProxy::getDatabaseProcessConnection):
+        (WebKit::WebProcessProxy::updateTextCheckerState):
+        (WebKit::WebProcessProxy::didSaveToPageCache):
+        (WebKit::WebProcessProxy::didCancelProcessSuspension):
+        (WebKit::WebProcessProxy::reinstateNetworkProcessAssertionState):
+        (WebKit::WebProcessProxy::didSetAssertionState):
+        (WebKit::WebProcessProxy::createDownloadProxy): Deleted.
+        * 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::platformInitializeWebProcess):
+        (WebKit::WebProcessPool::setIgnoreTLSErrors):
+        * UIProcess/soup/WebProcessPoolSoup.cpp:
+        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+        * WebKit2.xcodeproj/project.pbxproj:
+        * WebKit2Prefix.h:
+        * WebProcess/FileAPI/BlobRegistryProxy.cpp:
+        (WebKit::BlobRegistryProxy::registerFileBlobURL):
+        (WebKit::BlobRegistryProxy::registerBlobURL):
+        (WebKit::BlobRegistryProxy::unregisterBlobURL):
+        (WebKit::BlobRegistryProxy::registerBlobURLForSlice):
+        (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::loadResourceSynchronously):
+        (WebKit::WebPlatformStrategies::createPingHandle):
+        (WebKit::WebPlatformStrategies::createBlobRegistry):
+        * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+        * WebProcess/WebPage/WebFrame.cpp:
+        (WebKit::WebFrame::startDownload):
+        (WebKit::WebFrame::convertMainResourceLoadToDownload):
+        (WebKit::WebFrame::source):
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess):
+        (WebKit::WebProcess::initializeConnection):
+        (WebKit::WebProcess::initializeWebProcess):
+        (WebKit::WebProcess::ensureNetworkProcessConnection):
+        (WebKit::WebProcess::registerURLSchemeAsEmptyDocument):
+        (WebKit::WebProcess::destroyPrivateBrowsingSession):
+        (WebKit::WebProcess::pluginProcessConnectionManager):
+        (WebKit::WebProcess::shouldTerminate):
+        (WebKit::WebProcess::setInjectedBundleParameters):
+        (WebKit::WebProcess::networkConnection):
+        (WebKit::WebProcess::webResourceLoadScheduler):
+        (WebKit::WebProcess::webToDatabaseProcessConnectionClosed):
+        (WebKit::WebProcess::setEnhancedAccessibility):
+        (WebKit::WebProcess::prefetchDNS):
+        (WebKit::WebProcess::didCreateDownload): Deleted.
+        (WebKit::WebProcess::didDestroyDownload): Deleted.
+        (WebKit::WebProcess::downloadProxyConnection): Deleted.
+        (WebKit::WebProcess::downloadsAuthenticationManager): Deleted.
+        (WebKit::WebProcess::downloadManager): Deleted.
+        (WebKit::WebProcess::usesNetworkProcess): Deleted.
+        (WebKit::WebProcess::downloadRequest): Deleted.
+        (WebKit::WebProcess::resumeDownload): Deleted.
+        (WebKit::WebProcess::cancelDownload): Deleted.
+        * WebProcess/WebProcess.h:
+        (WebKit::WebProcess::textCheckerState):
+        (WebKit::WebProcess::eventDispatcher):
+        * WebProcess/WebProcess.messages.in:
+        * WebProcess/soup/WebProcessSoup.cpp:
+        (WebKit::WebProcess::platformSetCacheModel):
+        (WebKit::WebProcess::platformClearResourceCaches):
+        (WebKit::WebProcess::platformInitializeWebProcess):
+        (WebKit::WebProcess::platformTerminate):
+        (WebKit::WebProcess::setIgnoreTLSErrors):
+        (WebKit::WebProcess::allowSpecificHTTPSCertificateForHost):
+        (WebKit::getCacheDiskFreeSize): Deleted.
+        (WebKit::setSoupSessionAcceptLanguage): Deleted.
+        (WebKit::languageChanged): Deleted.
+        * config.h:
+
 2015-11-19  Csaba Osztrogon√°c  <ossy@webkit.org>
 
         [EFL] Fix Wreturn-type clang warning in EWK2UnitTestBase.cpp
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..c8df672 100644 (file)
@@ -24,8 +24,6 @@
  */
 
 #include "config.h"
-
-#if ENABLE(NETWORK_PROCESS)
 #include "NetworkLoad.h"
 
 #include "AuthenticationManager.h"
@@ -371,5 +369,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..d8d2d38 100644 (file)
@@ -24,8 +24,6 @@
  */
 
 #import "config.h"
-
-#if ENABLE(NETWORK_PROCESS)
 #import "NetworkLoad.h"
 
 #import <WebCore/CFNetworkSPI.h>
@@ -60,5 +58,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..a6d1267 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>
@@ -91,5 +89,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 937f87b..d0df667 100644 (file)
@@ -27,6 +27,8 @@
 
 #include "APIDictionary.h"
 #include "WKArray.h"
+#include "WKContext.h"
+#include "WKContextPrivate.h"
 #include "WKMutableDictionary.h"
 #include "WKPreferencesRefPrivate.h"
 #include "WKSharedAPICast.h"
@@ -134,6 +136,19 @@ void WKInspectorToggleJavaScriptProfiling(WKInspectorRef)
 {
 }
 
+void WKContextSetProcessModel(WKContextRef, WKProcessModel)
+{
+}
+
+WKProcessModel WKContextGetProcessModel(WKContextRef)
+{
+    return kWKProcessModelMultipleSecondaryProcesses;
+}
+
+void WKContextSetUsesNetworkProcess(WKContextRef, bool)
+{
+}
+
 #if PLATFORM(MAC)
 CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
 {
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..1443f16 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,22 +134,11 @@ 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]];
-
-    for (size_t i = 0; i < parameters.urlSchemesRegisteredForCustomProtocols.size(); ++i)
-        registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
+    ASSERT(parameters.urlSchemesRegisteredForCustomProtocols.isEmpty());
+    m_childProcess->parentProcessConnection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
+    m_messageQueue = nullptr;
 }
 
-#if ENABLE(NETWORK_PROCESS)
 void CustomProtocolManager::initialize(const NetworkProcessCreationParameters& parameters)
 {
     [NSURLProtocol registerClass:[WKCustomProtocol class]];
@@ -160,7 +146,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..b30fe73 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,16 @@ 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]);
+    ASSERT(parameters.urlSchemesRegisteredForCustomProtocols.isEmpty());
+    m_childProcess->parentProcessConnection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
+    m_messageQueue = nullptr;
 }
 
-#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..0925295 100644 (file)
@@ -43,9 +43,6 @@ WebProcessCreationParameters::WebProcessCreationParameters()
     , shouldEnableJIT(false)
     , shouldEnableFTLJIT(false)
 #endif
-#if ENABLE(NETWORK_PROCESS)
-    , usesNetworkProcess(false)
-#endif
     , memoryCacheDisabled(false)
 #if ENABLE(SERVICE_CONTROLS)
     , hasImageServices(false)
@@ -133,10 +130,6 @@ void WebProcessCreationParameters::encode(IPC::ArgumentEncoder& encoder) const
     encoder << notificationPermissions;
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
-    encoder << usesNetworkProcess;
-#endif
-
     encoder << plugInAutoStartOriginHashes;
     encoder << plugInAutoStartOrigins;
     encoder << memoryCacheDisabled;
@@ -291,11 +284,6 @@ 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;
     if (!decoder.decode(parameters.plugInAutoStartOrigins))
index b838a97..cad5b70 100644 (file)
@@ -154,10 +154,6 @@ 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 0dc8e29..ff76551 100644 (file)
@@ -41,7 +41,6 @@ Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::createWithLegacyOptions(
     auto configuration = ProcessPoolConfiguration::create();
 
     configuration->m_shouldHaveLegacyDataStore = true;
-    configuration->m_processModel = WebKit::ProcessModelSharedSecondaryProcess;
     configuration->m_useNetworkProcess = false;
     configuration->m_cacheModel = WebKit::CacheModelDocumentViewer;
 
@@ -74,7 +73,6 @@ Ref<ProcessPoolConfiguration> ProcessPoolConfiguration::copy()
     auto copy = this->create();
 
     copy->m_shouldHaveLegacyDataStore = this->m_shouldHaveLegacyDataStore;
-    copy->m_processModel = this->m_processModel;
     copy->m_useNetworkProcess = this->m_useNetworkProcess;
     copy->m_maximumProcessCount = this->m_maximumProcessCount;
     copy->m_cacheModel = this->m_cacheModel;
index 6dc9f2a..9d5e25b 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "APIObject.h"
 #include "CacheModel.h"
-#include "ProcessModel.h"
 #include <wtf/Ref.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
@@ -48,9 +47,6 @@ public:
     bool shouldHaveLegacyDataStore() const { return m_shouldHaveLegacyDataStore; }
     void setShouldHaveLegacyDataStore(bool shouldHaveLegacyDataStore) { m_shouldHaveLegacyDataStore = shouldHaveLegacyDataStore; }
 
-    WebKit::ProcessModel processModel() const { return m_processModel; }
-    void setProcessModel(WebKit::ProcessModel processModel) { m_processModel = processModel; } 
-
     bool useNetworkProcess() const { return m_useNetworkProcess; }
     void setUseNetworkProcess(bool useNetworkProcess) { m_useNetworkProcess = useNetworkProcess; } 
 
@@ -96,7 +92,6 @@ public:
 private:
     bool m_shouldHaveLegacyDataStore { false };
 
-    WebKit::ProcessModel m_processModel { WebKit::ProcessModelMultipleSecondaryProcesses };
     bool m_useNetworkProcess { true };
     unsigned m_maximumProcessCount { 0 };
     WebKit::CacheModel m_cacheModel { WebKit::CacheModelPrimaryWebBrowser };
index a296e76..6c460dc 100644 (file)
 
 #include <wtf/RunLoop.h>
 
-#if ENABLE(NETWORK_PROCESS)
 #include "NetworkProcessMessages.h"
 #include "WebProcessPool.h"
-#endif
 
 namespace API {
 
@@ -80,12 +78,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 8cbb8d5..4846ea3 100644 (file)
@@ -32,7 +32,6 @@
 #include "HTTPCookieAcceptPolicy.h"
 #include "InjectedBundleHitTestResultMediaType.h"
 #include "PluginModuleInfo.h"
-#include "ProcessModel.h"
 #include "ResourceCachesToClear.h"
 #include "WKBundleHitTestResult.h"
 #include "WKContext.h"
@@ -230,31 +229,6 @@ inline WKCacheModel toAPI(CacheModel cacheModel)
     return kWKCacheModelDocumentViewer;
 }
 
-inline ProcessModel toProcessModel(WKProcessModel wkProcessModel)
-{
-    switch (wkProcessModel) {
-    case kWKProcessModelSharedSecondaryProcess:
-        return ProcessModelSharedSecondaryProcess;
-    case kWKProcessModelMultipleSecondaryProcesses:
-        return ProcessModelMultipleSecondaryProcesses;
-    }
-
-    ASSERT_NOT_REACHED();
-    return ProcessModelSharedSecondaryProcess;
-}
-
-inline WKProcessModel toAPI(ProcessModel processModel)
-{
-    switch (processModel) {
-    case ProcessModelSharedSecondaryProcess:
-        return kWKProcessModelSharedSecondaryProcess;
-    case ProcessModelMultipleSecondaryProcesses:
-        return kWKProcessModelMultipleSecondaryProcesses;
-    }
-    
-    return kWKProcessModelSharedSecondaryProcess;
-}
-
 inline FontSmoothingLevel toFontSmoothingLevel(WKFontSmoothingLevel wkLevel)
 {
     switch (wkLevel) {
index 7025313..8768792 100644 (file)
@@ -329,16 +329,6 @@ WKCacheModel WKContextGetCacheModel(WKContextRef contextRef)
     return toAPI(toImpl(contextRef)->cacheModel());
 }
 
-void WKContextSetProcessModel(WKContextRef contextRef, WKProcessModel processModel)
-{
-    toImpl(contextRef)->setProcessModel(toProcessModel(processModel));
-}
-
-WKProcessModel WKContextGetProcessModel(WKContextRef contextRef)
-{
-    return toAPI(toImpl(contextRef)->processModel());
-}
-
 void WKContextSetMaximumNumberOfProcesses(WKContextRef contextRef, unsigned numberOfProcesses)
 {
     toImpl(contextRef)->setMaximumNumberOfProcesses(numberOfProcesses);
@@ -554,11 +544,6 @@ void WKContextSetJavaScriptGarbageCollectorTimerEnabled(WKContextRef contextRef,
     toImpl(contextRef)->setJavaScriptGarbageCollectorTimerEnabled(enable);
 }
 
-void WKContextSetUsesNetworkProcess(WKContextRef contextRef, bool usesNetworkProcess)
-{
-    toImpl(contextRef)->setUsesNetworkProcess(usesNetworkProcess);
-}
-
 void WKContextUseTestingNetworkSession(WKContextRef context)
 {
     toImpl(context)->useTestingNetworkSession();
index 1b3d82c..6de013e 100644 (file)
@@ -75,6 +75,7 @@ typedef struct WKContextClientV1 {
     WKContextCopyWebCryptoMasterKeyCallback                             copyWebCryptoMasterKey;
 } WKContextClientV1;
 
+// FIXME: These can be removed once we are no longer supporting Mavericks.
 enum {
     kWKProcessModelSharedSecondaryProcess = 0,
     kWKProcessModelMultipleSecondaryProcesses = 1
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 84a7681..ecfc80f 100644 (file)
@@ -192,10 +192,6 @@ static void setUpHistoryClient(WKProcessGroup *processGroup, WKContextRef contex
 
     auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
     configuration->setInjectedBundlePath(bundleURL ? String(bundleURL.path) : String());
-#if PLATFORM(IOS)
-    configuration->setUseNetworkProcess(true);
-    configuration->setProcessModel(ProcessModelMultipleSecondaryProcesses);
-#endif
 
     _processPool = WebProcessPool::create(configuration);
 
index 9681ae8..18fda50 100644 (file)
@@ -30,7 +30,6 @@
 
 #import "CacheModel.h"
 #import "DownloadClient.h"
-#import "ProcessModel.h"
 #import "SandboxUtilities.h"
 #import "WKObject.h"
 #import "WeakObjCPtr.h"
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..7d4f494 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)
+    if (m_networkProcess)
         m_networkProcess->setProcessSuppressionEnabled(processSuppressionEnabled());
-#endif
 
 #if ENABLE(NETSCAPE_PLUGIN_API)
     if (!m_processSuppressionDisabledForPageCounter.value())
@@ -197,15 +190,6 @@ 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;
 
     if (m_bundleParameters) {
@@ -236,7 +220,6 @@ void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters&
 #endif
 }
 
-#if ENABLE(NETWORK_PROCESS)
 void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters)
 {
     NSURLCache *urlCache = [NSURLCache sharedURLCache];
@@ -271,7 +254,6 @@ void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationPara
     parameters.uiProcessCookieStorageIdentifier.append(CFDataGetBytePtr(cookieStorageData.get()), CFDataGetLength(cookieStorageData.get()));
 #endif
 }
-#endif
 
 void WebProcessPool::platformInvalidateContext()
 {
index e505d04..4acb544 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,15 +71,8 @@ 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));
+    if (NetworkProcessProxy* networkProcess = m_processPool->networkProcess())
+        networkProcess->connection()->send(Messages::NetworkProcess::CancelDownload(m_downloadID), 0);
 }
 
 void DownloadProxy::invalidate()
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..859cb75 100644 (file)
@@ -24,9 +24,8 @@
  */
 
 #include "config.h"
-#if ENABLE(NETWORK_PROCESS)
-
 #include "NetworkProcessProxy.h"
+
 #include <glib.h>
 
 namespace WebKit {
@@ -43,5 +42,3 @@ void NetworkProcessProxy::platformGetLaunchOptions(ProcessLauncher::LaunchOption
 }
 
 }
-
-#endif // ENABLE(NETWORK_PROCESS)
diff --git a/Source/WebKit2/UIProcess/ProcessModel.h b/Source/WebKit2/UIProcess/ProcessModel.h
deleted file mode 100644 (file)
index 6c18da0..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, 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.
- */
-
-#ifndef ProcessModel_h
-#define ProcessModel_h
-
-namespace WebKit {
-
-enum ProcessModel {
-    ProcessModelSharedSecondaryProcess,
-    ProcessModelMultipleSecondaryProcesses
-};
-
-} // namespace WebKit
-
-#endif // ProcessModel_h
index 12012fd..114f1aa 100644 (file)
@@ -85,8 +85,8 @@ void WebCookieManagerProxy::processDidClose(NetworkProcessProxy*)
 
 bool WebCookieManagerProxy::shouldTerminate(WebProcessProxy*) const
 {
-    return processPool()->processModel() != ProcessModelSharedSecondaryProcess
-        || (m_arrayCallbacks.isEmpty() && m_httpCookieAcceptPolicyCallbacks.isEmpty());
+    // FIXME: Remove this.
+    return true;
 }
 
 void WebCookieManagerProxy::refWebContextSupplement()
@@ -163,10 +163,7 @@ 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
+    processPool()->sendToNetworkingProcess(Messages::WebCookieManager::SetHTTPCookieAcceptPolicy(policy));
 }
 
 void WebCookieManagerProxy::getHTTPCookieAcceptPolicy(std::function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)> callbackFunction)
index 65aaa51..281dafa 100644 (file)
@@ -312,7 +312,6 @@ WebProcessPool& WebInspectorProxy::inspectorProcessPool()
     // guarantees no process sharing for our user interface.
     if (!s_processPool) {
         auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
-        configuration->setProcessModel(ProcessModelMultipleSecondaryProcesses);
         s_processPool = &WebProcessPool::create(configuration.get()).leakRef();
     };
 
index 4531639..de0c42b 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;
@@ -696,10 +691,7 @@ void WebPageProxy::reattachToWebProcess()
     m_process->removeWebPage(m_pageID);
     m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
 
-    if (m_process->processPool().processModel() == ProcessModelSharedSecondaryProcess)
-        m_process = m_process->processPool().ensureSharedWebProcess();
-    else
-        m_process = m_process->processPool().createNewWebProcessRespectingProcessCountLimit();
+    m_process = m_process->processPool().createNewWebProcessRespectingProcessCountLimit();
 
     ASSERT(m_process->state() != ChildProcessProxy::State::Terminated);
     if (m_process->state() == ChildProcessProxy::State::Running)
@@ -774,10 +766,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..4ce20bf 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"
@@ -105,8 +103,6 @@ using namespace WebKit;
 
 namespace WebKit {
 
-static const double sharedSecondaryProcessShutdownTimeout = 60;
-
 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, processPoolCounter, ("WebProcessPool"));
 
 Ref<WebProcessPool> WebProcessPool::create(API::ProcessPoolConfiguration& configuration)
@@ -159,10 +155,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 +248,8 @@ WebProcessPool::~WebProcessPool()
     processPoolCounter.decrement();
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
     if (m_networkProcess)
         m_networkProcess->shutDownProcess();
-#endif
 }
 
 void WebProcessPool::initializeClient(const WKContextClientBase* client)
@@ -291,17 +283,6 @@ void WebProcessPool::setDownloadClient(std::unique_ptr<API::DownloadClient> down
         m_downloadClient = WTF::move(downloadClient);
 }
 
-void WebProcessPool::setProcessModel(ProcessModel processModel)
-{
-    // Guard against API misuse.
-    if (!m_processes.isEmpty())
-        CRASH();
-    if (processModel != ProcessModelSharedSecondaryProcess && !m_messagesToInjectedBundlePostedToEmptyContext.isEmpty())
-        CRASH();
-
-    m_configuration->setProcessModel(processModel);
-}
-
 void WebProcessPool::setMaximumNumberOfProcesses(unsigned maximumNumberOfProcesses)
 {
     // Guard against API misuse.
@@ -313,23 +294,7 @@ void WebProcessPool::setMaximumNumberOfProcesses(unsigned maximumNumberOfProcess
 
 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;
+    return m_networkProcess->connection();
 }
 
 void WebProcessPool::languageChanged(void* context)
@@ -340,8 +305,8 @@ void WebProcessPool::languageChanged(void* context)
 void WebProcessPool::languageChanged()
 {
     sendToAllProcesses(Messages::WebProcess::UserPreferredLanguagesChanged(userPreferredLanguages()));
-#if USE(SOUP) && ENABLE(NETWORK_PROCESS)
-    if (usesNetworkProcess() && m_networkProcess)
+#if USE(SOUP)
+    if (m_networkProcess)
         m_networkProcess->send(Messages::NetworkProcess::UserPreferredLanguagesChanged(userPreferredLanguages()), 0);
 #endif
 }
@@ -356,25 +321,6 @@ void WebProcessPool::textCheckerStateChanged()
     sendToAllProcesses(Messages::WebProcess::SetTextCheckerState(TextChecker::state()));
 }
 
-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 +405,6 @@ void WebProcessPool::getNetworkProcessConnection(PassRefPtr<Messages::WebProcess
 
     m_networkProcess->getNetworkProcessConnection(reply);
 }
-#endif
 
 #if ENABLE(DATABASE_PROCESS)
 void WebProcessPool::ensureDatabaseProcess()
@@ -527,14 +472,12 @@ void WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled(bool private
 {
     m_iconDatabase->setPrivateBrowsingEnabled(privateBrowsingEnabled);
 
-#if ENABLE(NETWORK_PROCESS)
-    if (usesNetworkProcess() && networkProcess()) {
+    if (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()));
@@ -569,20 +512,9 @@ void WebProcessPool::processDidCachePage(WebProcessProxy* process)
     m_processWithPageCache = process;
 }
 
-WebProcessProxy& WebProcessPool::ensureSharedWebProcess()
-{
-    ASSERT(processModel() == ProcessModelSharedSecondaryProcess);
-    if (m_processes.isEmpty())
-        createNewWebProcess();
-    return *m_processes[0];
-}
-
 WebProcessProxy& WebProcessPool::createNewWebProcess()
 {
-#if ENABLE(NETWORK_PROCESS)
-    if (usesNetworkProcess())
-        ensureNetworkProcess();
-#endif
+    ensureNetworkProcess();
 
     Ref<WebProcessProxy> process = WebProcessProxy::create(*this);
 
@@ -646,7 +578,7 @@ WebProcessProxy& WebProcessPool::createNewWebProcess()
     // iconDatabasePath is non-empty by default, but m_iconDatabase isn't enabled in UI process unless setDatabasePath is called explicitly.
     parameters.iconDatabaseEnabled = !iconDatabasePath().isEmpty();
 
-    parameters.terminationTimeout = (processModel() == ProcessModelSharedSecondaryProcess) ? sharedSecondaryProcessShutdownTimeout : 0;
+    parameters.terminationTimeout = 0;
 
     parameters.textCheckerState = TextChecker::state();
 
@@ -659,10 +591,6 @@ 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);
 
@@ -706,15 +634,7 @@ WebProcessProxy& WebProcessPool::createNewWebProcess()
 
     m_processes.append(process.ptr());
 
-    if (processModel() == ProcessModelSharedSecondaryProcess) {
-        for (size_t i = 0; i != m_messagesToInjectedBundlePostedToEmptyContext.size(); ++i) {
-            auto& messageNameAndBody = m_messagesToInjectedBundlePostedToEmptyContext[i];
-
-            process->send(Messages::WebProcess::HandleInjectedBundleMessage(messageNameAndBody.first, UserData(process->transformObjectsToHandles(messageNameAndBody.second.get()).get())), 0);
-        }
-        m_messagesToInjectedBundlePostedToEmptyContext.clear();
-    } else
-        ASSERT(m_messagesToInjectedBundlePostedToEmptyContext.isEmpty());
+    ASSERT(m_messagesToInjectedBundlePostedToEmptyContext.isEmpty());
 
 #if ENABLE(REMOTE_INSPECTOR)
     // Initialize remote inspector connection now that we have a sub-process that is hosting one of our web views.
@@ -798,28 +718,12 @@ void WebProcessPool::disconnectProcess(WebProcessProxy* process)
 
     // FIXME (Multi-WebProcess): <rdar://problem/12239765> Some of the invalidation calls below are still necessary in multi-process mode, but they should only affect data structures pertaining to the process being disconnected.
     // Clearing everything causes assertion failures, so it's less trouble to skip that for now.
-    if (processModel() != ProcessModelSharedSecondaryProcess) {
-        RefPtr<WebProcessProxy> protect(process);
-        if (m_processWithPageCache == process)
-            m_processWithPageCache = 0;
-
-        static_cast<WebContextSupplement*>(supplement<WebGeolocationManagerProxy>())->processDidClose(process);
-
-        m_processes.removeFirst(process);
-        return;
-    }
-
-    WebContextSupplementMap::const_iterator it = m_supplements.begin();
-    WebContextSupplementMap::const_iterator end = m_supplements.end();
-    for (; it != end; ++it)
-        it->value->processDidClose(process);
-
-    // The vector may have the last reference to process proxy, which in turn may have the last reference to the context.
-    // Since vector elements are destroyed in place, we would recurse into WebProcessProxy destructor
-    // if it were invoked from Vector::remove(). RefPtr delays destruction until it's safe.
     RefPtr<WebProcessProxy> protect(process);
     if (m_processWithPageCache == process)
-        m_processWithPageCache = nullptr;
+        m_processWithPageCache = 0;
+
+    static_cast<WebContextSupplement*>(supplement<WebGeolocationManagerProxy>())->processDidClose(process);
+
     m_processes.removeFirst(process);
 }
 
@@ -851,18 +755,14 @@ Ref<WebPageProxy> WebProcessPool::createWebPage(PageClient& pageClient, Ref<API:
     }
 
     RefPtr<WebProcessProxy> process;
-    if (processModel() == ProcessModelSharedSecondaryProcess) {
-        process = &ensureSharedWebProcess();
-    } else {
-        if (m_haveInitialEmptyProcess) {
-            process = m_processes.last();
-            m_haveInitialEmptyProcess = false;
-        } else if (pageConfiguration->relatedPage()) {
-            // Sharing processes, e.g. when creating the page via window.open().
-            process = &pageConfiguration->relatedPage()->process();
-        } else
-            process = &createNewWebProcessRespectingProcessCountLimit();
-    }
+    if (m_haveInitialEmptyProcess) {
+        process = m_processes.last();
+        m_haveInitialEmptyProcess = false;
+    } else if (pageConfiguration->relatedPage()) {
+        // Sharing processes, e.g. when creating the page via window.open().
+        process = &pageConfiguration->relatedPage()->process();
+    } else
+        process = &createNewWebProcessRespectingProcessCountLimit();
 
     return process->createWebPage(pageClient, WTF::move(pageConfiguration));
 }
@@ -870,18 +770,16 @@ Ref<WebPageProxy> WebProcessPool::createWebPage(PageClient& pageClient, Ref<API:
 DownloadProxy* WebProcessPool::download(WebPageProxy* initiatingPage, const ResourceRequest& request)
 {
     DownloadProxy* downloadProxy = createDownloadProxy(request);
-    uint64_t initiatingPageID = initiatingPage ? initiatingPage->pageID() : 0;
     SessionID sessionID = initiatingPage ? initiatingPage->sessionID() : SessionID::defaultSessionID();
 
-#if ENABLE(NETWORK_PROCESS)
-    if (usesNetworkProcess() && networkProcess()) {
+    if (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);
+    // FIXME: make networkProcess() return a reference so this is not necessary.
+    ASSERT_NOT_REACHED();
     return downloadProxy;
 }
 
@@ -893,25 +791,18 @@ DownloadProxy* WebProcessPool::resumeDownload(const API::Data* resumeData, const
     if (!path.isEmpty())
         SandboxExtension::createHandle(path, SandboxExtension::ReadWrite, sandboxExtensionHandle);
 
-#if ENABLE(NETWORK_PROCESS)
-    if (usesNetworkProcess() && networkProcess()) {
+    if (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);
+    // FIXME: make networkProcess() return a reference so this is not necessary.
+    ASSERT_NOT_REACHED();
     return downloadProxy;
 }
 
 void WebProcessPool::postMessageToInjectedBundle(const String& messageName, API::Object* messageBody)
 {
-    if (m_processes.isEmpty()) {
-        if (processModel() == ProcessModelSharedSecondaryProcess)
-            m_messagesToInjectedBundlePostedToEmptyContext.append(std::make_pair(messageName, messageBody));
-        return;
-    }
-
     for (auto& process : m_processes) {
         // FIXME: Return early if the message body contains any references to WKPageRefs/WKFrameRefs etc. since they're local to a process.
         process->send(Messages::WebProcess::HandleInjectedBundleMessage(messageName, UserData(process->transformObjectsToHandles(messageBody).get())), 0);
@@ -940,7 +831,6 @@ void WebProcessPool::setAdditionalPluginsDirectory(const String& directory)
 }
 #endif // ENABLE(NETSCAPE_PLUGIN_API)
 
-#if ENABLE(NETWORK_PROCESS)
 PlatformProcessIdentifier WebProcessPool::networkProcessIdentifier()
 {
     if (!m_networkProcess)
@@ -948,7 +838,6 @@ PlatformProcessIdentifier WebProcessPool::networkProcessIdentifier()
 
     return m_networkProcess->processIdentifier();
 }
-#endif
 
 void WebProcessPool::setAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)
 {
@@ -988,15 +877,9 @@ void WebProcessPool::setDomainRelaxationForbiddenForURLScheme(const String& urlS
 
 void WebProcessPool::setCanHandleHTTPSServerTrustEvaluation(bool value)
 {
-#if ENABLE(NETWORK_PROCESS)
     m_canHandleHTTPSServerTrustEvaluation = value;
-    if (usesNetworkProcess() && m_networkProcess) {
+    if (m_networkProcess)
         m_networkProcess->send(Messages::NetworkProcess::SetCanHandleHTTPSServerTrustEvaluation(value), 0);
-        return;
-    }
-#else
-    UNUSED_PARAM(value);
-#endif
 }
 
 void WebProcessPool::registerURLSchemeAsLocal(const String& urlScheme)
@@ -1064,10 +947,8 @@ void WebProcessPool::setCacheModel(CacheModel cacheModel)
     m_configuration->setCacheModel(cacheModel);
     sendToAllProcesses(Messages::WebProcess::SetCacheModel(cacheModel));
 
-#if ENABLE(NETWORK_PROCESS)
-    if (usesNetworkProcess() && m_networkProcess)
+    if (m_networkProcess)
         m_networkProcess->send(Messages::NetworkProcess::SetCacheModel(cacheModel), 0);
-#endif
 }
 
 void WebProcessPool::setDefaultRequestTimeoutInterval(double timeoutInterval)
@@ -1077,15 +958,9 @@ 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);
+    ensureNetworkProcess();
+    ASSERT(m_networkProcess);
+    return m_networkProcess->createDownloadProxy(request);
 }
 
 void WebProcessPool::addMessageReceiver(IPC::StringReference messageReceiverName, IPC::MessageReceiver& messageReceiver)
@@ -1182,12 +1057,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,22 +1070,18 @@ void WebProcessPool::useTestingNetworkSession()
 
 void WebProcessPool::allowSpecificHTTPSCertificateForHost(const WebCertificateInfo* certificate, const String& host)
 {
-#if ENABLE(NETWORK_PROCESS)
-    if (usesNetworkProcess() && m_networkProcess) {
+    if (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);
     return;
-#else
-    UNUSED_PARAM(certificate);
-    UNUSED_PARAM(host);
 #endif
 
 #if !PLATFORM(IOS)
+    // FIXME: Why is this only on iOS? Can we remove it?
     ASSERT_NOT_REACHED();
 #endif
 }
@@ -1253,40 +1122,19 @@ void WebProcessPool::getStatistics(uint32_t statisticsMask, std::function<void (
 
 void WebProcessPool::requestWebContentStatistics(StatisticsRequest* request)
 {
-    if (processModel() == ProcessModelSharedSecondaryProcess) {
-        if (m_processes.isEmpty())
-            return;
-        
-        uint64_t requestID = request->addOutstandingRequest();
-        m_statisticsRequests.set(requestID, request);
-        m_processes[0]->send(Messages::WebProcess::GetWebCoreStatistics(requestID), 0);
-
-    } else {
-        // FIXME (Multi-WebProcess) <rdar://problem/13200059>: Make getting statistics from multiple WebProcesses work.
-    }
+    // FIXME (Multi-WebProcess) <rdar://problem/13200059>: Make getting statistics from multiple WebProcesses work.
 }
 
 void WebProcessPool::requestNetworkingStatistics(StatisticsRequest* request)
 {
-    bool networkProcessUnavailable;
-#if ENABLE(NETWORK_PROCESS)
-    networkProcessUnavailable = !usesNetworkProcess() || !m_networkProcess;
-#else
-    networkProcessUnavailable = true;
-#endif
-
-    if (networkProcessUnavailable) {
+    if (!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..307a5ca 100644 (file)
@@ -34,9 +34,9 @@
 #include "GenericCallback.h"
 #include "MessageReceiver.h"
 #include "MessageReceiverMap.h"
+#include "NetworkProcessProxy.h"
 #include "PlugInAutoStartProvider.h"
 #include "PluginInfoStore.h"
-#include "ProcessModel.h"
 #include "ProcessThrottler.h"
 #include "StatisticsRequest.h"
 #include "VisitedLinkStore.h"
 #include "DatabaseProcessProxy.h"
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessProxy.h"
-#endif
-
 #if ENABLE(MEDIA_SESSION)
 #include "WebMediaSessionFocusManager.h"
 #endif
@@ -86,14 +82,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();
@@ -142,9 +136,6 @@ public:
     void setHistoryClient(std::unique_ptr<API::LegacyContextHistoryClient>);
     void setDownloadClient(std::unique_ptr<API::DownloadClient>);
 
-    void setProcessModel(ProcessModel); // Can only be called when there are no processes running.
-    ProcessModel processModel() const { return m_configuration->processModel(); }
-
     void setMaximumNumberOfProcesses(unsigned); // Can only be called when there are no processes running.
     unsigned maximumNumberOfProcesses() const { return !m_configuration->maximumProcessCount() ? UINT_MAX : m_configuration->maximumProcessCount(); }
 
@@ -193,9 +184,7 @@ public:
     void clearPluginClientPolicies();
 #endif
 
-#if ENABLE(NETWORK_PROCESS)
     PlatformProcessIdentifier networkProcessIdentifier();
-#endif
 
     void setAlwaysUsesComplexTextCodePath(bool);
     void setShouldUseFontSmoothing(bool);
@@ -286,16 +275,11 @@ public:
 
     // Network Process Management
 
-    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 +362,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 +482,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;
@@ -539,55 +519,15 @@ private:
 template<typename T>
 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();
+    if (m_networkProcess && m_networkProcess->canSendMessage())
+        m_networkProcess->send(std::forward<T>(message), 0);
 }
 
 template<typename T>
 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();
+    ensureNetworkProcess();
+    m_networkProcess->send(std::forward<T>(message), 0);
 }
 
 template<typename T>
@@ -616,17 +556,12 @@ template<typename T>
 void WebProcessPool::sendToAllProcessesRelaunchingThemIfNecessary(const T& message)
 {
     // FIXME (Multi-WebProcess): WebProcessPool doesn't track processes that have exited, so it cannot relaunch these. Perhaps this functionality won't be needed in this mode.
-    if (processModel() == ProcessModelSharedSecondaryProcess)
-        ensureSharedWebProcess();
     sendToAllProcesses(message);
 }
 
 template<typename T>
 void WebProcessPool::sendToOneProcess(T&& message)
 {
-    if (processModel() == ProcessModelSharedSecondaryProcess)
-        ensureSharedWebProcess();
-
     bool messageSent = false;
     size_t processCount = m_processes.size();
     for (size_t i = 0; i < processCount; ++i) {
@@ -638,7 +573,7 @@ void WebProcessPool::sendToOneProcess(T&& message)
         }
     }
 
-    if (!messageSent && processModel() == ProcessModelMultipleSecondaryProcesses) {
+    if (!messageSent) {
         warmInitialProcess();
         RefPtr<WebProcessProxy> process = m_processes.last();
         if (process->canSendMessage())
index 1912cda..0d31c04 100644 (file)
@@ -256,7 +256,7 @@ void WebProcessProxy::removeWebPage(uint64_t pageID)
 
     // If this was the last WebPage open in that web process, and we have no other reason to keep it alive, let it go.
     // We only allow this when using a network process, as otherwise the WebProcess needs to preserve its session state.
-    if (!m_processPool->usesNetworkProcess() || state() == State::Terminated || !canTerminateChildProcess())
+    if (state() == State::Terminated || !canTerminateChildProcess())
         return;
 
     shutDown();
@@ -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)
@@ -702,18 +700,6 @@ void WebProcessProxy::updateTextCheckerState()
         send(Messages::WebProcess::SetTextCheckerState(TextChecker::state()), 0);
 }
 
-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);
-
-    return m_downloadProxyMap->createDownloadProxy(m_processPool, request);
-}
-
 void WebProcessProxy::didSaveToPageCache()
 {
     m_processPool->processDidCachePage(this);
@@ -947,7 +933,6 @@ void WebProcessProxy::didCancelProcessSuspension()
     m_throttler.didCancelProcessSuspension();
 }
 
-#if ENABLE(NETWORK_PROCESS)
 void WebProcessProxy::reinstateNetworkProcessAssertionState(NetworkProcessProxy& newNetworkProcessProxy)
 {
 #if PLATFORM(IOS)
@@ -962,11 +947,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) {
@@ -978,14 +962,12 @@ void WebProcessProxy::didSetAssertionState(AssertionState state)
         break;
 
     case AssertionState::Background:
-        if (processPool().usesNetworkProcess())
-            m_backgroundTokenForNetworkProcess = processPool().ensureNetworkProcess().throttler().backgroundActivityToken();
+        m_backgroundTokenForNetworkProcess = processPool().ensureNetworkProcess().throttler().backgroundActivityToken();
         m_foregroundTokenForNetworkProcess = nullptr;
         break;
     
     case AssertionState::Foreground:
-        if (processPool().usesNetworkProcess())
-            m_foregroundTokenForNetworkProcess = processPool().ensureNetworkProcess().throttler().foregroundActivityToken();
+        m_foregroundTokenForNetworkProcess = processPool().ensureNetworkProcess().throttler().foregroundActivityToken();
         m_backgroundTokenForNetworkProcess = nullptr;
         for (auto& page : m_pageMap.values())
             page->processWillBecomeForeground();
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..d826a01 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()
@@ -98,16 +95,6 @@ void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters&
         parameters.urlSchemesRegisteredAsLocal.append("resource");
     }
 
-    if (!usesNetworkProcess()) {
-        parameters.urlSchemesRegisteredForCustomProtocols = supplement<WebSoupCustomProtocolRequestManager>()->registeredSchemesForCustomProtocols();
-
-        supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
-        parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
-
-        parameters.ignoreTLSErrors = m_ignoreTLSErrors;
-        parameters.diskCacheDirectory = m_configuration->diskCacheDirectory();
-    }
-
     parameters.memoryCacheDisabled = m_memoryCacheDisabled || cacheModel() == CacheModelDocumentViewer;
 }
 
@@ -149,13 +136,8 @@ String WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory()
 void WebProcessPool::setIgnoreTLSErrors(bool ignoreTLSErrors)
 {
     m_ignoreTLSErrors = ignoreTLSErrors;
-#if ENABLE(NETWORK_PROCESS)
-    if (usesNetworkProcess() && networkProcess()) {
+    if (networkProcess())
         networkProcess()->send(Messages::NetworkProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors), 0);
-        return;
-    }
-#endif
-    sendToAllProcesses(Messages::WebProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors));
 }
 
 } // namespace WebKit
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 e0242e2..8ac0955 100644 (file)
                BC5750981268F3C6006F0F12 /* WebPopupMenuProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */; };
                BC575613126E0138006F0F12 /* APIError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC575612126E0138006F0F12 /* APIError.cpp */; };
                BC59548915C7868500FD1E3E /* WebKit2.h in Headers */ = {isa = PBXBuildFile; fileRef = BC59548815C7868500FD1E3E /* WebKit2.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               BC597075116591D000551FCA /* ProcessModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BC597074116591D000551FCA /* ProcessModel.h */; };
                BC5C75C814954DA600BC4775 /* WKConnectionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5C75C614954DA600BC4775 /* WKConnectionInternal.h */; };
                BC5D24A116CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
                BC5D24A216CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
                BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPopupMenuProxyMac.mm; sourceTree = "<group>"; };
                BC575612126E0138006F0F12 /* APIError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIError.cpp; sourceTree = "<group>"; };
                BC59548815C7868500FD1E3E /* WebKit2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2.h; sourceTree = "<group>"; };
-               BC597074116591D000551FCA /* ProcessModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessModel.h; sourceTree = "<group>"; };
                BC5C75C614954DA600BC4775 /* WKConnectionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKConnectionInternal.h; sourceTree = "<group>"; };
                BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ChildProcessMain.mm; sourceTree = "<group>"; };
                BC5D24B816CC40BB007D5461 /* BaseLegacyProcess.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BaseLegacyProcess.xcconfig; sourceTree = "<group>"; };
                                1AC7537A183A9FDB0072CB15 /* PageLoadState.h */,
                                37716A59195B910500EE8B1B /* ProcessAssertion.cpp */,
                                86F9536018FF4FD4001DB2EF /* ProcessAssertion.h */,
-                               BC597074116591D000551FCA /* ProcessModel.h */,
                                86E67A22190F411800004AB7 /* ProcessThrottler.cpp */,
                                86E67A21190F411800004AB7 /* ProcessThrottler.h */,
                                83048AE51ACA45DC0082C832 /* ProcessThrottlerClient.h */,
                                E1CC1B9012D7EADF00625838 /* PrintInfo.h in Headers */,
                                86F9536518FF58F5001DB2EF /* ProcessAssertion.h in Headers */,
                                BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */,
-                               BC597075116591D000551FCA /* ProcessModel.h in Headers */,
                                86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */,
                                83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */,
                                2D7F13101A702FBA009A6FBD /* ProcessType.h in Headers */,
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..7f44bea 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"
@@ -40,8 +38,6 @@ namespace WebKit {
 
 void BlobRegistryProxy::registerFileBlobURL(const WebCore::URL& url, PassRefPtr<BlobDataFileReference> file, const String& contentType)
 {
-    ASSERT(WebProcess::singleton().usesNetworkProcess());
-
     SandboxExtension::Handle extensionHandle;
 
     // File path can be empty when submitting a form file input without a file, see bug 111778.
@@ -53,36 +49,26 @@ void BlobRegistryProxy::registerFileBlobURL(const WebCore::URL& url, PassRefPtr<
 
 void BlobRegistryProxy::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
 {
-    ASSERT(WebProcess::singleton().usesNetworkProcess());
-
     WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURL(url, blobParts, contentType), 0);
 }
 
 void BlobRegistryProxy::registerBlobURL(const URL& url, const URL& srcURL)
 {
-    ASSERT(WebProcess::singleton().usesNetworkProcess());
-
     WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLFromURL(url, srcURL), 0);
 }
 
 void BlobRegistryProxy::unregisterBlobURL(const URL& url)
 {
-    ASSERT(WebProcess::singleton().usesNetworkProcess());
-
     WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::UnregisterBlobURL(url), 0);
 }
 
 void BlobRegistryProxy::registerBlobURLForSlice(const URL& url, const URL& srcURL, long long start, long long end)
 {
-    ASSERT(WebProcess::singleton().usesNetworkProcess());
-
     WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLForSlice(url, srcURL, start, end), 0);
 }
 
 unsigned long long BlobRegistryProxy::blobSize(const URL& url)
 {
-    ASSERT(WebProcess::singleton().usesNetworkProcess());
-
     uint64_t resultSize;
     if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::BlobSize(url), Messages::NetworkConnectionToWebProcess::BlobSize::Reply(resultSize), 0))
         return 0;
@@ -90,5 +76,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..8d22ec9 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,114 +109,56 @@ 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;
-        if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesForDOM(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(result), 0))
-            return String();
-        return result;
-    }
-#endif
-
-    return WebCore::cookiesForDOM(session, firstParty, url);
+    String result;
+    if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesForDOM(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(result), 0))
+        return String();
+    return result;
 }
 
 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);
+    webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetCookiesFromDOM(SessionTracker::sessionID(session), firstParty, url, cookieString), 0);
 }
 
 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;
-        if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesEnabled(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesEnabled::Reply(result), 0))
-            return false;
-        return result;
-    }
-#endif
-
-    return WebCore::cookiesEnabled(session, firstParty, url);
+    bool result;
+    if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesEnabled(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesEnabled::Reply(result), 0))
+        return false;
+    return result;
 }
 
 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;
-        if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue::Reply(result), 0))
-            return String();
-        return result;
-    }
-#endif
-
-    return WebCore::cookieRequestHeaderFieldValue(session, firstParty, url);
+    String result;
+    if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue::Reply(result), 0))
+        return String();
+    return result;
 }
 
 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);
+    if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::GetRawCookies(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::GetRawCookies::Reply(rawCookies), 0))
+        return false;
+    return true;
 }
 
 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);
+    WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::DeleteCookie(SessionTracker::sessionID(session), url, cookieName), 0);
 }
 
 // LoaderStrategy
 
-#if ENABLE(NETWORK_PROCESS)
 ResourceLoadScheduler* WebPlatformStrategies::resourceLoadScheduler()
 {
-    static ResourceLoadScheduler* scheduler;
-    if (!scheduler) {
-        auto& webProcess = WebProcess::singleton();
-        if (webProcess.usesNetworkProcess())
-            scheduler = &webProcess.webResourceLoadScheduler();
-        else
-            scheduler = WebCore::resourceLoadScheduler();
-    }
-    
-    return scheduler;
+    return &WebProcess::singleton().webResourceLoadScheduler();
 }
 
 void WebPlatformStrategies::loadResourceSynchronously(NetworkingContext* context, unsigned long resourceLoadIdentifier, const ResourceRequest& request, StoredCredentials storedCredentials, ClientCredentialPolicy clientCredentialPolicy, ResourceError& error, ResourceResponse& response, Vector<char>& data)
 {
-    auto& webProcess = WebProcess::singleton();
-    if (!webProcess.usesNetworkProcess()) {
-        LoaderStrategy::loadResourceSynchronously(context, resourceLoadIdentifier, request, storedCredentials, clientCredentialPolicy, error, response, data);
-        return;
-    }
-
     WebFrameNetworkingContext* webContext = static_cast<WebFrameNetworkingContext*>(context);
     // FIXME: Some entities in WebCore use WebCore's "EmptyFrameLoaderClient" instead of having a proper WebFrameLoaderClient.
     // EmptyFrameLoaderClient shouldn't exist and everything should be using a WebFrameLoaderClient,
@@ -243,7 +182,7 @@ void WebPlatformStrategies::loadResourceSynchronously(NetworkingContext* context
 
     HangDetectionDisabler hangDetectionDisabler;
 
-    if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
+    if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
         response = ResourceResponse();
         error = internalError(request.url());
     }
@@ -256,12 +195,6 @@ void WebPlatformStrategies::createPingHandle(NetworkingContext* networkingContex
     if (!networkingContext)
         return;
 
-    auto& webProcess = WebProcess::singleton();
-    if (!webProcess.usesNetworkProcess()) {
-        LoaderStrategy::createPingHandle(networkingContext, request, shouldUseCredentialStorage);
-        return;
-    }
-
     WebFrameNetworkingContext* webContext = static_cast<WebFrameNetworkingContext*>(networkingContext);
     WebFrameLoaderClient* webFrameLoaderClient = webContext->webFrameLoaderClient();
     WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : nullptr;
@@ -273,16 +206,13 @@ void WebPlatformStrategies::createPingHandle(NetworkingContext* networkingContex
     loadParameters.allowStoredCredentials = shouldUseCredentialStorage ? AllowStoredCredentials : DoNotAllowStoredCredentials;
     loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = networkingContext->shouldClearReferrerOnHTTPSToHTTPRedirect();
 
-    webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::LoadPing(loadParameters), 0);
+    WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::LoadPing(loadParameters), 0);
 }
 
 BlobRegistry* WebPlatformStrategies::createBlobRegistry()
 {
-    if (!WebProcess::singleton().usesNetworkProcess())
-        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..dc2a50c 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
@@ -257,23 +254,9 @@ void WebFrame::startDownload(const WebCore::ResourceRequest& request)
     m_policyDownloadID = 0;
 
     auto& webProcess = WebProcess::singleton();
-#if USE(NETWORK_SESSION)
-    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.
-    RELEASE_ASSERT_NOT_REACHED();
-#else
-    webProcess.downloadManager().startDownload(sessionID, policyDownloadID, request);
-#endif
+    webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::StartDownload(sessionID, policyDownloadID, request), 0);
+    return;
 }
 
 void WebFrame::convertMainResourceLoadToDownload(DocumentLoader* documentLoader, SessionID sessionID, const ResourceRequest& request, const ResourceResponse& response)
@@ -286,39 +269,12 @@ 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
-    if (webProcess.usesNetworkProcess()) {
-        // Use 0 to indicate that the resource load can't be converted and a new download must be started.
-        // This can happen if there is no loader because the main resource is in the WebCore memory cache,
-        // or because the conversion was attempted when not calling SubresourceLoader::didReceiveResponse().
-        uint64_t mainResourceLoadIdentifier;
-        if (mainResourceLoader)
-            mainResourceLoadIdentifier = mainResourceLoader->identifier();
-        else
-            mainResourceLoadIdentifier = 0;
-
-        webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ConvertMainResourceLoadToDownload(sessionID, mainResourceLoadIdentifier, policyDownloadID, request, response), 0);
-        return;
-    }
-#endif
+    // Use 0 to indicate that the resource load can't be converted and a new download must be started.
+    // This can happen if there is no loader because the main resource is in the WebCore memory cache,
+    // or because the conversion was attempted when not calling SubresourceLoader::didReceiveResponse().
+    uint64_t mainResourceLoadIdentifier = mainResourceLoader ? mainResourceLoader->identifier() : 0;
 
-    if (!mainResourceLoader) {
-        // The main resource has already been loaded. Start a new download instead.
-#if !USE(NETWORK_SESSION)
-        webProcess.downloadManager().startDownload(sessionID, policyDownloadID, request);
-#endif
-        return;
-    }
-
-#if USE(NETWORK_SESSION)
-    // Using NETWORK_SESSION requires the use of a network process.
-    RELEASE_ASSERT_NOT_REACHED();
-#else
-    webProcess.downloadManager().convertHandleToDownload(policyDownloadID, documentLoader->mainResourceLoader()->handle(), request, response);
-#endif
+    webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ConvertMainResourceLoadToDownload(sessionID, mainResourceLoadIdentifier, policyDownloadID, request, response), 0);
 }
 
 String WebFrame::source() const
index 38a4d8f..d9b0a7b 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,8 @@ 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
@@ -252,34 +244,10 @@ void WebProcess::initializeConnection(IPC::Connection* connection)
     connection->setOnlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(true);
 }
 
-void WebProcess::didCreateDownload()
-{
-    disableTermination();
-}
-
-void WebProcess::didDestroyDownload()
-{
-    enableTermination();
-}
-
-IPC::Connection* WebProcess::downloadProxyConnection()
-{
-    return parentProcessConnection();
-}
-
-AuthenticationManager& WebProcess::downloadsAuthenticationManager()
-{
-    return *supplement<AuthenticationManager>();
-}
-
 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);
 #endif
@@ -358,13 +326,10 @@ void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters)
     if (parameters.shouldUseTestingNetworkSession)
         NetworkStorageSession::switchToNewTestingSession();
 
-#if ENABLE(NETWORK_PROCESS)
     ensureNetworkProcessConnection();
 
 #if PLATFORM(COCOA)
-    if (usesNetworkProcess())
-        CookieStorageShim::singleton().initialize();
-#endif
+    CookieStorageShim::singleton().initialize();
 #endif
     setTerminationTimeout(parameters.terminationTimeout);
 
@@ -396,12 +361,8 @@ void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters)
 #endif
 }
 
-#if ENABLE(NETWORK_PROCESS)
 void WebProcess::ensureNetworkProcessConnection()
 {
-    if (!m_usesNetworkProcess)
-        return;
-
     if (m_networkProcessConnection)
         return;
 
@@ -422,7 +383,6 @@ void WebProcess::ensureNetworkProcessConnection()
         return;
     m_networkProcessConnection = NetworkProcessConnection::create(connectionIdentifier);
 }
-#endif // ENABLE(NETWORK_PROCESS)
 
 void WebProcess::registerURLSchemeAsEmptyDocument(const String& urlScheme)
 {
@@ -511,14 +471,6 @@ void WebProcess::destroyPrivateBrowsingSession(SessionID sessionID)
 #endif
 }
 
-DownloadManager& WebProcess::downloadManager()
-{
-    ASSERT(!usesNetworkProcess());
-
-    static NeverDestroyed<DownloadManager> downloadManager(this);
-    return downloadManager;
-}
-
 #if ENABLE(NETSCAPE_PLUGIN_API)
 PluginProcessConnectionManager& WebProcess::pluginProcessConnectionManager()
 {
@@ -581,7 +533,6 @@ void WebProcess::removeWebPage(uint64_t pageID)
 bool WebProcess::shouldTerminate()
 {
     ASSERT(m_pageMap.isEmpty());
-    ASSERT(usesNetworkProcess() || !downloadManager().isDownloading());
 
     // FIXME: the ShouldTerminate message should also send termination parameters, such as any session cookies that need to be preserved.
     bool shouldTerminate = false;
@@ -1025,20 +976,8 @@ void WebProcess::setInjectedBundleParameters(const IPC::DataReference& value)
     injectedBundle->setBundleParameters(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);
-
     // If we've lost our connection to the network process (e.g. it crashed) try to re-establish it.
     if (!m_networkProcessConnection)
         ensureNetworkProcessConnection();
@@ -1064,7 +1003,6 @@ WebResourceLoadScheduler& WebProcess::webResourceLoadScheduler()
 {
     return *m_webResourceLoadScheduler;
 }
-#endif // ENABLED(NETWORK_PROCESS)
 
 #if ENABLE(DATABASE_PROCESS)
 void WebProcess::webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection* connection)
@@ -1108,27 +1046,6 @@ void WebProcess::ensureWebToDatabaseProcessConnection()
 
 #endif // ENABLED(DATABASE_PROCESS)
 
-void WebProcess::downloadRequest(SessionID sessionID, uint64_t downloadID, uint64_t initiatingPageID, const ResourceRequest& request)
-{
-    WebPage* initiatingPage = initiatingPageID ? webPage(initiatingPageID) : 0;
-
-    ResourceRequest requestWithOriginalURL = request;
-    if (initiatingPage)
-        initiatingPage->mainFrame()->loader().setOriginalURLForDownloadRequest(requestWithOriginalURL);
-
-    downloadManager().startDownload(sessionID, downloadID, requestWithOriginalURL);
-}
-
-void WebProcess::resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const WebKit::SandboxExtension::Handle& sandboxExtensionHandle)
-{
-    downloadManager().resumeDownload(downloadID, resumeData, path, sandboxExtensionHandle);
-}
-
-void WebProcess::cancelDownload(uint64_t downloadID)
-{
-    downloadManager().cancelDownload(downloadID);
-}
-
 void WebProcess::setEnhancedAccessibility(bool flag)
 {
     WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility(flag);
@@ -1470,18 +1387,12 @@ 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);
-        // The DNS prefetched hosts cache is only to avoid asking for the same hosts too many times
-        // in a very short period of time, producing a lot of IPC traffic. So we clear this cache after
-        // some time of no DNS requests.
-        m_dnsPrefetchHystereris.impulse();
-        return;
-    }
-#endif
-    WebCore::prefetchDNS(hostname);
+    if (m_dnsPrefetchedHosts.add(hostname).isNewEntry)
+        networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::PrefetchDNS(hostname), 0);
+    // The DNS prefetched hosts cache is only to avoid asking for the same hosts too many times
+    // in a very short period of time, producing a lot of IPC traffic. So we clear this cache after
+    // some time of no DNS requests.
+    m_dnsPrefetchHystereris.impulse();
 }
 
 } // namespace WebKit
index 27006e5..4749459 100644 (file)
@@ -28,7 +28,6 @@
 
 #include "CacheModel.h"
 #include "ChildProcess.h"
-#include "DownloadManager.h"
 #include "DrawingArea.h"
 #include "PluginProcessConnectionManager.h"
 #include "ResourceCachesToClear.h"
@@ -71,9 +70,9 @@ struct SecurityOriginData;
 
 namespace WebKit {
 
-class DownloadManager;
 class EventDispatcher;
 class InjectedBundle;
+class NetworkProcessConnection;
 class ObjCObjectGraph;
 class UserData;
 class WebConnectionToUIProcess;
@@ -82,22 +81,17 @@ 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
 
-class WebProcess : public ChildProcess, private DownloadManager::Client {
-    friend class NeverDestroyed<DownloadManager>;
+class WebProcess : public ChildProcess {
 public:
     static WebProcess& singleton();
 
@@ -147,7 +141,6 @@ public:
 #endif
     
     const TextCheckerState& textCheckerState() const { return m_textCheckerState; }
-    DownloadManager& downloadManager();
 
     void clearResourceCaches(ResourceCachesToClear = AllResourceCaches);
     
@@ -157,13 +150,9 @@ public:
 
     EventDispatcher& eventDispatcher() { return *m_eventDispatcher; }
 
-    bool usesNetworkProcess() const;
-
-#if ENABLE(NETWORK_PROCESS)
     NetworkProcessConnection* networkConnection();
     void networkProcessConnectionClosed(NetworkProcessConnection*);
     WebResourceLoadScheduler& webResourceLoadScheduler();
-#endif
 
 #if ENABLE(DATABASE_PROCESS)
     void webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection*);
@@ -222,12 +211,6 @@ private:
     WebProcess();
     ~WebProcess();
 
-    // DownloadManager::Client.
-    virtual void didCreateDownload() override;
-    virtual void didDestroyDownload() override;
-    virtual IPC::Connection* downloadProxyConnection() override;
-    virtual AuthenticationManager& downloadsAuthenticationManager() override;
-
     void initializeWebProcess(WebProcessCreationParameters&&);
     void platformInitializeWebProcess(WebProcessCreationParameters&&);
 
@@ -359,14 +342,11 @@ 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 d4372ce..461027e 100644 (file)
@@ -62,12 +62,6 @@ messages -> WebProcess LegacyReceiver {
     void StartMemorySampler(WebKit::SandboxExtension::Handle sampleLogFileHandle, String sampleLogFilePath, double interval);
     void StopMemorySampler();
 
-    # Downloads. This should really be in a Download.messages.in, but it seemed unnecessary to create a new file just for
-    # three messages.
-    DownloadRequest(WebCore::SessionID sessionID, uint64_t downloadID, uint64_t initiatingPageID, WebCore::ResourceRequest request)
-    ResumeDownload(uint64_t downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
-    CancelDownload(uint64_t downloadID)
-
     SetTextCheckerState(struct WebKit::TextCheckerState textCheckerState)
 
     SetEnhancedAccessibility(bool flag)
index 325be46..e39e15c 100644 (file)
 
 namespace WebKit {
 
-static uint64_t getCacheDiskFreeSize(SoupCache* cache)
-{
-    ASSERT(cache);
-
-    GUniqueOutPtr<char> cacheDir;
-    g_object_get(G_OBJECT(cache), "cache-dir", &cacheDir.outPtr(), NULL);
-    if (!cacheDir)
-        return 0;
-
-    return WebCore::getVolumeFreeSizeForPath(cacheDir.get());
-}
-
 void WebProcess::platformSetCacheModel(CacheModel cacheModel)
 {
     unsigned cacheTotalCapacity = 0;
@@ -73,12 +61,6 @@ void WebProcess::platformSetCacheModel(CacheModel cacheModel)
     unsigned long urlCacheDiskCapacity = 0;
 
     uint64_t diskFreeSize = 0;
-    SoupCache* cache = nullptr;
-
-    if (!usesNetworkProcess()) {
-        cache = WebCore::SoupNetworkSession::defaultSession().cache();
-        diskFreeSize = getCacheDiskFreeSize(cache) / WTF::MB;
-    }
 
     uint64_t memSize = WTF::ramSize() / WTF::MB;
     calculateCacheSizes(cacheModel, memSize, diskFreeSize,
@@ -94,33 +76,10 @@ void WebProcess::platformSetCacheModel(CacheModel cacheModel)
 #if PLATFORM(GTK)
     WebCore::PageCache::singleton().setShouldClearBackingStores(true);
 #endif
-
-    if (!usesNetworkProcess()) {
-        if (urlCacheDiskCapacity > soup_cache_get_max_size(cache))
-            soup_cache_set_max_size(cache, urlCacheDiskCapacity);
-    }
 }
 
 void WebProcess::platformClearResourceCaches(ResourceCachesToClear cachesToClear)
 {
-    if (cachesToClear == InMemoryResourceCachesOnly)
-        return;
-
-    // If we're using the network process then it is the only one that needs to clear the disk cache.
-    if (usesNetworkProcess())
-        return;
-
-    soup_cache_clear(WebCore::SoupNetworkSession::defaultSession().cache());
-}
-
-static void setSoupSessionAcceptLanguage(const Vector<String>& languages)
-{
-    WebCore::SoupNetworkSession::defaultSession().setAcceptLanguages(languages);
-}
-
-static void languageChanged(void*)
-{
-    setSoupSessionAcceptLanguage(WebCore::userPreferredLanguages());
 }
 
 void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& parameters)
@@ -135,62 +94,18 @@ void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& par
         seccompFilters.initialize();
     }
 #endif
-
-    if (usesNetworkProcess())
-        return;
-
-    ASSERT(!parameters.diskCacheDirectory.isEmpty());
-
-    // We used to use the given cache directory for the soup cache, but now we use a subdirectory to avoid
-    // conflicts with other cache files in the same directory. Remove the old cache files if they still exist.
-    WebCore::SoupNetworkSession::defaultSession().clearCache(WebCore::directoryName(parameters.diskCacheDirectory));
-
-#if ENABLE(NETWORK_CACHE)
-    // When network cache is enabled, the disk cache directory is the network process one.
-    CString diskCachePath = WebCore::pathByAppendingComponent(WebCore::directoryName(parameters.diskCacheDirectory), "webkit").utf8();
-#else
-    CString diskCachePath = parameters.diskCacheDirectory.utf8();
-#endif
-
-    GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(diskCachePath.data(), SOUP_CACHE_SINGLE_USER));
-    WebCore::SoupNetworkSession::defaultSession().setCache(soupCache.get());
-    // Set an initial huge max_size for the SoupCache so the call to soup_cache_load() won't evict any cached
-    // resource. The final size of the cache will be set by NetworkProcess::platformSetCacheModel().
-    unsigned initialMaxSize = soup_cache_get_max_size(soupCache.get());
-    soup_cache_set_max_size(soupCache.get(), G_MAXUINT);
-    soup_cache_load(soupCache.get());
-    soup_cache_set_max_size(soupCache.get(), initialMaxSize);
-
-    if (!parameters.cookiePersistentStoragePath.isEmpty()) {
-        supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStoragePath,
-            parameters.cookiePersistentStorageType);
-    }
-    supplement<WebCookieManager>()->setHTTPCookieAcceptPolicy(parameters.cookieAcceptPolicy);
-
-    if (!parameters.languages.isEmpty())
-        setSoupSessionAcceptLanguage(parameters.languages);
-
-    setIgnoreTLSErrors(parameters.ignoreTLSErrors);
-
-    WebCore::addLanguageChangeObserver(this, languageChanged);
 }
 
 void WebProcess::platformTerminate()
 {
-    if (!usesNetworkProcess())
-        WebCore::removeLanguageChangeObserver(this);
 }
 
 void WebProcess::setIgnoreTLSErrors(bool ignoreTLSErrors)
 {
-    ASSERT(!usesNetworkProcess());
-    WebCore::ResourceHandle::setIgnoreSSLErrors(ignoreTLSErrors);
 }
 
 void WebProcess::allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo& certificateInfo, const String& host)
 {
-    ASSERT(!usesNetworkProcess());
-    WebCore::ResourceHandle::setClientCertificate(host, certificateInfo.certificate());
 }
 
 } // namespace WebKit
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 811c9e5..bc83089 100644 (file)
@@ -106,7 +106,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)
index 3d5f459..de3d8d4 100644 (file)
@@ -1,3 +1,15 @@
+2015-11-19  Alex Christensen  <achristensen@webkit.org>
+
+        Remove the non-NetworkProcess configurations
+        https://bugs.webkit.org/show_bug.cgi?id=151418
+
+        Reviewed by Geoffrey Garen.
+
+        * TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp:
+        (TestWebKitAPI::TEST):
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::generatePageConfiguration):
+
 2015-11-19  Alexey Proskuryakov  <ap@apple.com>
 
         LayoutTestRelay processes leak on iOS testers
index c5c3eff..7cd4f7c 100644 (file)
@@ -42,7 +42,6 @@ static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us
 TEST(WebKit2, GetPIDAfterAbortedProcessLaunch)
 {
     WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
-    WKContextSetUsesNetworkProcess(context.get(), true);
 
     PlatformWebView webView(context.get());
 
index 0b592d0..1bf5cc5 100644 (file)
@@ -400,11 +400,6 @@ WKRetainPtr<WKPageConfigurationRef> TestController::generatePageConfiguration(WK
 
     m_geolocationProvider = std::make_unique<GeolocationProviderMock>(m_context.get());
 
-#if PLATFORM(EFL)
-    WKContextSetUsesNetworkProcess(m_context.get(), false);
-    WKContextSetProcessModel(m_context.get(), kWKProcessModelSharedSecondaryProcess);
-#endif
-
     if (const char* dumpRenderTreeTemp = libraryPathForTesting()) {
         String temporaryFolder = String::fromUTF8(dumpRenderTreeTemp);