<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[192697] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/192697">192697</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-11-20 14:10:52 -0800 (Fri, 20 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove NETWORK_PROCESS compile flag
https://bugs.webkit.org/show_bug.cgi?id=151512
Reviewed by Tim Horton.
.:
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFeatures.cmake:
Source/WebKit2:
* CMakeLists.txt:
* NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm:
(NetworkProcessMain):
* NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm:
(NetworkServiceInitializer):
* NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
(WebKit::NetworkBlobRegistry::filesInBlob):
* NetworkProcess/FileAPI/NetworkBlobRegistry.h:
* NetworkProcess/NetworkConnectionToWebProcess.cpp:
(WebKit::NetworkConnectionToWebProcess::blobSize):
* NetworkProcess/NetworkConnectionToWebProcess.h:
* NetworkProcess/NetworkConnectionToWebProcess.messages.in:
* NetworkProcess/NetworkLoad.cpp:
* NetworkProcess/NetworkLoad.h:
* NetworkProcess/NetworkLoadClient.h:
* NetworkProcess/NetworkLoadParameters.cpp:
(WebKit::NetworkLoadParameters::NetworkLoadParameters):
* NetworkProcess/NetworkLoadParameters.h:
* NetworkProcess/NetworkProcess.cpp:
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:
* NetworkProcess/NetworkResourceLoader.cpp:
* NetworkProcess/NetworkResourceLoader.h:
* NetworkProcess/NetworkResourceLoader.messages.in:
* NetworkProcess/cocoa/NetworkProcessCocoa.mm:
(WebKit::NetworkProcess::clearDiskCache):
* NetworkProcess/efl/NetworkProcessMainEfl.cpp:
(WebKit::NetworkProcessMainUnix):
* NetworkProcess/gtk/NetworkProcessMainGtk.cpp:
(WebKit::NetworkProcessMainUnix):
* NetworkProcess/ios/NetworkProcessIOS.mm:
* NetworkProcess/mac/NetworkLoadMac.mm:
* NetworkProcess/mac/NetworkProcessMac.mm:
* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
(WebKit::NetworkResourceLoader::willCacheResponseAsync):
* NetworkProcess/soup/NetworkProcessSoup.cpp:
(WebKit::NetworkProcess::platformTerminate):
* NetworkProcess/soup/RemoteNetworkingContextSoup.cpp:
(WebKit::RemoteNetworkingContext::storageSession):
* Shared/Authentication/AuthenticationManager.cpp:
(WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
* Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:
(WebKit::CustomProtocolManager::initialize):
(WebKit::CustomProtocolManager::addCustomProtocol):
* Shared/Network/CustomProtocols/CustomProtocolManager.h:
* Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp:
(WebKit::CustomProtocolManager::supplementName):
(WebKit::CustomProtocolManager::initialize):
(WebKit::CustomProtocolManager::registerScheme):
* Shared/Network/NetworkProcessCreationParameters.cpp:
(WebKit::NetworkProcessCreationParameters::decode):
* Shared/Network/NetworkProcessCreationParameters.h:
* Shared/Network/NetworkProcessSupplement.h:
(WebKit::NetworkProcessSupplement::initialize):
* Shared/Network/NetworkResourceLoadParameters.cpp:
(WebKit::NetworkResourceLoadParameters::decode):
* Shared/Network/NetworkResourceLoadParameters.h:
* Shared/ProcessExecutablePath.h:
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* Shared/efl/ProcessExecutablePathEfl.cpp:
(WebKit::executablePathOfPluginProcess):
(WebKit::executablePathOfNetworkProcess):
(WebKit::executablePathOfDatabaseProcess):
* Shared/gtk/ProcessExecutablePathGtk.cpp:
(WebKit::executablePathOfPluginProcess):
(WebKit::executablePathOfNetworkProcess):
(WebKit::executablePathOfDatabaseProcess):
* Shared/mac/CookieStorageShim.h:
* Shared/mac/CookieStorageShim.mm:
(-[WKNSURLSessionLocal _getCookieHeadersForTask:completionHandler:]):
* Shared/mac/CookieStorageShimLibrary.cpp:
* Shared/mac/CookieStorageShimLibrary.h:
* UIProcess/API/APISession.cpp:
(API::Session::~Session):
* UIProcess/API/C/mac/WKContextPrivateMac.mm:
(WKContextGetNetworkProcessIdentifier):
* UIProcess/API/efl/ewk_context.cpp:
(ewk_context_process_model_set):
(ewk_context_process_model_get):
(ewk_context_tls_error_policy_get):
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::updateProcessSuppressionState):
(WebKit::WebProcessPool::platformInitializeWebProcess):
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
(WebKit::WebProcessPool::platformInvalidateContext):
* UIProcess/Downloads/DownloadProxy.cpp:
(WebKit::DownloadProxy::cancel):
* UIProcess/Launcher/ProcessLauncher.cpp:
(WebKit::ProcessLauncher::processTypeAsString):
(WebKit::ProcessLauncher::getProcessTypeFromString):
* UIProcess/Launcher/ProcessLauncher.h:
* UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
(WebKit::ProcessLauncher::launchProcess):
* UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
(WebKit::ProcessLauncher::launchProcess):
* UIProcess/Launcher/mac/ProcessLauncherMac.mm:
(WebKit::computeProcessShimPath):
(WebKit::serviceName):
(WebKit::shouldLeakBoost):
(WebKit::createProcess):
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::setIsHoldingLockedFiles):
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/Network/NetworkProcessProxy.messages.in:
* UIProcess/Network/mac/NetworkProcessProxyMac.mm:
(WebKit::NetworkProcessProxy::platformGetLaunchOptions):
* UIProcess/Network/soup/NetworkProcessProxySoup.cpp:
(WebKit::NetworkProcessProxy::platformGetLaunchOptions):
* UIProcess/WebCookieManagerProxy.cpp:
(WebKit::WebCookieManagerProxy::setHTTPCookieAcceptPolicy):
(WebKit::WebCookieManagerProxy::getHTTPCookieAcceptPolicy):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::setSessionID):
(WebKit::WebPageProxy::initializeWebPage):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::WebProcessPool):
(WebKit::WebProcessPool::~WebProcessPool):
(WebKit::WebProcessPool::initializeClient):
(WebKit::WebProcessPool::networkingProcessConnection):
(WebKit::WebProcessPool::languageChanged):
(WebKit::WebProcessPool::setUsesNetworkProcess):
(WebKit::WebProcessPool::usesNetworkProcess):
(WebKit::WebProcessPool::ensureNetworkProcess):
(WebKit::WebProcessPool::getNetworkProcessConnection):
(WebKit::WebProcessPool::ensureDatabaseProcess):
(WebKit::WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled):
(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::download):
(WebKit::WebProcessPool::resumeDownload):
(WebKit::WebProcessPool::setAdditionalPluginsDirectory):
(WebKit::WebProcessPool::networkProcessIdentifier):
(WebKit::WebProcessPool::setAlwaysUsesComplexTextCodePath):
(WebKit::WebProcessPool::setCanHandleHTTPSServerTrustEvaluation):
(WebKit::WebProcessPool::registerURLSchemeAsLocal):
(WebKit::WebProcessPool::setCacheModel):
(WebKit::WebProcessPool::setDefaultRequestTimeoutInterval):
(WebKit::WebProcessPool::createDownloadProxy):
(WebKit::WebProcessPool::useTestingNetworkSession):
(WebKit::WebProcessPool::allowSpecificHTTPSCertificateForHost):
(WebKit::WebProcessPool::requestNetworkingStatistics):
(WebKit::WebProcessPool::handleMessage):
* UIProcess/WebProcessPool.h:
(WebKit::WebProcessPool::sendToNetworkingProcess):
(WebKit::WebProcessPool::sendToNetworkingProcessRelaunchingIfNecessary):
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::getPluginProcessConnection):
(WebKit::WebProcessProxy::getNetworkProcessConnection):
(WebKit::WebProcessProxy::getDatabaseProcessConnection):
(WebKit::WebProcessProxy::createDownloadProxy):
(WebKit::WebProcessProxy::didCancelProcessSuspension):
(WebKit::WebProcessProxy::reinstateNetworkProcessAssertionState):
(WebKit::WebProcessProxy::didSetAssertionState):
* UIProcess/WebProcessProxy.h:
(WebKit::WebProcessProxy::throttler):
* UIProcess/WebProcessProxy.messages.in:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::~WebsiteDataStore):
(WebKit::WebsiteDataStore::cloneSessionData):
* UIProcess/gtk/WebProcessPoolGtk.cpp:
(WebKit::initInspectorServer):
(WebKit::WebProcessPool::setIgnoreTLSErrors):
* UIProcess/soup/WebProcessPoolSoup.cpp:
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
* WebKit2Prefix.h:
* WebProcess/FileAPI/BlobRegistryProxy.cpp:
(WebKit::BlobRegistryProxy::blobSize):
* WebProcess/FileAPI/BlobRegistryProxy.h:
* WebProcess/Network/NetworkProcessConnection.cpp:
* WebProcess/Network/NetworkProcessConnection.h:
* WebProcess/Network/NetworkProcessConnection.messages.in:
* WebProcess/Network/WebResourceLoadScheduler.cpp:
(WebKit::WebResourceLoadScheduler::networkProcessCrashed):
* WebProcess/Network/WebResourceLoadScheduler.h:
* WebProcess/Network/WebResourceLoader.cpp:
* WebProcess/Network/WebResourceLoader.h:
* WebProcess/Network/WebResourceLoader.messages.in:
* WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
(WebKit::initializeBrowserFuncs):
(WebKit::netscapeBrowserFuncs):
* WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
(WebKit::NetscapePlugin::registerRedirect):
(WebKit::NetscapePlugin::urlRedirectResponse):
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::cookiesForDOM):
(WebKit::WebPlatformStrategies::setCookiesFromDOM):
(WebKit::WebPlatformStrategies::cookiesEnabled):
(WebKit::WebPlatformStrategies::cookieRequestHeaderFieldValue):
(WebKit::WebPlatformStrategies::getRawCookies):
(WebKit::WebPlatformStrategies::deleteCookie):
(WebKit::WebPlatformStrategies::resourceLoadScheduler):
(WebKit::WebPlatformStrategies::createBlobRegistry):
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:
* WebProcess/WebPage/WebFrame.cpp:
(WebKit::WebFrame::startDownload):
(WebKit::WebFrame::convertMainResourceLoadToDownload):
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::WebProcess):
(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::ensureNetworkProcessConnection):
(WebKit::WebProcess::registerURLSchemeAsEmptyDocument):
(WebKit::WebProcess::usesNetworkProcess):
(WebKit::WebProcess::networkConnection):
(WebKit::WebProcess::webResourceLoadScheduler):
(WebKit::WebProcess::webToDatabaseProcessConnectionClosed):
(WebKit::WebProcess::prefetchDNS):
* WebProcess/WebProcess.h:
* config.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessEntryPointmacLegacyProcessNetworkProcessMainmm">trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceEntryPointmm">trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp">trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistryh">trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadcpp">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadh">trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadClienth">trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadParameterscpp">trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkLoadParametersh">trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadermessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.messages.in</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesseflNetworkProcessMainEflcpp">trunk/Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessgtkNetworkProcessMainGtkcpp">trunk/Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessiosNetworkProcessIOSmm">trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkLoadMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp">trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesssoupRemoteNetworkingContextSoupcpp">trunk/Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationAuthenticationManagercpp">trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolsCocoaCustomProtocolManagerCocoamm">trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolsCustomProtocolManagerh">trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerSoupcpp">trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh">trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkProcessSupplementh">trunk/Source/WebKit2/Shared/Network/NetworkProcessSupplement.h</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkResourceLoadParameterscpp">trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedNetworkNetworkResourceLoadParametersh">trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedProcessExecutablePathh">trunk/Source/WebKit2/Shared/ProcessExecutablePath.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParameterscpp">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebProcessCreationParametersh">trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2SharedeflProcessExecutablePathEflcpp">trunk/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedgtkProcessExecutablePathGtkcpp">trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacCookieStorageShimh">trunk/Source/WebKit2/Shared/mac/CookieStorageShim.h</a></li>
<li><a href="#trunkSourceWebKit2SharedmacCookieStorageShimmm">trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedmacCookieStorageShimLibrarycpp">trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacCookieStorageShimLibraryh">trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPISessioncpp">trunk/Source/WebKit2/UIProcess/API/APISession.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm">trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_contextcpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxycpp">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLauncherProcessLaunchercpp">trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLauncherProcessLauncherh">trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchereflProcessLauncherEflcpp">trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchergtkProcessLauncherGtkcpp">trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm">trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkmacNetworkProcessProxyMacmm">trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworksoupNetworkProcessProxySoupcpp">trunk/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxymessagesin">trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcesssoupWebProcessPoolSoupcpp">trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2Prefixh">trunk/Source/WebKit2/WebKit2Prefix.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxycpp">trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxyh">trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectioncpp">trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionh">trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionmessagesin">trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulerh">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoaderh">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebResourceLoadermessagesin">trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebFramecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2configh">trunk/Source/WebKit2/config.h</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsMaccmake">trunk/Source/cmake/OptionsMac.cmake</a></li>
<li><a href="#trunkSourcecmakeWebKitFeaturescmake">trunk/Source/cmake/WebKitFeatures.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/ChangeLog        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-11-20 Alex Christensen <achristensen@webkit.org>
+
+ Remove NETWORK_PROCESS compile flag
+ https://bugs.webkit.org/show_bug.cgi?id=151512
+
+ Reviewed by Tim Horton.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsMac.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
</ins><span class="cx"> 2015-11-20 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Enable FTL JIT by default on X86_64
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/CMakeLists.txt        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -803,16 +803,13 @@
</span><span class="cx"> set_target_properties(WebProcess PROPERTIES OUTPUT_NAME ${WebKit2_WebProcess_OUTPUT_NAME})
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-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}")
</del><ins>+add_executable(NetworkProcess ${NetworkProcess_SOURCES})
+add_webkit2_prefix_header(NetworkProcess)
+target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
+set_target_properties(NetworkProcess PROPERTIES FOLDER "WebKit")
</ins><span class="cx">
</span><del>- if (WebKit2_NetworkProcess_OUTPUT_NAME)
- set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
- endif ()
</del><ins>+if (WebKit2_NetworkProcess_OUTPUT_NAME)
+ set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_PLUGIN_PROCESS)
</span><span class="lines">@@ -847,7 +844,7 @@
</span><span class="cx"> if (APPLE)
</span><span class="cx"> WEBKIT_FRAMEWORK(WebKit2)
</span><span class="cx"> else ()
</span><del>- install(TARGETS WebKit2 WebProcess
</del><ins>+ install(TARGETS WebKit2 WebProcess NetworkProcess
</ins><span class="cx"> LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
</span><span class="cx"> RUNTIME DESTINATION "${LIBEXEC_INSTALL_DIR}"
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/ChangeLog        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -1,3 +1,223 @@
</span><ins>+2015-11-20 Alex Christensen <achristensen@webkit.org>
+
+ Remove NETWORK_PROCESS compile flag
+ https://bugs.webkit.org/show_bug.cgi?id=151512
+
+ Reviewed by Tim Horton.
+
+ * CMakeLists.txt:
+ * NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm:
+ (NetworkProcessMain):
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm:
+ (NetworkServiceInitializer):
+ * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
+ (WebKit::NetworkBlobRegistry::filesInBlob):
+ * NetworkProcess/FileAPI/NetworkBlobRegistry.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ (WebKit::NetworkConnectionToWebProcess::blobSize):
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * NetworkProcess/NetworkLoad.cpp:
+ * NetworkProcess/NetworkLoad.h:
+ * NetworkProcess/NetworkLoadClient.h:
+ * NetworkProcess/NetworkLoadParameters.cpp:
+ (WebKit::NetworkLoadParameters::NetworkLoadParameters):
+ * NetworkProcess/NetworkLoadParameters.h:
+ * NetworkProcess/NetworkProcess.cpp:
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ * NetworkProcess/NetworkResourceLoader.h:
+ * NetworkProcess/NetworkResourceLoader.messages.in:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::clearDiskCache):
+ * NetworkProcess/efl/NetworkProcessMainEfl.cpp:
+ (WebKit::NetworkProcessMainUnix):
+ * NetworkProcess/gtk/NetworkProcessMainGtk.cpp:
+ (WebKit::NetworkProcessMainUnix):
+ * NetworkProcess/ios/NetworkProcessIOS.mm:
+ * NetworkProcess/mac/NetworkLoadMac.mm:
+ * NetworkProcess/mac/NetworkProcessMac.mm:
+ * NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+ (WebKit::NetworkResourceLoader::willCacheResponseAsync):
+ * NetworkProcess/soup/NetworkProcessSoup.cpp:
+ (WebKit::NetworkProcess::platformTerminate):
+ * NetworkProcess/soup/RemoteNetworkingContextSoup.cpp:
+ (WebKit::RemoteNetworkingContext::storageSession):
+ * Shared/Authentication/AuthenticationManager.cpp:
+ (WebKit::AuthenticationManager::didReceiveAuthenticationChallenge):
+ * Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:
+ (WebKit::CustomProtocolManager::initialize):
+ (WebKit::CustomProtocolManager::addCustomProtocol):
+ * Shared/Network/CustomProtocols/CustomProtocolManager.h:
+ * Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp:
+ (WebKit::CustomProtocolManager::supplementName):
+ (WebKit::CustomProtocolManager::initialize):
+ (WebKit::CustomProtocolManager::registerScheme):
+ * Shared/Network/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * Shared/Network/NetworkProcessCreationParameters.h:
+ * Shared/Network/NetworkProcessSupplement.h:
+ (WebKit::NetworkProcessSupplement::initialize):
+ * Shared/Network/NetworkResourceLoadParameters.cpp:
+ (WebKit::NetworkResourceLoadParameters::decode):
+ * Shared/Network/NetworkResourceLoadParameters.h:
+ * Shared/ProcessExecutablePath.h:
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+ (WebKit::WebProcessCreationParameters::encode):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * Shared/efl/ProcessExecutablePathEfl.cpp:
+ (WebKit::executablePathOfPluginProcess):
+ (WebKit::executablePathOfNetworkProcess):
+ (WebKit::executablePathOfDatabaseProcess):
+ * Shared/gtk/ProcessExecutablePathGtk.cpp:
+ (WebKit::executablePathOfPluginProcess):
+ (WebKit::executablePathOfNetworkProcess):
+ (WebKit::executablePathOfDatabaseProcess):
+ * Shared/mac/CookieStorageShim.h:
+ * Shared/mac/CookieStorageShim.mm:
+ (-[WKNSURLSessionLocal _getCookieHeadersForTask:completionHandler:]):
+ * Shared/mac/CookieStorageShimLibrary.cpp:
+ * Shared/mac/CookieStorageShimLibrary.h:
+ * UIProcess/API/APISession.cpp:
+ (API::Session::~Session):
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+ (WKContextGetNetworkProcessIdentifier):
+ * UIProcess/API/efl/ewk_context.cpp:
+ (ewk_context_process_model_set):
+ (ewk_context_process_model_get):
+ (ewk_context_tls_error_policy_get):
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::updateProcessSuppressionState):
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+ (WebKit::WebProcessPool::platformInvalidateContext):
+ * UIProcess/Downloads/DownloadProxy.cpp:
+ (WebKit::DownloadProxy::cancel):
+ * UIProcess/Launcher/ProcessLauncher.cpp:
+ (WebKit::ProcessLauncher::processTypeAsString):
+ (WebKit::ProcessLauncher::getProcessTypeFromString):
+ * UIProcess/Launcher/ProcessLauncher.h:
+ * UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
+ (WebKit::ProcessLauncher::launchProcess):
+ * UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp:
+ (WebKit::ProcessLauncher::launchProcess):
+ * UIProcess/Launcher/mac/ProcessLauncherMac.mm:
+ (WebKit::computeProcessShimPath):
+ (WebKit::serviceName):
+ (WebKit::shouldLeakBoost):
+ (WebKit::createProcess):
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::setIsHoldingLockedFiles):
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/Network/NetworkProcessProxy.messages.in:
+ * UIProcess/Network/mac/NetworkProcessProxyMac.mm:
+ (WebKit::NetworkProcessProxy::platformGetLaunchOptions):
+ * UIProcess/Network/soup/NetworkProcessProxySoup.cpp:
+ (WebKit::NetworkProcessProxy::platformGetLaunchOptions):
+ * UIProcess/WebCookieManagerProxy.cpp:
+ (WebKit::WebCookieManagerProxy::setHTTPCookieAcceptPolicy):
+ (WebKit::WebCookieManagerProxy::getHTTPCookieAcceptPolicy):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::setSessionID):
+ (WebKit::WebPageProxy::initializeWebPage):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::WebProcessPool):
+ (WebKit::WebProcessPool::~WebProcessPool):
+ (WebKit::WebProcessPool::initializeClient):
+ (WebKit::WebProcessPool::networkingProcessConnection):
+ (WebKit::WebProcessPool::languageChanged):
+ (WebKit::WebProcessPool::setUsesNetworkProcess):
+ (WebKit::WebProcessPool::usesNetworkProcess):
+ (WebKit::WebProcessPool::ensureNetworkProcess):
+ (WebKit::WebProcessPool::getNetworkProcessConnection):
+ (WebKit::WebProcessPool::ensureDatabaseProcess):
+ (WebKit::WebProcessPool::setAnyPageGroupMightHavePrivateBrowsingEnabled):
+ (WebKit::WebProcessPool::createNewWebProcess):
+ (WebKit::WebProcessPool::download):
+ (WebKit::WebProcessPool::resumeDownload):
+ (WebKit::WebProcessPool::setAdditionalPluginsDirectory):
+ (WebKit::WebProcessPool::networkProcessIdentifier):
+ (WebKit::WebProcessPool::setAlwaysUsesComplexTextCodePath):
+ (WebKit::WebProcessPool::setCanHandleHTTPSServerTrustEvaluation):
+ (WebKit::WebProcessPool::registerURLSchemeAsLocal):
+ (WebKit::WebProcessPool::setCacheModel):
+ (WebKit::WebProcessPool::setDefaultRequestTimeoutInterval):
+ (WebKit::WebProcessPool::createDownloadProxy):
+ (WebKit::WebProcessPool::useTestingNetworkSession):
+ (WebKit::WebProcessPool::allowSpecificHTTPSCertificateForHost):
+ (WebKit::WebProcessPool::requestNetworkingStatistics):
+ (WebKit::WebProcessPool::handleMessage):
+ * UIProcess/WebProcessPool.h:
+ (WebKit::WebProcessPool::sendToNetworkingProcess):
+ (WebKit::WebProcessPool::sendToNetworkingProcessRelaunchingIfNecessary):
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::getPluginProcessConnection):
+ (WebKit::WebProcessProxy::getNetworkProcessConnection):
+ (WebKit::WebProcessProxy::getDatabaseProcessConnection):
+ (WebKit::WebProcessProxy::createDownloadProxy):
+ (WebKit::WebProcessProxy::didCancelProcessSuspension):
+ (WebKit::WebProcessProxy::reinstateNetworkProcessAssertionState):
+ (WebKit::WebProcessProxy::didSetAssertionState):
+ * UIProcess/WebProcessProxy.h:
+ (WebKit::WebProcessProxy::throttler):
+ * UIProcess/WebProcessProxy.messages.in:
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::~WebsiteDataStore):
+ (WebKit::WebsiteDataStore::cloneSessionData):
+ * UIProcess/gtk/WebProcessPoolGtk.cpp:
+ (WebKit::initInspectorServer):
+ (WebKit::WebProcessPool::setIgnoreTLSErrors):
+ * UIProcess/soup/WebProcessPoolSoup.cpp:
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+ * WebKit2Prefix.h:
+ * WebProcess/FileAPI/BlobRegistryProxy.cpp:
+ (WebKit::BlobRegistryProxy::blobSize):
+ * WebProcess/FileAPI/BlobRegistryProxy.h:
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ * WebProcess/Network/NetworkProcessConnection.h:
+ * WebProcess/Network/NetworkProcessConnection.messages.in:
+ * WebProcess/Network/WebResourceLoadScheduler.cpp:
+ (WebKit::WebResourceLoadScheduler::networkProcessCrashed):
+ * WebProcess/Network/WebResourceLoadScheduler.h:
+ * WebProcess/Network/WebResourceLoader.cpp:
+ * WebProcess/Network/WebResourceLoader.h:
+ * WebProcess/Network/WebResourceLoader.messages.in:
+ * WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp:
+ (WebKit::initializeBrowserFuncs):
+ (WebKit::netscapeBrowserFuncs):
+ * WebProcess/Plugins/Netscape/NetscapePlugin.cpp:
+ (WebKit::NetscapePlugin::registerRedirect):
+ (WebKit::NetscapePlugin::urlRedirectResponse):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::cookiesForDOM):
+ (WebKit::WebPlatformStrategies::setCookiesFromDOM):
+ (WebKit::WebPlatformStrategies::cookiesEnabled):
+ (WebKit::WebPlatformStrategies::cookieRequestHeaderFieldValue):
+ (WebKit::WebPlatformStrategies::getRawCookies):
+ (WebKit::WebPlatformStrategies::deleteCookie):
+ (WebKit::WebPlatformStrategies::resourceLoadScheduler):
+ (WebKit::WebPlatformStrategies::createBlobRegistry):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+ * WebProcess/WebPage/WebFrame.cpp:
+ (WebKit::WebFrame::startDownload):
+ (WebKit::WebFrame::convertMainResourceLoadToDownload):
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::WebProcess):
+ (WebKit::WebProcess::initializeWebProcess):
+ (WebKit::WebProcess::ensureNetworkProcessConnection):
+ (WebKit::WebProcess::registerURLSchemeAsEmptyDocument):
+ (WebKit::WebProcess::usesNetworkProcess):
+ (WebKit::WebProcess::networkConnection):
+ (WebKit::WebProcess::webResourceLoadScheduler):
+ (WebKit::WebProcess::webToDatabaseProcessConnectionClosed):
+ (WebKit::WebProcess::prefetchDNS):
+ * WebProcess/WebProcess.h:
+ * config.h:
+
</ins><span class="cx"> 2015-11-19 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Back-buffer to front-buffer copy fails for some buffer formats
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessEntryPointmacLegacyProcessNetworkProcessMainmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -25,8 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #import "ChildProcessEntryPoint.h"
</span><span class="cx"> #import "NetworkProcess.h"
</span><span class="cx"> #import "WKBase.h"
</span><span class="lines">@@ -39,5 +37,3 @@
</span><span class="cx"> {
</span><span class="cx"> return ChildProcessMain<NetworkProcess, ChildProcessMainDelegate>(argc, argv);
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceEntryPointmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx">
</span><span class="cx"> void NetworkServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> // Remove the SecItemShim from the DYLD_INSERT_LIBRARIES environment variable so any processes spawned by
</span><span class="cx"> // the this process don't try to insert the shim and crash.
</span><span class="cx"> EnvironmentUtilities::stripValuesEndingWithString("DYLD_INSERT_LIBRARIES", "/SecItemShim.dylib");
</span><span class="lines">@@ -69,5 +68,4 @@
</span><span class="cx"> #if HAVE(OS_ACTIVITY)
</span><span class="cx"> os_activity_end(activity);
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkBlobRegistry.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "BlobDataFileReferenceWithSandboxExtension.h"
</span><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include <WebCore/BlobPart.h>
</span><span class="lines">@@ -151,5 +149,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef NetworkBlobRegistry_h
</span><span class="cx"> #define NetworkBlobRegistry_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include <WebCore/URLHash.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -68,6 +66,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // NetworkBlobRegistry_h
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkConnectionToWebProcess.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "NetworkBlobRegistry.h"
</span><span class="cx"> #include "NetworkConnectionToWebProcessMessages.h"
</span><span class="cx"> #include "NetworkLoad.h"
</span><span class="lines">@@ -274,5 +272,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef NetworkConnectionToWebProcess_h
</span><span class="cx"> #define NetworkConnectionToWebProcess_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "BlockingResponseMap.h"
</span><span class="cx"> #include "Connection.h"
</span><span class="cx"> #include "NetworkConnectionToWebProcessMessages.h"
</span><span class="lines">@@ -102,6 +100,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // NetworkConnectionToWebProcess_h
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> messages -> NetworkConnectionToWebProcess LegacyReceiver {
</span><span class="cx">
</span><span class="cx"> ScheduleResourceLoad(WebKit::NetworkResourceLoadParameters resourceLoadParameters)
</span><span class="lines">@@ -48,5 +46,3 @@
</span><span class="cx"> UnregisterBlobURL(WebCore::URL url)
</span><span class="cx"> BlobSize(WebCore::URL url) -> (uint64_t resultSize)
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> #include "NetworkLoad.h"
</span><span class="cx">
</span><span class="cx"> #include "AuthenticationManager.h"
</span><span class="lines">@@ -371,5 +370,3 @@
</span><span class="cx"> #endif // !USE(NETWORK_SESSION)
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef NetworkLoad_h
</span><span class="cx"> #define NetworkLoad_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "NetworkLoadClient.h"
</span><span class="cx"> #include "NetworkLoadParameters.h"
</span><span class="cx"> #include "RemoteNetworkingContext.h"
</span><span class="lines">@@ -126,6 +124,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // NetworkLoad_h
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef NetworkLoadClient_h
</span><span class="cx"> #define NetworkLoadClient_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include <WebCore/ResourceError.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/ResourceResponse.h>
</span><span class="lines">@@ -66,7 +64,5 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // NetworkLoadClient_h
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -24,8 +24,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-
-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> #include "NetworkLoadParameters.h"
</span><span class="cx">
</span><span class="cx"> #include "NetworkResourceLoadParameters.h"
</span><span class="lines">@@ -47,5 +45,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef NetworkLoadParameters_h
</span><span class="cx"> #define NetworkLoadParameters_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include <WebCore/ResourceLoaderOptions.h>
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="lines">@@ -55,6 +53,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // NetworkLoadParameters_h
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkProcess.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx"> #include "Attachment.h"
</span><span class="cx"> #include "AuthenticationManager.h"
</span><span class="lines">@@ -554,5 +552,3 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef NetworkProcess_h
</span><span class="cx"> #define NetworkProcess_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "CacheModel.h"
</span><span class="cx"> #include "ChildProcess.h"
</span><span class="cx"> #include "DownloadManager.h"
</span><span class="lines">@@ -197,6 +195,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // NetworkProcess_h
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> messages -> NetworkProcess LegacyReceiver {
</span><span class="cx"> # Initializes the network process.
</span><span class="cx"> InitializeNetworkProcess(struct WebKit::NetworkProcessCreationParameters processCreationParameters)
</span><span class="lines">@@ -63,5 +61,3 @@
</span><span class="cx"> CancelPrepareToSuspend()
</span><span class="cx"> ProcessDidResume()
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkResourceLoader.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetworkBlobRegistry.h"
</span><span class="lines">@@ -581,5 +579,3 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef NetworkResourceLoader_h
</span><span class="cx"> #define NetworkResourceLoader_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "MessageSender.h"
</span><span class="cx"> #include "NetworkConnectionToWebProcessMessages.h"
</span><span class="cx"> #include "NetworkLoadClient.h"
</span><span class="lines">@@ -169,6 +167,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // NetworkResourceLoader_h
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.messages.in (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.messages.in        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.messages.in        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> messages -> NetworkResourceLoader LegacyReceiver {
</span><span class="cx">
</span><span class="cx"> ContinueWillSendRequest(WebCore::ResourceRequest request)
</span><span class="lines">@@ -30,5 +28,3 @@
</span><span class="cx"> ContinueCanAuthenticateAgainstProtectionSpace(bool canAuthenticate)
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "NetworkProcess.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #import "NetworkCache.h"
</span><span class="cx"> #import "NetworkProcessCreationParameters.h"
</span><span class="cx"> #import "NetworkResourceLoader.h"
</span><span class="lines">@@ -267,5 +265,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesseflNetworkProcessMainEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkProcessMainUnix.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "ChildProcessMain.h"
</span><span class="cx"> #include "NetworkProcess.h"
</span><span class="cx"> #include <Ecore.h>
</span><span class="lines">@@ -70,5 +68,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessgtkNetworkProcessMainGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkProcessMainUnix.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "ChildProcessMain.h"
</span><span class="cx"> #include "NetworkProcess.h"
</span><span class="cx"> #include <WebCore/SoupNetworkSession.h>
</span><span class="lines">@@ -63,5 +61,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessiosNetworkProcessIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "NetworkProcess.h"
</span><span class="cx">
</span><del>-#if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> #import "NetworkCache.h"
</span><span class="cx"> #import "NetworkProcessCreationParameters.h"
</span><span class="lines">@@ -101,4 +101,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
</del><ins>+#endif // PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkLoadMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> #import "NetworkLoad.h"
</span><span class="cx">
</span><span class="cx"> #import <WebCore/CFNetworkSPI.h>
</span><span class="lines">@@ -60,5 +59,3 @@
</span><span class="cx"> #endif // !USE(CFNETWORK)
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "NetworkProcess.h"
</span><span class="cx">
</span><del>-#if PLATFORM(MAC) && ENABLE(NETWORK_PROCESS)
</del><ins>+#if PLATFORM(MAC)
</ins><span class="cx">
</span><span class="cx"> #import "NetworkCache.h"
</span><span class="cx"> #import "NetworkProcessCreationParameters.h"
</span><span class="lines">@@ -144,4 +144,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // PLATFORM(MAC) && ENABLE(NETWORK_PROCESS)
</del><ins>+#endif // PLATFORM(MAC)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "NetworkResourceLoader.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #import "NetworkDiskCacheMonitor.h"
</span><span class="cx"> #import "ShareableResource.h"
</span><span class="cx"> #import <WebCore/CFNetworkSPI.h>
</span><span class="lines">@@ -90,6 +88,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
-
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> #include "NetworkProcess.h"
</span><span class="cx">
</span><span class="cx"> #include "NetworkCache.h"
</span><span class="lines">@@ -170,5 +169,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupRemoteNetworkingContextSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> #include "RemoteNetworkingContext.h"
</span><span class="cx">
</span><span class="cx"> #include <WebCore/NetworkStorageSession.h>
</span><span class="lines">@@ -57,5 +56,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationAuthenticationManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "ChildProcess.h"
</span><span class="cx"> #include "Download.h"
</span><span class="cx"> #include "DownloadProxyMessages.h"
</span><ins>+#include "NetworkProcessProxyMessages.h"
</ins><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="lines">@@ -37,10 +38,6 @@
</span><span class="cx"> #include <WebCore/AuthenticationChallenge.h>
</span><span class="cx"> #include <WebCore/AuthenticationClient.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessProxyMessages.h"
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -128,7 +125,6 @@
</span><span class="cx"> m_process->send(Messages::WebPageProxy::DidReceiveAuthenticationChallenge(frame->frameID(), authenticationChallenge, challengeID), frame->page()->pageID());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> void AuthenticationManager::didReceiveAuthenticationChallenge(uint64_t pageID, uint64_t frameID, const AuthenticationChallenge& authenticationChallenge, ChallengeCompletionHandler completionHandler)
</span><span class="cx"> {
</span><span class="lines">@@ -157,7 +153,6 @@
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::NetworkProcessProxy::DidReceiveAuthenticationChallenge(pageID, frameID, authenticationChallenge, challengeID));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if !USE(NETWORK_SESSION)
</span><span class="cx"> void AuthenticationManager::didReceiveAuthenticationChallenge(Download* download, const AuthenticationChallenge& authenticationChallenge)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolsCocoaCustomProtocolManagerCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #import "CustomProtocolManagerMessages.h"
</span><span class="cx"> #import "CustomProtocolManagerProxyMessages.h"
</span><span class="cx"> #import "DataReference.h"
</span><ins>+#import "NetworkProcessCreationParameters.h"
</ins><span class="cx"> #import "WebCoreArgumentCoders.h"
</span><span class="cx"> #import "WebProcessCreationParameters.h"
</span><span class="cx"> #import <WebCore/URL.h>
</span><span class="lines">@@ -37,10 +38,6 @@
</span><span class="cx"> #import <WebCore/ResourceRequest.h>
</span><span class="cx"> #import <WebCore/ResourceResponse.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-#import "NetworkProcessCreationParameters.h"
-#endif
-
</del><span class="cx"> #ifdef __has_include
</span><span class="cx"> #if __has_include(<Foundation/NSURLConnectionPrivate.h>)
</span><span class="cx"> #import <Foundation/NSURLConnectionPrivate.h>
</span><span class="lines">@@ -137,14 +134,12 @@
</span><span class="cx">
</span><span class="cx"> void CustomProtocolManager::initialize(const WebProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> ASSERT(parameters.urlSchemesRegisteredForCustomProtocols.isEmpty() || !parameters.usesNetworkProcess);
</span><span class="cx"> if (parameters.usesNetworkProcess) {
</span><span class="cx"> m_childProcess->parentProcessConnection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
</span><span class="cx"> m_messageQueue = nullptr;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> [NSURLProtocol registerClass:[WKCustomProtocol class]];
</span><span class="cx">
</span><span class="lines">@@ -152,7 +147,6 @@
</span><span class="cx"> registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> void CustomProtocolManager::initialize(const NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> [NSURLProtocol registerClass:[WKCustomProtocol class]];
</span><span class="lines">@@ -160,7 +154,6 @@
</span><span class="cx"> for (size_t i = 0; i < parameters.urlSchemesRegisteredForCustomProtocols.size(); ++i)
</span><span class="cx"> registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void CustomProtocolManager::addCustomProtocol(WKCustomProtocol *customProtocol)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolsCustomProtocolManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -83,10 +83,8 @@
</span><span class="cx"> // WebProcessSupplement
</span><span class="cx"> void initialize(const WebProcessCreationParameters&) override;
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> // NetworkProcessSupplement
</span><span class="cx"> void initialize(const NetworkProcessCreationParameters&) override;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // IPC::MessageReceiver
</span><span class="cx"> virtual void didReceiveMessage(IPC::Connection&, IPC::MessageDecoder&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkCustomProtocolssoupCustomProtocolManagerSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -23,13 +23,10 @@
</span><span class="cx"> #include "ChildProcess.h"
</span><span class="cx"> #include "CustomProtocolManagerImpl.h"
</span><span class="cx"> #include "CustomProtocolManagerMessages.h"
</span><ins>+#include "NetworkProcessCreationParameters.h"
</ins><span class="cx"> #include "WebProcessCreationParameters.h"
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessCreationParameters.h"
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> const char* CustomProtocolManager::supplementName()
</span><span class="lines">@@ -51,25 +48,21 @@
</span><span class="cx">
</span><span class="cx"> void CustomProtocolManager::initialize(const WebProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> ASSERT(parameters.urlSchemesRegisteredForCustomProtocols.isEmpty() || !parameters.usesNetworkProcess);
</span><span class="cx"> if (parameters.usesNetworkProcess) {
</span><span class="cx"> m_childProcess->parentProcessConnection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
</span><span class="cx"> m_messageQueue = nullptr;
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> for (size_t i = 0; i < parameters.urlSchemesRegisteredForCustomProtocols.size(); ++i)
</span><span class="cx"> registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> void CustomProtocolManager::initialize(const NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> for (size_t i = 0; i < parameters.urlSchemesRegisteredForCustomProtocols.size(); ++i)
</span><span class="cx"> registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void CustomProtocolManager::registerScheme(const String& scheme)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkProcessCreationParameters.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -168,5 +166,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef NetworkProcessCreationParameters_h
</span><span class="cx"> #define NetworkProcessCreationParameters_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "CacheModel.h"
</span><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -103,6 +101,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // NetworkProcessCreationParameters_h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessSupplementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessSupplement.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessSupplement.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessSupplement.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -33,12 +33,10 @@
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx">
</span><span class="cx"> class NetworkProcessSupplement : public ChildProcessSupplement {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> public:
</span><span class="cx"> virtual void initialize(const NetworkProcessCreationParameters&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkResourceLoadParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -30,8 +30,6 @@
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -160,5 +158,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkResourceLoadParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> namespace IPC {
</span><span class="cx"> class ArgumentDecoder;
</span><span class="cx"> class ArgumentEncoder;
</span><span class="lines">@@ -68,6 +66,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // NetworkResourceLoadParameters_h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedProcessExecutablePathh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ProcessExecutablePath.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ProcessExecutablePath.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/ProcessExecutablePath.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -32,9 +32,7 @@
</span><span class="cx">
</span><span class="cx"> String executablePathOfWebProcess();
</span><span class="cx"> String executablePathOfPluginProcess();
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> String executablePathOfNetworkProcess();
</span><del>-#endif
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> String executablePathOfDatabaseProcess();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -43,9 +43,7 @@
</span><span class="cx"> , shouldEnableJIT(false)
</span><span class="cx"> , shouldEnableFTLJIT(false)
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> , usesNetworkProcess(false)
</span><del>-#endif
</del><span class="cx"> , memoryCacheDisabled(false)
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> , hasImageServices(false)
</span><span class="lines">@@ -133,9 +131,7 @@
</span><span class="cx"> encoder << notificationPermissions;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> encoder << usesNetworkProcess;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> encoder << plugInAutoStartOriginHashes;
</span><span class="cx"> encoder << plugInAutoStartOrigins;
</span><span class="lines">@@ -291,10 +287,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (!decoder.decode(parameters.usesNetworkProcess))
</span><span class="cx"> return false;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (!decoder.decode(parameters.plugInAutoStartOriginHashes))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -154,9 +154,7 @@
</span><span class="cx"> HashMap<String, bool> notificationPermissions;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> bool usesNetworkProcess;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> HashMap<WebCore::SessionID, HashMap<unsigned, double>> plugInAutoStartOriginHashes;
</span><span class="cx"> Vector<String> plugInAutoStartOrigins;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedeflProcessExecutablePathEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -81,14 +81,12 @@
</span><span class="cx"> return webKitPluginProcessName;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> String executablePathOfNetworkProcess()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<const String> webKitNetworkProcessName(findProcessPath(NETWORKPROCESSNAME));
</span><span class="cx">
</span><span class="cx"> return webKitNetworkProcessName;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> String executablePathOfDatabaseProcess()
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedgtkProcessExecutablePathGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -79,12 +79,10 @@
</span><span class="cx"> return findWebKitProcess("WebKitPluginProcess");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> String executablePathOfNetworkProcess()
</span><span class="cx"> {
</span><span class="cx"> return findWebKitProcess("WebKitNetworkProcess");
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> String executablePathOfDatabaseProcess()
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacCookieStorageShimh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/CookieStorageShim.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CookieStorageShim.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShim.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef CookieStorageShim_h
</span><span class="cx"> #define CookieStorageShim_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -49,6 +47,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // CookieStorageShim_h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacCookieStorageShimmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CookieStorageShim.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "CookieStorageShimLibrary.h"
</span><span class="cx"> #include "NetworkConnectionToWebProcess.h"
</span><span class="cx"> #include "NetworkProcessConnection.h"
</span><span class="lines">@@ -135,5 +133,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedmacCookieStorageShimLibrarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CookieStorageShimLibrary.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS) && !PLATFORM(IOS)
</del><ins>+#if !PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/DynamicLinkerInterposing.h>
</span><span class="cx">
</span><span class="lines">@@ -90,4 +90,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS) && !PLATFORM(IOS)
</del><ins>+#endif // !PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedmacCookieStorageShimLibraryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef CookieStorageShimLibrary_h
</span><span class="cx"> #define CookieStorageShimLibrary_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -40,6 +38,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // CookieStorageShimLibrary_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPISessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APISession.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APISession.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/API/APISession.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,12 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "APISession.h"
</span><span class="cx">
</span><del>-#include <wtf/RunLoop.h>
-
-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> #include "NetworkProcessMessages.h"
</span><span class="cx"> #include "WebProcessPool.h"
</span><del>-#endif
</del><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="lines">@@ -80,12 +77,10 @@
</span><span class="cx">
</span><span class="cx"> Session::~Session()
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (m_sessionID.isEphemeral()) {
</span><span class="cx"> for (auto& processPool : WebKit::WebProcessPool::allProcessPools())
</span><span class="cx"> processPool->sendToNetworkingProcess(Messages::NetworkProcess::DestroyPrivateBrowsingSession(m_sessionID));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace API
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -166,10 +166,5 @@
</span><span class="cx">
</span><span class="cx"> pid_t WKContextGetNetworkProcessIdentifier(WKContextRef contextRef)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> return toImpl(contextRef)->networkProcessIdentifier();
</span><del>-#else
- UNUSED_PARAM(contextRef);
- return 0;
-#endif
</del><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_contextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -570,29 +570,18 @@
</span><span class="cx">
</span><span class="cx"> Eina_Bool ewk_context_process_model_set(Ewk_Context* ewkContext, Ewk_Process_Model processModel)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> EWK_OBJ_GET_IMPL_OR_RETURN(EwkContext, ewkContext, impl, false);
</span><span class="cx">
</span><span class="cx"> impl->setProcessModel(processModel);
</span><span class="cx">
</span><span class="cx"> return true;
</span><del>-#else
- UNUSED_PARAM(ewkContext);
- UNUSED_PARAM(processModel);
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ewk_Process_Model ewk_context_process_model_get(const Ewk_Context* ewkContext)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, EWK_PROCESS_MODEL_SHARED_SECONDARY);
</span><span class="cx">
</span><span class="cx"> return impl->processModel();
</span><del>-#else
- UNUSED_PARAM(ewkContext);
- return EWK_PROCESS_MODEL_SHARED_SECONDARY;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ewk_TLS_Error_Policy ewk_context_tls_error_policy_get(const Ewk_Context* context)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WebProcessPool.h"
</span><span class="cx">
</span><ins>+#import "NetworkProcessCreationParameters.h"
+#import "NetworkProcessProxy.h"
</ins><span class="cx"> #import "PluginProcessManager.h"
</span><span class="cx"> #import "SandboxUtilities.h"
</span><span class="cx"> #import "TextChecker.h"
</span><span class="lines">@@ -47,11 +49,6 @@
</span><span class="cx"> #import <WebCore/RuntimeApplicationChecks.h>
</span><span class="cx"> #import <sys/param.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-#import "NetworkProcessCreationParameters.h"
-#import "NetworkProcessProxy.h"
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import "ArgumentCodersCF.h"
</span><span class="cx"> #import "WebMemoryPressureHandlerIOS.h"
</span><span class="lines">@@ -76,10 +73,8 @@
</span><span class="cx"> // FIXME: <rdar://problem/9138817> - After this "backwards compatibility" radar is removed, this code should be removed to only return an empty String.
</span><span class="cx"> NSString *WebIconDatabaseDirectoryDefaultsKey = @"WebIconDatabaseDirectoryDefaultsKey";
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> static NSString * const WebKit2HTTPProxyDefaultsKey = @"WebKit2HTTPProxy";
</span><span class="cx"> static NSString * const WebKit2HTTPSProxyDefaultsKey = @"WebKit2HTTPSProxy";
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> static NSString * const WebKitNetworkCacheEnabledDefaultsKey = @"WebKitNetworkCacheEnabled";
</span><span class="lines">@@ -119,10 +114,8 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::updateProcessSuppressionState()
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess() && m_networkProcess)
</span><span class="cx"> m_networkProcess->setProcessSuppressionEnabled(processSuppressionEnabled());
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> if (!m_processSuppressionDisabledForPageCounter.value())
</span><span class="lines">@@ -197,14 +190,10 @@
</span><span class="cx">
</span><span class="cx"> parameters.uiProcessBundleIdentifier = String([[NSBundle mainBundle] bundleIdentifier]);
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (!usesNetworkProcess()) {
</span><del>-#endif
</del><span class="cx"> for (const auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
</span><span class="cx"> parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> parameters.fontWhitelist = m_fontWhitelist;
</span><span class="cx">
</span><span class="lines">@@ -236,7 +225,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> NSURLCache *urlCache = [NSURLCache sharedURLCache];
</span><span class="lines">@@ -271,7 +259,6 @@
</span><span class="cx"> parameters.uiProcessCookieStorageIdentifier.append(CFDataGetBytePtr(cookieStorageData.get()), CFDataGetLength(cookieStorageData.get()));
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void WebProcessPool::platformInvalidateContext()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -31,16 +31,13 @@
</span><span class="cx"> #include "AuthenticationChallengeProxy.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "DownloadProxyMap.h"
</span><ins>+#include "NetworkProcessMessages.h"
+#include "NetworkProcessProxy.h"
</ins><span class="cx"> #include "WebProcessMessages.h"
</span><span class="cx"> #include "WebProcessPool.h"
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessMessages.h"
-#include "NetworkProcessProxy.h"
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -74,13 +71,11 @@
</span><span class="cx"> if (!m_processPool)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (m_processPool->usesNetworkProcess()) {
</span><span class="cx"> if (NetworkProcessProxy* networkProcess = m_processPool->networkProcess())
</span><span class="cx"> networkProcess->connection()->send(Messages::NetworkProcess::CancelDownload(m_downloadID), 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> m_processPool->sendToAllProcesses(Messages::WebProcess::CancelDownload(m_downloadID));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLauncherProcessLaunchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -84,10 +84,8 @@
</span><span class="cx"> case PluginProcess:
</span><span class="cx"> return "pluginprocess";
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> case NetworkProcess:
</span><span class="cx"> return "networkprocess";
</span><del>-#endif
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> case DatabaseProcess:
</span><span class="cx"> return "databaseprocess";
</span><span class="lines">@@ -112,12 +110,10 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (!strcmp(string, "networkprocess")) {
</span><span class="cx"> processType = NetworkProcess;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> if (!strcmp(string, "databaseprocess")) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLauncherProcessLauncherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -50,9 +50,7 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> PluginProcess,
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> NetworkProcess,
</span><del>-#endif
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> DatabaseProcess,
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchereflProcessLauncherEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -114,11 +114,9 @@
</span><span class="cx"> pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> case NetworkProcess:
</span><span class="cx"> executablePath = executablePathOfNetworkProcess();
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> case DatabaseProcess:
</span><span class="cx"> executablePath = executablePathOfDatabaseProcess();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchergtkProcessLauncherGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -76,11 +76,9 @@
</span><span class="cx"> realPluginPath = fileSystemRepresentation(pluginPath);
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> case NetworkProcess:
</span><span class="cx"> executablePath = executablePathOfNetworkProcess();
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> case DatabaseProcess:
</span><span class="cx"> executablePath = executablePathOfDatabaseProcess();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLaunchermacProcessLauncherMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -105,14 +105,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (launchOptions.processType == ProcessLauncher::NetworkProcess) {
</span><span class="cx"> NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
</span><span class="cx"> NSString *processAppExecutablePath = [[NSBundle bundleWithPath:processPath] executablePath];
</span><span class="cx">
</span><span class="cx"> return [[processAppExecutablePath stringByDeletingLastPathComponent] stringByAppendingPathComponent:@"SecItemShim.dylib"];
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (launchOptions.processType == ProcessLauncher::WebProcess) {
</span><span class="cx"> NSString *processPath = [webKitBundle pathForAuxiliaryExecutable:@"WebProcess.app"];
</span><span class="lines">@@ -167,12 +165,10 @@
</span><span class="cx"> if (forDevelopment)
</span><span class="cx"> return "com.apple.WebKit.WebContent.Development";
</span><span class="cx"> return "com.apple.WebKit.WebContent";
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> case ProcessLauncher::NetworkProcess:
</span><span class="cx"> if (forDevelopment)
</span><span class="cx"> return "com.apple.WebKit.Networking.Development";
</span><span class="cx"> return "com.apple.WebKit.Networking";
</span><del>-#endif
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> case ProcessLauncher::DatabaseProcess:
</span><span class="cx"> if (forDevelopment)
</span><span class="lines">@@ -206,12 +202,9 @@
</span><span class="cx"> // On iOS, leak a boost onto all child processes
</span><span class="cx"> UNUSED_PARAM(launchOptions);
</span><span class="cx"> return true;
</span><del>-#elif ENABLE(NETWORK_PROCESS)
</del><ins>+#else
</ins><span class="cx"> // On Mac, leak a boost onto the NetworkProcess.
</span><span class="cx"> return launchOptions.processType == ProcessLauncher::NetworkProcess;
</span><del>-#else
- UNUSED_PARAM(launchOptions);
- return false;
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -483,11 +476,9 @@
</span><span class="cx"> processPath = [webKitBundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> case ProcessLauncher::NetworkProcess:
</span><span class="cx"> processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
</span><span class="cx"> break;
</span><del>-#endif
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> case ProcessLauncher::DatabaseProcess:
</span><span class="cx"> processPath = [webKitBundle pathForAuxiliaryExecutable:@"DatabaseProcess.app"];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkProcessProxy.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "AuthenticationChallengeProxy.h"
</span><span class="cx"> #include "CustomProtocolManagerProxyMessages.h"
</span><span class="cx"> #include "DownloadProxyMessages.h"
</span><span class="lines">@@ -377,5 +375,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef NetworkProcessProxy_h
</span><span class="cx"> #define NetworkProcessProxy_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "ChildProcessProxy.h"
</span><span class="cx"> #include "CustomProtocolManagerProxy.h"
</span><span class="cx"> #include "ProcessLauncher.h"
</span><span class="lines">@@ -132,6 +130,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // NetworkProcessProxy_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> messages -> NetworkProcessProxy LegacyReceiver {
</span><span class="cx"> DidCreateNetworkConnectionToWebProcess(IPC::Attachment connectionIdentifier)
</span><span class="cx">
</span><span class="lines">@@ -39,5 +37,3 @@
</span><span class="cx"> LogSampledDiagnosticMessageWithResult(uint64_t pageID, String message, String description, uint32_t result)
</span><span class="cx"> LogSampledDiagnosticMessageWithValue(uint64_t pageID, String message, String description, String value)
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkmacNetworkProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #import "NetworkProcessMessages.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -59,5 +57,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworksoupNetworkProcessProxySoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx">
</span><span class="cx"> #include "NetworkProcessProxy.h"
</span><span class="cx"> #include <glib.h>
</span><span class="lines">@@ -43,5 +42,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -163,10 +163,8 @@
</span><span class="cx"> // - When testing, we only have one WebProcess and one NetworkProcess, and WebKitTestRunner never restarts them;
</span><span class="cx"> // - When not testing, Cocoa has the policy persisted, and thus new processes use it (even for ephemeral sessions).
</span><span class="cx"> processPool()->sendToAllProcesses(Messages::WebCookieManager::SetHTTPCookieAcceptPolicy(policy));
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (processPool()->usesNetworkProcess())
</span><span class="cx"> processPool()->sendToNetworkingProcess(Messages::WebCookieManager::SetHTTPCookieAcceptPolicy(policy));
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebCookieManagerProxy::getHTTPCookieAcceptPolicy(std::function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)> callbackFunction)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> #include "NativeWebMouseEvent.h"
</span><span class="cx"> #include "NativeWebWheelEvent.h"
</span><span class="cx"> #include "NavigationActionData.h"
</span><ins>+#include "NetworkProcessMessages.h"
</ins><span class="cx"> #include "NotificationPermissionRequest.h"
</span><span class="cx"> #include "NotificationPermissionRequestManager.h"
</span><span class="cx"> #include "PageClient.h"
</span><span class="lines">@@ -138,10 +139,6 @@
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessMessages.h"
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "RemoteLayerTreeDrawingAreaProxy.h"
</span><span class="cx"> #include "RemoteLayerTreeScrollingPerformanceData.h"
</span><span class="lines">@@ -487,10 +484,8 @@
</span><span class="cx">
</span><span class="cx"> m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID, *this);
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (m_sessionID.isEphemeral())
</span><span class="cx"> m_process->processPool().sendToNetworkingProcess(Messages::NetworkProcess::EnsurePrivateBrowsingSession(m_sessionID));
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> const CFIndex viewStateChangeRunLoopOrder = (CFIndex)RunLoopObserver::WellKnownRunLoopOrders::CoreAnimationCommit - 1;
</span><span class="lines">@@ -774,10 +769,8 @@
</span><span class="cx"> m_sessionID = sessionID;
</span><span class="cx"> m_process->send(Messages::WebPage::SetSessionID(sessionID), m_pageID);
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (sessionID.isEphemeral())
</span><span class="cx"> m_process->processPool().sendToNetworkingProcess(Messages::NetworkProcess::EnsurePrivateBrowsingSession(sessionID));
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::initializeWebPage()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -35,6 +35,9 @@
</span><span class="cx"> #include "DownloadProxy.h"
</span><span class="cx"> #include "DownloadProxyMessages.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "NetworkProcessCreationParameters.h"
+#include "NetworkProcessMessages.h"
+#include "NetworkProcessProxy.h"
</ins><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include "StatisticsData.h"
</span><span class="cx"> #include "TextChecker.h"
</span><span class="lines">@@ -78,12 +81,6 @@
</span><span class="cx"> #include "DatabaseProcessMessages.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessCreationParameters.h"
-#include "NetworkProcessMessages.h"
-#include "NetworkProcessProxy.h"
-#endif
-
</del><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> #include "ServicesController.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -159,10 +156,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_shouldUseTestingNetworkSession(false)
</span><span class="cx"> , m_processTerminationEnabled(true)
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> , m_canHandleHTTPSServerTrustEvaluation(true)
</span><span class="cx"> , m_didNetworkProcessCrash(false)
</span><del>-#endif
</del><span class="cx"> #if USE(SOUP)
</span><span class="cx"> , m_ignoreTLSErrors(true)
</span><span class="cx"> #endif
</span><span class="lines">@@ -254,10 +249,8 @@
</span><span class="cx"> processPoolCounter.decrement();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (m_networkProcess)
</span><span class="cx"> m_networkProcess->shutDownProcess();
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::initializeClient(const WKContextClientBase* client)
</span><span class="lines">@@ -315,18 +308,12 @@
</span><span class="cx"> {
</span><span class="cx"> switch (processModel()) {
</span><span class="cx"> case ProcessModelSharedSecondaryProcess:
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess())
</span><span class="cx"> return m_networkProcess->connection();
</span><del>-#endif
</del><span class="cx"> return m_processes[0]->connection();
</span><span class="cx"> case ProcessModelMultipleSecondaryProcesses:
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> ASSERT(usesNetworkProcess());
</span><span class="cx"> return m_networkProcess->connection();
</span><del>-#else
- break;
-#endif
</del><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return 0;
</span><span class="lines">@@ -340,7 +327,7 @@
</span><span class="cx"> void WebProcessPool::languageChanged()
</span><span class="cx"> {
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::UserPreferredLanguagesChanged(userPreferredLanguages()));
</span><del>-#if USE(SOUP) && ENABLE(NETWORK_PROCESS)
</del><ins>+#if USE(SOUP)
</ins><span class="cx"> if (usesNetworkProcess() && m_networkProcess)
</span><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::UserPreferredLanguagesChanged(userPreferredLanguages()), 0);
</span><span class="cx"> #endif
</span><span class="lines">@@ -358,23 +345,14 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::setUsesNetworkProcess(bool usesNetworkProcess)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> m_configuration->setUseNetworkProcess(usesNetworkProcess);
</span><del>-#else
- UNUSED_PARAM(usesNetworkProcess);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebProcessPool::usesNetworkProcess() const
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> return m_configuration->useNetworkProcess();
</span><del>-#else
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> NetworkProcessProxy& WebProcessPool::ensureNetworkProcess()
</span><span class="cx"> {
</span><span class="cx"> if (m_networkProcess)
</span><span class="lines">@@ -459,7 +437,6 @@
</span><span class="cx">
</span><span class="cx"> m_networkProcess->getNetworkProcessConnection(reply);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void WebProcessPool::ensureDatabaseProcess()
</span><span class="lines">@@ -527,14 +504,12 @@
</span><span class="cx"> {
</span><span class="cx"> m_iconDatabase->setPrivateBrowsingEnabled(privateBrowsingEnabled);
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess() && networkProcess()) {
</span><span class="cx"> if (privateBrowsingEnabled)
</span><span class="cx"> networkProcess()->send(Messages::NetworkProcess::EnsurePrivateBrowsingSession(SessionID::legacyPrivateSessionID()), 0);
</span><span class="cx"> else
</span><span class="cx"> networkProcess()->send(Messages::NetworkProcess::DestroyPrivateBrowsingSession(SessionID::legacyPrivateSessionID()), 0);
</span><span class="cx"> }
</span><del>-#endif // ENABLED(NETWORK_PROCESS)
</del><span class="cx">
</span><span class="cx"> if (privateBrowsingEnabled)
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::EnsurePrivateBrowsingSession(SessionID::legacyPrivateSessionID()));
</span><span class="lines">@@ -579,10 +554,8 @@
</span><span class="cx">
</span><span class="cx"> WebProcessProxy& WebProcessPool::createNewWebProcess()
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess())
</span><span class="cx"> ensureNetworkProcess();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> Ref<WebProcessProxy> process = WebProcessProxy::create(*this);
</span><span class="cx">
</span><span class="lines">@@ -659,9 +632,7 @@
</span><span class="cx"> supplement<WebNotificationManagerProxy>()->populateCopyOfNotificationPermissions(parameters.notificationPermissions);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> parameters.usesNetworkProcess = usesNetworkProcess();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> parameters.plugInAutoStartOriginHashes = m_plugInAutoStartProvider.autoStartOriginHashesCopy();
</span><span class="cx"> copyToVector(m_plugInAutoStartProvider.autoStartOrigins(), parameters.plugInAutoStartOrigins);
</span><span class="lines">@@ -873,13 +844,11 @@
</span><span class="cx"> uint64_t initiatingPageID = initiatingPage ? initiatingPage->pageID() : 0;
</span><span class="cx"> SessionID sessionID = initiatingPage ? initiatingPage->sessionID() : SessionID::defaultSessionID();
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess() && networkProcess()) {
</span><span class="cx"> // FIXME (NetworkProcess): Replicate whatever FrameLoader::setOriginalURLForDownloadRequest does with the request here.
</span><span class="cx"> networkProcess()->send(Messages::NetworkProcess::DownloadRequest(sessionID, downloadProxy->downloadID(), request), 0);
</span><span class="cx"> return downloadProxy;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> m_processes[0]->send(Messages::WebProcess::DownloadRequest(sessionID, downloadProxy->downloadID(), initiatingPageID, request), 0);
</span><span class="cx"> return downloadProxy;
</span><span class="lines">@@ -893,12 +862,10 @@
</span><span class="cx"> if (!path.isEmpty())
</span><span class="cx"> SandboxExtension::createHandle(path, SandboxExtension::ReadWrite, sandboxExtensionHandle);
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess() && networkProcess()) {
</span><span class="cx"> networkProcess()->send(Messages::NetworkProcess::ResumeDownload(downloadProxy->downloadID(), resumeData->dataReference(), path, sandboxExtensionHandle), 0);
</span><span class="cx"> return downloadProxy;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> m_processes[0]->send(Messages::WebProcess::ResumeDownload(downloadProxy->downloadID(), resumeData->dataReference(), path, sandboxExtensionHandle), 0);
</span><span class="cx"> return downloadProxy;
</span><span class="lines">@@ -940,7 +907,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> PlatformProcessIdentifier WebProcessPool::networkProcessIdentifier()
</span><span class="cx"> {
</span><span class="cx"> if (!m_networkProcess)
</span><span class="lines">@@ -948,7 +914,6 @@
</span><span class="cx">
</span><span class="cx"> return m_networkProcess->processIdentifier();
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void WebProcessPool::setAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)
</span><span class="cx"> {
</span><span class="lines">@@ -988,15 +953,11 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::setCanHandleHTTPSServerTrustEvaluation(bool value)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> m_canHandleHTTPSServerTrustEvaluation = value;
</span><span class="cx"> if (usesNetworkProcess() && m_networkProcess) {
</span><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::SetCanHandleHTTPSServerTrustEvaluation(value), 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#else
- UNUSED_PARAM(value);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::registerURLSchemeAsLocal(const String& urlScheme)
</span><span class="lines">@@ -1064,10 +1025,8 @@
</span><span class="cx"> m_configuration->setCacheModel(cacheModel);
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::SetCacheModel(cacheModel));
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess() && m_networkProcess)
</span><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::SetCacheModel(cacheModel), 0);
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::setDefaultRequestTimeoutInterval(double timeoutInterval)
</span><span class="lines">@@ -1077,13 +1036,11 @@
</span><span class="cx">
</span><span class="cx"> DownloadProxy* WebProcessPool::createDownloadProxy(const ResourceRequest& request)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess()) {
</span><span class="cx"> ensureNetworkProcess();
</span><span class="cx"> ASSERT(m_networkProcess);
</span><span class="cx"> return m_networkProcess->createDownloadProxy(request);
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return ensureSharedWebProcess().createDownloadProxy(request);
</span><span class="cx"> }
</span><span class="lines">@@ -1182,12 +1139,10 @@
</span><span class="cx"> void WebProcessPool::useTestingNetworkSession()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_processes.isEmpty());
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> ASSERT(!m_networkProcess);
</span><span class="cx">
</span><span class="cx"> if (m_networkProcess)
</span><span class="cx"> return;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (!m_processes.isEmpty())
</span><span class="cx"> return;
</span><span class="lines">@@ -1197,12 +1152,10 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::allowSpecificHTTPSCertificateForHost(const WebCertificateInfo* certificate, const String& host)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess() && m_networkProcess) {
</span><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::AllowSpecificHTTPSCertificateForHost(certificate->certificateInfo(), host), 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx"> m_processes[0]->send(Messages::WebProcess::AllowSpecificHTTPSCertificateForHost(certificate->certificateInfo(), host), 0);
</span><span class="lines">@@ -1268,25 +1221,14 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::requestNetworkingStatistics(StatisticsRequest* request)
</span><span class="cx"> {
</span><del>- bool networkProcessUnavailable;
-#if ENABLE(NETWORK_PROCESS)
- networkProcessUnavailable = !usesNetworkProcess() || !m_networkProcess;
-#else
- networkProcessUnavailable = true;
-#endif
-
- if (networkProcessUnavailable) {
</del><ins>+ if (!usesNetworkProcess() || !m_networkProcess) {
</ins><span class="cx"> LOG_ERROR("Attempt to get NetworkProcess statistics but the NetworkProcess is unavailable");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> uint64_t requestID = request->addOutstandingRequest();
</span><span class="cx"> m_statisticsRequests.set(requestID, request);
</span><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::GetNetworkProcessStatistics(requestID), 0);
</span><del>-#else
- UNUSED_PARAM(request);
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::handleMessage(IPC::Connection& connection, const String& messageName, const WebKit::UserData& messageBody)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include "GenericCallback.h"
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include "MessageReceiverMap.h"
</span><ins>+#include "NetworkProcessProxy.h"
</ins><span class="cx"> #include "PlugInAutoStartProvider.h"
</span><span class="cx"> #include "PluginInfoStore.h"
</span><span class="cx"> #include "ProcessModel.h"
</span><span class="lines">@@ -59,10 +60,6 @@
</span><span class="cx"> #include "DatabaseProcessProxy.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessProxy.h"
-#endif
-
</del><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> #include "WebMediaSessionFocusManager.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -86,15 +83,12 @@
</span><span class="cx"> class WebIconDatabase;
</span><span class="cx"> class WebPageGroup;
</span><span class="cx"> class WebPageProxy;
</span><ins>+struct NetworkProcessCreationParameters;
</ins><span class="cx"> struct StatisticsData;
</span><span class="cx"> struct WebProcessCreationParameters;
</span><span class="cx">
</span><span class="cx"> typedef GenericCallback<API::Dictionary*> DictionaryCallback;
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-struct NetworkProcessCreationParameters;
-#endif
-
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> int networkProcessLatencyQOS();
</span><span class="cx"> int networkProcessThroughputQOS();
</span><span class="lines">@@ -193,9 +187,7 @@
</span><span class="cx"> void clearPluginClientPolicies();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> PlatformProcessIdentifier networkProcessIdentifier();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void setAlwaysUsesComplexTextCodePath(bool);
</span><span class="cx"> void setShouldUseFontSmoothing(bool);
</span><span class="lines">@@ -289,13 +281,11 @@
</span><span class="cx"> void setUsesNetworkProcess(bool);
</span><span class="cx"> bool usesNetworkProcess() const;
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> NetworkProcessProxy& ensureNetworkProcess();
</span><span class="cx"> NetworkProcessProxy* networkProcess() { return m_networkProcess.get(); }
</span><span class="cx"> void networkProcessCrashed(NetworkProcessProxy*);
</span><span class="cx">
</span><span class="cx"> void getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void ensureDatabaseProcess();
</span><span class="lines">@@ -378,9 +368,7 @@
</span><span class="cx"> void requestWebContentStatistics(StatisticsRequest*);
</span><span class="cx"> void requestNetworkingStatistics(StatisticsRequest*);
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> void platformInitializeNetworkProcess(NetworkProcessCreationParameters&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void handleMessage(IPC::Connection&, const String& messageName, const UserData& messageBody);
</span><span class="cx"> void handleSynchronousMessage(IPC::Connection&, const String& messageName, const UserData& messageBody, UserData& returnUserData);
</span><span class="lines">@@ -500,11 +488,9 @@
</span><span class="cx">
</span><span class="cx"> bool m_processTerminationEnabled;
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> bool m_canHandleHTTPSServerTrustEvaluation;
</span><span class="cx"> bool m_didNetworkProcessCrash;
</span><span class="cx"> RefPtr<NetworkProcessProxy> m_networkProcess;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> RefPtr<DatabaseProcessProxy> m_databaseProcess;
</span><span class="lines">@@ -541,24 +527,18 @@
</span><span class="cx"> {
</span><span class="cx"> switch (processModel()) {
</span><span class="cx"> case ProcessModelSharedSecondaryProcess:
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess()) {
</span><span class="cx"> if (m_networkProcess && m_networkProcess->canSendMessage())
</span><span class="cx"> m_networkProcess->send(std::forward<T>(message), 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> if (!m_processes.isEmpty() && m_processes[0]->canSendMessage())
</span><span class="cx"> m_processes[0]->send(std::forward<T>(message), 0);
</span><span class="cx"> return;
</span><span class="cx"> case ProcessModelMultipleSecondaryProcesses:
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (m_networkProcess && m_networkProcess->canSendMessage())
</span><span class="cx"> m_networkProcess->send(std::forward<T>(message), 0);
</span><span class="cx"> return;
</span><del>-#else
- break;
-#endif
</del><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="lines">@@ -568,24 +548,18 @@
</span><span class="cx"> {
</span><span class="cx"> switch (processModel()) {
</span><span class="cx"> case ProcessModelSharedSecondaryProcess:
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess()) {
</span><span class="cx"> ensureNetworkProcess();
</span><span class="cx"> m_networkProcess->send(std::forward<T>(message), 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> ensureSharedWebProcess();
</span><span class="cx"> m_processes[0]->send(std::forward<T>(message), 0);
</span><span class="cx"> return;
</span><span class="cx"> case ProcessModelMultipleSecondaryProcesses:
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> ensureNetworkProcess();
</span><span class="cx"> m_networkProcess->send(std::forward<T>(message), 0);
</span><span class="cx"> return;
</span><del>-#else
- break;
-#endif
</del><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -427,12 +427,10 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> void WebProcessProxy::getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply> reply)
</span><span class="cx"> {
</span><span class="cx"> m_processPool->getNetworkProcessConnection(reply);
</span><span class="cx"> }
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void WebProcessProxy::getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply> reply)
</span><span class="lines">@@ -704,9 +702,7 @@
</span><span class="cx">
</span><span class="cx"> DownloadProxy* WebProcessProxy::createDownloadProxy(const ResourceRequest& request)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> ASSERT(!m_processPool->usesNetworkProcess());
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (!m_downloadProxyMap)
</span><span class="cx"> m_downloadProxyMap = std::make_unique<DownloadProxyMap>(this);
</span><span class="lines">@@ -947,7 +943,6 @@
</span><span class="cx"> m_throttler.didCancelProcessSuspension();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> void WebProcessProxy::reinstateNetworkProcessAssertionState(NetworkProcessProxy& newNetworkProcessProxy)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -962,11 +957,10 @@
</span><span class="cx"> UNUSED_PARAM(newNetworkProcessProxy);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> void WebProcessProxy::didSetAssertionState(AssertionState state)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> ASSERT(!m_backgroundTokenForNetworkProcess || !m_foregroundTokenForNetworkProcess);
</span><span class="cx">
</span><span class="cx"> switch (state) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -152,9 +152,7 @@
</span><span class="cx">
</span><span class="cx"> ProcessThrottler& throttler() { return m_throttler; }
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> void reinstateNetworkProcessAssertionState(NetworkProcessProxy&);
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit WebProcessProxy(WebProcessPool&);
</span><span class="lines">@@ -186,9 +184,7 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void getPluginProcessConnection(uint64_t pluginProcessToken, PassRefPtr<Messages::WebProcessProxy::GetPluginProcessConnection::DelayedReply>);
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> void getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>);
</span><del>-#endif
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>);
</span><span class="cx"> #endif
</span><span class="lines">@@ -253,7 +249,7 @@
</span><span class="cx"> int m_numberOfTimesSuddenTerminationWasDisabled;
</span><span class="cx"> ProcessThrottler m_throttler;
</span><span class="cx"> ProcessThrottler::BackgroundActivityToken m_tokenForHoldingLockedFiles;
</span><del>-#if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
</del><ins>+#if PLATFORM(IOS)
</ins><span class="cx"> ProcessThrottler::ForegroundActivityToken m_foregroundTokenForNetworkProcess;
</span><span class="cx"> ProcessThrottler::BackgroundActivityToken m_backgroundTokenForNetworkProcess;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxymessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -38,9 +38,7 @@
</span><span class="cx"> GetPlugins(bool refresh) -> (Vector<WebCore::PluginInfo> plugins, Vector<WebCore::PluginInfo> applicationPlugins)
</span><span class="cx"> GetPluginProcessConnection(uint64_t pluginProcessToken) -> (IPC::Attachment connectionHandle, bool supportsAsynchronousInitialization) Delayed
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> GetNetworkProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
</span><del>-#endif
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> GetDatabaseProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -94,12 +94,10 @@
</span><span class="cx"> {
</span><span class="cx"> platformDestroy();
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (m_sessionID.isEphemeral()) {
</span><span class="cx"> for (auto& processPool : WebProcessPool::allProcessPools())
</span><span class="cx"> processPool->sendToNetworkingProcess(Messages::NetworkProcess::DestroyPrivateBrowsingSession(m_sessionID));
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebsiteDataStore::cloneSessionData(WebPageProxy& sourcePage, WebPageProxy& newPage)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIProcessPoolConfiguration.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "NetworkProcessMessages.h"
</ins><span class="cx"> #include "WebCookieManagerProxy.h"
</span><span class="cx"> #include "WebInspectorServer.h"
</span><span class="cx"> #include "WebProcessCreationParameters.h"
</span><span class="lines">@@ -41,10 +42,6 @@
</span><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkProcessMessages.h"
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static void initInspectorServer()
</span><span class="lines">@@ -149,12 +146,10 @@
</span><span class="cx"> void WebProcessPool::setIgnoreTLSErrors(bool ignoreTLSErrors)
</span><span class="cx"> {
</span><span class="cx"> m_ignoreTLSErrors = ignoreTLSErrors;
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess() && networkProcess()) {
</span><span class="cx"> networkProcess()->send(Messages::NetworkProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors), 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> sendToAllProcesses(Messages::WebProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesssoupWebProcessPoolSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -24,7 +24,6 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> #include "WebProcessPool.h"
</span><span class="cx">
</span><span class="cx"> #include "NetworkProcessCreationParameters.h"
</span><span class="lines">@@ -47,5 +46,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2WebKit2Prefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2Prefix.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2Prefix.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebKit2Prefix.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -36,8 +36,6 @@
</span><span class="cx">
</span><span class="cx"> #define ENABLE_WEB_PROCESS_SANDBOX 1
</span><span class="cx">
</span><del>-#define ENABLE_NETWORK_PROCESS 1
-
</del><span class="cx"> #define ENABLE_DATABASE_PROCESS 1
</span><span class="cx">
</span><span class="cx"> #define ENABLE_MEMORY_SAMPLER 1
</span><span class="lines">@@ -59,7 +57,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-#define ENABLE_NETWORK_PROCESS 1
</del><span class="cx"> #define ENABLE_SHAREABLE_RESOURCE 1
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "BlobRegistryProxy.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "NetworkConnectionToWebProcessMessages.h"
</span><span class="cx"> #include "NetworkProcessConnection.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="lines">@@ -90,5 +88,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef BlobRegistryProxy_h
</span><span class="cx"> #define BlobRegistryProxy_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include <WebCore/BlobRegistry.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -44,6 +42,4 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // BlobRegistryProxy_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -37,8 +37,6 @@
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -98,5 +96,3 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> namespace IPC {
</span><span class="cx"> class DataReference;
</span><span class="cx"> }
</span><span class="lines">@@ -82,7 +80,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
-
</del><span class="cx"> #endif // NetworkProcessConnection_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> messages -> NetworkProcessConnection LegacyReceiver {
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><span class="lines">@@ -29,5 +27,3 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -52,8 +52,6 @@
</span><span class="cx"> #include <WebCore/SubresourceLoader.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -286,5 +284,3 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -32,8 +32,6 @@
</span><span class="cx"> #include <WebCore/ResourceLoader.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class NetworkProcessConnection;
</span><span class="lines">@@ -77,6 +75,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // WebResourceLoadScheduler_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebResourceLoader.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetworkProcessConnection.h"
</span><span class="lines">@@ -221,5 +219,3 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #ifndef WebResourceLoader_h
</span><span class="cx"> #define WebResourceLoader_h
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #include "Connection.h"
</span><span class="cx"> #include "MessageSender.h"
</span><span class="cx"> #include "ShareableResource.h"
</span><span class="lines">@@ -94,6 +92,4 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> #endif // WebResourceLoader_h
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx"> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-
</del><span class="cx"> messages -> WebResourceLoader LegacyReceiver {
</span><span class="cx"> WillSendRequest(WebCore::ResourceRequest request, WebCore::ResourceResponse redirectResponse)
</span><span class="cx"> DidSendData(uint64_t bytesSent, uint64_t totalBytesToBeSent)
</span><span class="lines">@@ -39,5 +37,3 @@
</span><span class="cx"> DidReceiveResource(WebKit::ShareableResource::Handle resource, double finishTime)
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(NETWORK_PROCESS)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -1053,11 +1053,7 @@
</span><span class="cx"> netscapeFuncs.popupcontextmenu = 0;
</span><span class="cx"> netscapeFuncs.convertpoint = 0;
</span><span class="cx"> #endif
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> netscapeFuncs.urlredirectresponse = NPN_URLRedirectResponse;
</span><del>-#else
- netscapeFuncs.urlredirectresponse = 0;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NPNetscapeFuncs* netscapeBrowserFuncs()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapePlugincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -400,16 +400,12 @@
</span><span class="cx">
</span><span class="cx"> void NetscapePlugin::registerRedirect(NetscapePluginStream* stream, const URL& requestURL, int redirectResponseStatus, void* notificationData)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> // NPP_URLRedirectNotify may synchronously request this stream back out, so set it first
</span><span class="cx"> m_redirects.set(notificationData, std::make_pair(stream, requestURL.string()));
</span><span class="cx"> if (!NPP_URLRedirectNotify(requestURL.string().utf8().data(), redirectResponseStatus, notificationData)) {
</span><span class="cx"> m_redirects.take(notificationData);
</span><span class="cx"> controller()->continueStreamLoad(stream->streamID());
</span><span class="cx"> }
</span><del>-#else
- controller()->continueStreamLoad(stream->streamID());
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetscapePlugin::urlRedirectResponse(void* notifyData, bool allow)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -26,9 +26,12 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebPlatformStrategies.h"
</span><span class="cx">
</span><ins>+#include "BlobRegistryProxy.h"
</ins><span class="cx"> #include "BlockingResponseMap.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "HangDetectionDisabler.h"
</span><ins>+#include "NetworkConnectionToWebProcessMessages.h"
+#include "NetworkProcessConnection.h"
</ins><span class="cx"> #include "NetworkResourceLoadParameters.h"
</span><span class="cx"> #include "PluginInfoStore.h"
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="lines">@@ -44,6 +47,7 @@
</span><span class="cx"> #include "WebPasteboardProxyMessages.h"
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><ins>+#include "WebResourceLoadScheduler.h"
</ins><span class="cx"> #include <WebCore/Color.h>
</span><span class="cx"> #include <WebCore/DocumentLoader.h>
</span><span class="cx"> #include <WebCore/IDBFactoryBackendInterface.h>
</span><span class="lines">@@ -63,13 +67,6 @@
</span><span class="cx"> #include <WebCore/URL.h>
</span><span class="cx"> #include <wtf/Atomics.h>
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-#include "BlobRegistryProxy.h"
-#include "NetworkConnectionToWebProcessMessages.h"
-#include "NetworkProcessConnection.h"
-#include "WebResourceLoadScheduler.h"
-#endif
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -112,7 +109,6 @@
</span><span class="cx">
</span><span class="cx"> String WebPlatformStrategies::cookiesForDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> auto& webProcess = WebProcess::singleton();
</span><span class="cx"> if (webProcess.usesNetworkProcess()) {
</span><span class="cx"> String result;
</span><span class="lines">@@ -120,27 +116,23 @@
</span><span class="cx"> return String();
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return WebCore::cookiesForDOM(session, firstParty, url);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlatformStrategies::setCookiesFromDOM(const NetworkStorageSession& session, const URL& firstParty, const URL& url, const String& cookieString)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> auto& webProcess = WebProcess::singleton();
</span><span class="cx"> if (webProcess.usesNetworkProcess()) {
</span><span class="cx"> webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetCookiesFromDOM(SessionTracker::sessionID(session), firstParty, url, cookieString), 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> WebCore::setCookiesFromDOM(session, firstParty, url, cookieString);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPlatformStrategies::cookiesEnabled(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> auto& webProcess = WebProcess::singleton();
</span><span class="cx"> if (webProcess.usesNetworkProcess()) {
</span><span class="cx"> bool result;
</span><span class="lines">@@ -148,14 +140,12 @@
</span><span class="cx"> return false;
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return WebCore::cookiesEnabled(session, firstParty, url);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebPlatformStrategies::cookieRequestHeaderFieldValue(const NetworkStorageSession& session, const URL& firstParty, const URL& url)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> auto& webProcess = WebProcess::singleton();
</span><span class="cx"> if (webProcess.usesNetworkProcess()) {
</span><span class="cx"> String result;
</span><span class="lines">@@ -163,41 +153,35 @@
</span><span class="cx"> return String();
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return WebCore::cookieRequestHeaderFieldValue(session, firstParty, url);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebPlatformStrategies::getRawCookies(const NetworkStorageSession& session, const URL& firstParty, const URL& url, Vector<Cookie>& rawCookies)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> auto& webProcess = WebProcess::singleton();
</span><span class="cx"> if (webProcess.usesNetworkProcess()) {
</span><span class="cx"> if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::GetRawCookies(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::GetRawCookies::Reply(rawCookies), 0))
</span><span class="cx"> return false;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> return WebCore::getRawCookies(session, firstParty, url, rawCookies);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlatformStrategies::deleteCookie(const NetworkStorageSession& session, const URL& url, const String& cookieName)
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> auto& webProcess = WebProcess::singleton();
</span><span class="cx"> if (webProcess.usesNetworkProcess()) {
</span><span class="cx"> webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::DeleteCookie(SessionTracker::sessionID(session), url, cookieName), 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> WebCore::deleteCookie(session, url, cookieName);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // LoaderStrategy
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> ResourceLoadScheduler* WebPlatformStrategies::resourceLoadScheduler()
</span><span class="cx"> {
</span><span class="cx"> static ResourceLoadScheduler* scheduler;
</span><span class="lines">@@ -282,7 +266,6 @@
</span><span class="cx"> return LoaderStrategy::createBlobRegistry();
</span><span class="cx"> return new BlobRegistryProxy;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // PluginStrategy
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -59,12 +59,10 @@
</span><span class="cx"> virtual void deleteCookie(const WebCore::NetworkStorageSession&, const WebCore::URL&, const String&) override;
</span><span class="cx">
</span><span class="cx"> // WebCore::LoaderStrategy
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> virtual WebCore::ResourceLoadScheduler* resourceLoadScheduler() override;
</span><span class="cx"> virtual void loadResourceSynchronously(WebCore::NetworkingContext*, unsigned long resourceLoadIdentifier, const WebCore::ResourceRequest&, WebCore::StoredCredentials, WebCore::ClientCredentialPolicy, WebCore::ResourceError&, WebCore::ResourceResponse&, Vector<char>& data) override;
</span><span class="cx"> virtual WebCore::BlobRegistry* createBlobRegistry() override;
</span><span class="cx"> virtual void createPingHandle(WebCore::NetworkingContext*, WebCore::ResourceRequest&, bool shouldUseCredentialStorage) override;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // WebCore::PluginStrategy
</span><span class="cx"> virtual void refreshPlugins() override;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -33,10 +33,13 @@
</span><span class="cx"> #include "InjectedBundleNodeHandle.h"
</span><span class="cx"> #include "InjectedBundleRangeHandle.h"
</span><span class="cx"> #include "InjectedBundleScriptWorld.h"
</span><ins>+#include "NetworkConnectionToWebProcessMessages.h"
+#include "NetworkProcessConnection.h"
</ins><span class="cx"> #include "PluginView.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><span class="cx"> #include "WebChromeClient.h"
</span><ins>+#include "WebCoreArgumentCoders.h"
</ins><span class="cx"> #include "WebDocumentLoader.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="lines">@@ -81,12 +84,6 @@
</span><span class="cx"> #include <WebCore/LegacyWebArchive.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-#include "NetworkConnectionToWebProcessMessages.h"
-#include "NetworkProcessConnection.h"
-#include "WebCoreArgumentCoders.h"
-#endif
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -261,12 +258,10 @@
</span><span class="cx"> ASSERT(webProcess.usesNetworkProcess());
</span><span class="cx"> #endif
</span><span class="cx"> SessionID sessionID = page() ? page()->sessionID() : SessionID::defaultSessionID();
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (webProcess.usesNetworkProcess()) {
</span><span class="cx"> webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::StartDownload(sessionID, policyDownloadID, request), 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> // Using NETWORK_SESSION requires the use of a network process.
</span><span class="lines">@@ -286,7 +281,6 @@
</span><span class="cx"> SubresourceLoader* mainResourceLoader = documentLoader->mainResourceLoader();
</span><span class="cx">
</span><span class="cx"> auto& webProcess = WebProcess::singleton();
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> #if USE(NETWORK_SESSION)
</span><span class="cx"> ASSERT(webProcess.usesNetworkProcess());
</span><span class="cx"> #endif
</span><span class="lines">@@ -303,7 +297,6 @@
</span><span class="cx"> webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ConvertMainResourceLoadToDownload(sessionID, mainResourceLoadIdentifier, policyDownloadID, request, response), 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> if (!mainResourceLoader) {
</span><span class="cx"> // The main resource has already been loaded. Start a new download instead.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "InjectedBundle.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetworkConnectionToWebProcessMessages.h"
</span><ins>+#include "NetworkProcessConnection.h"
</ins><span class="cx"> #include "PluginProcessConnectionManager.h"
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="cx"> #include "StatisticsData.h"
</span><span class="lines">@@ -60,6 +61,7 @@
</span><span class="cx"> #include "WebProcessMessages.h"
</span><span class="cx"> #include "WebProcessPoolMessages.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><ins>+#include "WebResourceLoadScheduler.h"
</ins><span class="cx"> #include "WebsiteData.h"
</span><span class="cx"> #include "WebsiteDataTypes.h"
</span><span class="cx"> #include <JavaScriptCore/JSLock.h>
</span><span class="lines">@@ -101,12 +103,9 @@
</span><span class="cx"> #include "ObjCObjectGraph.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "CookieStorageShim.h"
</span><span class="cx"> #endif
</span><del>-#include "NetworkProcessConnection.h"
-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><span class="cx"> #include "SecItemShim.h"
</span><span class="lines">@@ -124,10 +123,6 @@
</span><span class="cx"> #include "WebBatteryManager.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-#include "WebResourceLoadScheduler.h"
-#endif
-
</del><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> #include <JavaScriptCore/RemoteInspector.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -161,11 +156,9 @@
</span><span class="cx"> , m_fullKeyboardAccessEnabled(false)
</span><span class="cx"> , m_textCheckerState()
</span><span class="cx"> , m_iconDatabaseProxy(new WebIconDatabaseProxy(this))
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> , m_usesNetworkProcess(false)
</span><span class="cx"> , m_webResourceLoadScheduler(new WebResourceLoadScheduler)
</span><span class="cx"> , m_dnsPrefetchHystereris([this](HysteresisState state) { if (state == HysteresisState::Stopped) m_dnsPrefetchedHosts.clear(); })
</span><del>-#endif
</del><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> , m_pluginProcessConnectionManager(PluginProcessConnectionManager::create())
</span><span class="cx"> #endif
</span><span class="lines">@@ -276,9 +269,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_pageMap.isEmpty());
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> m_usesNetworkProcess = parameters.usesNetworkProcess;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if OS(LINUX)
</span><span class="cx"> WebCore::MemoryPressureHandler::ReliefLogger::setLoggingEnabled(parameters.shouldEnableMemoryPressureReliefLogging);
</span><span class="lines">@@ -358,14 +349,12 @@
</span><span class="cx"> if (parameters.shouldUseTestingNetworkSession)
</span><span class="cx"> NetworkStorageSession::switchToNewTestingSession();
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> ensureNetworkProcessConnection();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> if (usesNetworkProcess())
</span><span class="cx"> CookieStorageShim::singleton().initialize();
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> setTerminationTimeout(parameters.terminationTimeout);
</span><span class="cx">
</span><span class="cx"> resetPlugInAutoStartOriginHashes(parameters.plugInAutoStartOriginHashes);
</span><span class="lines">@@ -396,7 +385,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> void WebProcess::ensureNetworkProcessConnection()
</span><span class="cx"> {
</span><span class="cx"> if (!m_usesNetworkProcess)
</span><span class="lines">@@ -422,7 +410,6 @@
</span><span class="cx"> return;
</span><span class="cx"> m_networkProcessConnection = NetworkProcessConnection::create(connectionIdentifier);
</span><span class="cx"> }
</span><del>-#endif // ENABLE(NETWORK_PROCESS)
</del><span class="cx">
</span><span class="cx"> void WebProcess::registerURLSchemeAsEmptyDocument(const String& urlScheme)
</span><span class="cx"> {
</span><span class="lines">@@ -1027,14 +1014,9 @@
</span><span class="cx">
</span><span class="cx"> bool WebProcess::usesNetworkProcess() const
</span><span class="cx"> {
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> return m_usesNetworkProcess;
</span><del>-#else
- return false;
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> NetworkProcessConnection* WebProcess::networkConnection()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_usesNetworkProcess);
</span><span class="lines">@@ -1064,7 +1046,6 @@
</span><span class="cx"> {
</span><span class="cx"> return *m_webResourceLoadScheduler;
</span><span class="cx"> }
</span><del>-#endif // ENABLED(NETWORK_PROCESS)
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void WebProcess::webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection* connection)
</span><span class="lines">@@ -1470,7 +1451,6 @@
</span><span class="cx"> if (hostname.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> if (usesNetworkProcess()) {
</span><span class="cx"> if (m_dnsPrefetchedHosts.add(hostname).isNewEntry)
</span><span class="cx"> networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::PrefetchDNS(hostname), 0);
</span><span class="lines">@@ -1480,7 +1460,6 @@
</span><span class="cx"> m_dnsPrefetchHystereris.impulse();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx"> WebCore::prefetchDNS(hostname);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> class DownloadManager;
</span><span class="cx"> class EventDispatcher;
</span><span class="cx"> class InjectedBundle;
</span><ins>+class NetworkProcessConnection;
</ins><span class="cx"> class ObjCObjectGraph;
</span><span class="cx"> class UserData;
</span><span class="cx"> class WebConnectionToUIProcess;
</span><span class="lines">@@ -82,16 +83,12 @@
</span><span class="cx"> class WebPage;
</span><span class="cx"> class WebPageGroupProxy;
</span><span class="cx"> class WebProcessSupplement;
</span><ins>+class WebResourceLoadScheduler;
</ins><span class="cx"> struct WebPageCreationParameters;
</span><span class="cx"> struct WebPageGroupData;
</span><span class="cx"> struct WebPreferencesStore;
</span><span class="cx"> struct WebProcessCreationParameters;
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
-class NetworkProcessConnection;
-class WebResourceLoadScheduler;
-#endif
-
</del><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> class WebToDatabaseProcessConnection;
</span><span class="cx"> #endif
</span><span class="lines">@@ -159,11 +156,9 @@
</span><span class="cx">
</span><span class="cx"> bool usesNetworkProcess() const;
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> NetworkProcessConnection* networkConnection();
</span><span class="cx"> void networkProcessConnectionClosed(NetworkProcessConnection*);
</span><span class="cx"> WebResourceLoadScheduler& webResourceLoadScheduler();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection*);
</span><span class="lines">@@ -359,14 +354,12 @@
</span><span class="cx">
</span><span class="cx"> WebIconDatabaseProxy* m_iconDatabaseProxy;
</span><span class="cx">
</span><del>-#if ENABLE(NETWORK_PROCESS)
</del><span class="cx"> void ensureNetworkProcessConnection();
</span><span class="cx"> RefPtr<NetworkProcessConnection> m_networkProcessConnection;
</span><span class="cx"> bool m_usesNetworkProcess;
</span><span class="cx"> WebResourceLoadScheduler* m_webResourceLoadScheduler;
</span><span class="cx"> HashSet<String> m_dnsPrefetchedHosts;
</span><span class="cx"> WebCore::HysteresisActivity m_dnsPrefetchHystereris;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void ensureWebToDatabaseProcessConnection();
</span></span></pre></div>
<a id="trunkSourceWebKit2configh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/config.h (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/config.h        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/WebKit2/config.h        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef ENABLE_NETWORK_CACHE
</span><del>-#if ENABLE(NETWORK_PROCESS) && (PLATFORM(COCOA) || PLATFORM(GTK))
</del><ins>+#if PLATFORM(COCOA) || PLATFORM(GTK)
</ins><span class="cx"> #define ENABLE_NETWORK_CACHE 1
</span><span class="cx"> #else
</span><span class="cx"> #define ENABLE_NETWORK_CACHE 0
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/cmake/OptionsEfl.cmake        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -113,7 +113,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_CONTENT_UTILS PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NAVIGATOR_HWCONCURRENCY PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETSCAPE_PLUGIN_API PUBLIC ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS PUBLIC ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NOSNIFF PUBLIC ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_POINTER_LOCK PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PUBLIC_SUFFIX_LIST PRIVATE ON)
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/cmake/OptionsGTK.cmake        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -186,7 +186,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIEW_MODE_CSS_MEDIA PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PRIVATE ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS PRIVATE ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_THREADED_COMPOSITOR PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SHADOW_DOM PRIVATE OFF)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsMac.cmake (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/cmake/OptionsMac.cmake        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -220,7 +220,6 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_SANDBOX_EXTENSIONS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_PROCESS_SANDBOX PRIVATE ON)
</span><del>-WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS PRIVATE ON)
</del><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_DATABASE_PROCESS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_PLUGIN_PROCESS PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MEMORY_SAMPLER PRIVATE ON)
</span></span></pre></div>
<a id="trunkSourcecmakeWebKitFeaturescmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/WebKitFeatures.cmake (192696 => 192697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake        2015-11-20 22:07:05 UTC (rev 192696)
+++ trunk/Source/cmake/WebKitFeatures.cmake        2015-11-20 22:10:52 UTC (rev 192697)
</span><span class="lines">@@ -128,7 +128,6 @@
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_NAVIGATOR_HWCONCURRENCY "Toggle Navigator hardware concurrency support" PRIVATE ON)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_NOSNIFF "Toggle support for 'X-Content-Type-Options: nosniff'" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_NETSCAPE_PLUGIN_API "Toggle Netscape Plugin support" PRIVATE ON)
</span><del>- WEBKIT_OPTION_DEFINE(ENABLE_NETWORK_PROCESS "Toggle dedicated network process support in WebKit2" PRIVATE OFF)
</del><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_NOTIFICATIONS "Toggle Desktop Notifications Support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_ORIENTATION_EVENTS "Toggle Orientation Events support" PRIVATE OFF)
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_PDFKIT_PLUGIN "Toggle PDFKit plugin support" PRIVATE OFF)
</span></span></pre>
</div>
</div>
</body>
</html>