<!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>[192673] 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/192673">192673</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-19 19:52:56 -0800 (Thu, 19 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/192667">r192667</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/192668">r192668</a>.
https://bugs.webkit.org/show_bug.cgi?id=151476
broke api tests (Requested by alexchristensen on #webkit).
Reverted changesets:
"Remove the non-NetworkProcess configurations"
https://bugs.webkit.org/show_bug.cgi?id=151418
http://trac.webkit.org/changeset/192667
"Fix GTK Build after <a href="http://trac.webkit.org/projects/webkit/changeset/192667">r192667</a>."
http://trac.webkit.org/changeset/192668</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="#trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp">trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.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="#trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp">trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh">trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPISessioncpp">trunk/Source/WebKit2/UIProcess/API/APISession.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKAPICasth">trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContexth">trunk/Source/WebKit2/UIProcess/API/C/WKContext.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm">trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessGroupmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIeflewk_contextcpp">trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.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="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.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="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</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="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp">trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp</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>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2macGetPIDAfterAbortedProcessLaunchcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessProcessModelh">trunk/Source/WebKit2/UIProcess/ProcessModel.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/ChangeLog 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-11-19 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192667 and r192668.
+ https://bugs.webkit.org/show_bug.cgi?id=151476
+
+ broke api tests (Requested by alexchristensen on #webkit).
+
+ Reverted changesets:
+
+ "Remove the non-NetworkProcess configurations"
+ https://bugs.webkit.org/show_bug.cgi?id=151418
+ http://trac.webkit.org/changeset/192667
+
+ "Fix GTK Build after r192667."
+ http://trac.webkit.org/changeset/192668
+
</ins><span class="cx"> 2015-11-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove the non-NetworkProcess configurations
</span></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -803,13 +803,16 @@
</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>-add_executable(NetworkProcess ${NetworkProcess_SOURCES})
-add_webkit2_prefix_header(NetworkProcess)
-target_link_libraries(NetworkProcess ${NetworkProcess_LIBRARIES})
-set_target_properties(NetworkProcess PROPERTIES FOLDER "WebKit")
</del><ins>+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}")
</ins><span class="cx">
</span><del>-if (WebKit2_NetworkProcess_OUTPUT_NAME)
- set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
</del><ins>+ if (WebKit2_NetworkProcess_OUTPUT_NAME)
+ set_target_properties(NetworkProcess PROPERTIES OUTPUT_NAME ${WebKit2_NetworkProcess_OUTPUT_NAME})
+ endif ()
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_PLUGIN_PROCESS)
</span><span class="lines">@@ -844,7 +847,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 NetworkProcess
</del><ins>+ install(TARGETS WebKit2 WebProcess
</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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-11-19 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192667 and r192668.
+ https://bugs.webkit.org/show_bug.cgi?id=151476
+
+ broke api tests (Requested by alexchristensen on #webkit).
+
+ Reverted changesets:
+
+ "Remove the non-NetworkProcess configurations"
+ https://bugs.webkit.org/show_bug.cgi?id=151418
+ http://trac.webkit.org/changeset/192667
+
+ "Fix GTK Build after r192667."
+ http://trac.webkit.org/changeset/192668
+
</ins><span class="cx"> 2015-11-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix GTK Build after r192667.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessEntryPointmacLegacyProcessNetworkProcessMainmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #import "ChildProcessEntryPoint.h"
</span><span class="cx"> #import "NetworkProcess.h"
</span><span class="cx"> #import "WKBase.h"
</span><span class="lines">@@ -37,3 +39,5 @@
</span><span class="cx"> {
</span><span class="cx"> return ChildProcessMain<NetworkProcess, ChildProcessMainDelegate>(argc, argv);
</span><span class="cx"> }
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessEntryPointmacXPCServiceNetworkServiceEntryPointmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkServiceInitializer(xpc_connection_t connection, xpc_object_t initializerMessage)
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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">@@ -68,4 +69,5 @@
</span><span class="cx"> #if HAVE(OS_ACTIVITY)
</span><span class="cx"> os_activity_end(activity);
</span><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkBlobRegistry.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><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">@@ -149,3 +151,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef NetworkBlobRegistry_h
</span><span class="cx"> #define NetworkBlobRegistry_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><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">@@ -66,4 +68,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkConnectionToWebProcess.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "NetworkBlobRegistry.h"
</span><span class="cx"> #include "NetworkConnectionToWebProcessMessages.h"
</span><span class="cx"> #include "NetworkLoad.h"
</span><span class="lines">@@ -272,3 +274,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef NetworkConnectionToWebProcess_h
</span><span class="cx"> #define NetworkConnectionToWebProcess_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "BlockingResponseMap.h"
</span><span class="cx"> #include "Connection.h"
</span><span class="cx"> #include "NetworkConnectionToWebProcessMessages.h"
</span><span class="lines">@@ -100,4 +102,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -20,6 +20,8 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> messages -> NetworkConnectionToWebProcess LegacyReceiver {
</span><span class="cx">
</span><span class="cx"> ScheduleResourceLoad(WebKit::NetworkResourceLoadParameters resourceLoadParameters)
</span><span class="lines">@@ -46,3 +48,5 @@
</span><span class="cx"> UnregisterBlobURL(WebCore::URL url)
</span><span class="cx"> BlobSize(WebCore::URL url) -> (uint64_t resultSize)
</span><span class="cx"> }
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+
+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> #include "NetworkLoad.h"
</span><span class="cx">
</span><span class="cx"> #include "AuthenticationManager.h"
</span><span class="lines">@@ -369,3 +371,5 @@
</span><span class="cx"> #endif // !USE(NETWORK_SESSION)
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoad.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef NetworkLoad_h
</span><span class="cx"> #define NetworkLoad_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "NetworkLoadClient.h"
</span><span class="cx"> #include "NetworkLoadParameters.h"
</span><span class="cx"> #include "RemoteNetworkingContext.h"
</span><span class="lines">@@ -124,4 +126,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadClient.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef NetworkLoadClient_h
</span><span class="cx"> #define NetworkLoadClient_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><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">@@ -64,5 +66,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+
+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> #include "NetworkLoadParameters.h"
</span><span class="cx">
</span><span class="cx"> #include "NetworkResourceLoadParameters.h"
</span><span class="lines">@@ -45,3 +47,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkLoadParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkLoadParameters.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef NetworkLoadParameters_h
</span><span class="cx"> #define NetworkLoadParameters_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><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">@@ -53,4 +55,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkProcess.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx"> #include "Attachment.h"
</span><span class="cx"> #include "AuthenticationManager.h"
</span><span class="lines">@@ -552,3 +554,5 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef NetworkProcess_h
</span><span class="cx"> #define NetworkProcess_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "CacheModel.h"
</span><span class="cx"> #include "ChildProcess.h"
</span><span class="cx"> #include "DownloadManager.h"
</span><span class="lines">@@ -195,4 +197,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -20,6 +20,8 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><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">@@ -61,3 +63,5 @@
</span><span class="cx"> CancelPrepareToSuspend()
</span><span class="cx"> ProcessDidResume()
</span><span class="cx"> }
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkResourceLoader.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetworkBlobRegistry.h"
</span><span class="lines">@@ -579,3 +581,5 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef NetworkResourceLoader_h
</span><span class="cx"> #define NetworkResourceLoader_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "MessageSender.h"
</span><span class="cx"> #include "NetworkConnectionToWebProcessMessages.h"
</span><span class="cx"> #include "NetworkLoadClient.h"
</span><span class="lines">@@ -167,4 +169,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.messages.in 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.messages.in 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -20,6 +20,8 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> messages -> NetworkResourceLoader LegacyReceiver {
</span><span class="cx">
</span><span class="cx"> ContinueWillSendRequest(WebCore::ResourceRequest request)
</span><span class="lines">@@ -28,3 +30,5 @@
</span><span class="cx"> ContinueCanAuthenticateAgainstProtectionSpace(bool canAuthenticate)
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "NetworkProcess.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #import "NetworkCache.h"
</span><span class="cx"> #import "NetworkProcessCreationParameters.h"
</span><span class="cx"> #import "NetworkResourceLoader.h"
</span><span class="lines">@@ -265,3 +267,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesseflNetworkProcessMainEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/efl/NetworkProcessMainEfl.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkProcessMainUnix.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "ChildProcessMain.h"
</span><span class="cx"> #include "NetworkProcess.h"
</span><span class="cx"> #include <Ecore.h>
</span><span class="lines">@@ -68,3 +70,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessgtkNetworkProcessMainGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/gtk/NetworkProcessMainGtk.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkProcessMainUnix.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><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">@@ -61,3 +63,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessiosNetworkProcessIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/ios/NetworkProcessIOS.mm 2015-11-20 03:52:56 UTC (rev 192673)
</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)
</del><ins>+#if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
</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)
</del><ins>+#endif // PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkLoadMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkLoadMac.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -24,6 +24,8 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #import "config.h"
</span><ins>+
+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> #import "NetworkLoad.h"
</span><span class="cx">
</span><span class="cx"> #import <WebCore/CFNetworkSPI.h>
</span><span class="lines">@@ -58,3 +60,5 @@
</span><span class="cx"> #endif // !USE(CFNETWORK)
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkProcessMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkProcessMac.mm 2015-11-20 03:52:56 UTC (rev 192673)
</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)
</del><ins>+#if PLATFORM(MAC) && ENABLE(NETWORK_PROCESS)
</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)
</del><ins>+#endif // PLATFORM(MAC) && ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "NetworkResourceLoader.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><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">@@ -89,3 +91,5 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupNetworkProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/soup/NetworkProcessSoup.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> #include "NetworkProcess.h"
</span><span class="cx">
</span><span class="cx"> #include "NetworkCache.h"
</span><span class="lines">@@ -169,3 +170,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesssoupRemoteNetworkingContextSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/NetworkProcess/soup/RemoteNetworkingContextSoup.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> #include "RemoteNetworkingContext.h"
</span><span class="cx">
</span><span class="cx"> #include <WebCore/NetworkStorageSession.h>
</span><span class="lines">@@ -56,3 +57,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -27,8 +27,6 @@
</span><span class="cx">
</span><span class="cx"> #include "APIDictionary.h"
</span><span class="cx"> #include "WKArray.h"
</span><del>-#include "WKContext.h"
-#include "WKContextPrivate.h"
</del><span class="cx"> #include "WKMutableDictionary.h"
</span><span class="cx"> #include "WKPreferencesRefPrivate.h"
</span><span class="cx"> #include "WKSharedAPICast.h"
</span><span class="lines">@@ -136,19 +134,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKContextSetProcessModel(WKContextRef, WKProcessModel)
-{
-}
-
-WKProcessModel WKContextGetProcessModel(WKContextRef)
-{
- return kWKProcessModelMultipleSecondaryProcesses;
-}
-
-void WKContextSetUsesNetworkProcess(WKContextRef, bool)
-{
-}
-
</del><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationAuthenticationManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "ChildProcess.h"
</span><span class="cx"> #include "Download.h"
</span><span class="cx"> #include "DownloadProxyMessages.h"
</span><del>-#include "NetworkProcessProxyMessages.h"
</del><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="lines">@@ -38,6 +37,10 @@
</span><span class="cx"> #include <WebCore/AuthenticationChallenge.h>
</span><span class="cx"> #include <WebCore/AuthenticationClient.h>
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+#include "NetworkProcessProxyMessages.h"
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -125,6 +128,7 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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">@@ -153,6 +157,7 @@
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::NetworkProcessProxy::DidReceiveAuthenticationChallenge(pageID, frameID, authenticationChallenge, challengeID));
</span><span class="cx"> }
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #import "CustomProtocolManagerMessages.h"
</span><span class="cx"> #import "CustomProtocolManagerProxyMessages.h"
</span><span class="cx"> #import "DataReference.h"
</span><del>-#import "NetworkProcessCreationParameters.h"
</del><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">@@ -38,6 +37,10 @@
</span><span class="cx"> #import <WebCore/ResourceRequest.h>
</span><span class="cx"> #import <WebCore/ResourceResponse.h>
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+#import "NetworkProcessCreationParameters.h"
+#endif
+
</ins><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">@@ -134,11 +137,22 @@
</span><span class="cx">
</span><span class="cx"> void CustomProtocolManager::initialize(const WebProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><del>- ASSERT(parameters.urlSchemesRegisteredForCustomProtocols.isEmpty());
- m_childProcess->parentProcessConnection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
- m_messageQueue = nullptr;
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ ASSERT(parameters.urlSchemesRegisteredForCustomProtocols.isEmpty() || !parameters.usesNetworkProcess);
+ if (parameters.usesNetworkProcess) {
+ m_childProcess->parentProcessConnection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
+ m_messageQueue = nullptr;
+ return;
+ }
+#endif
+
+ [NSURLProtocol registerClass:[WKCustomProtocol class]];
+
+ for (size_t i = 0; i < parameters.urlSchemesRegisteredForCustomProtocols.size(); ++i)
+ registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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">@@ -146,6 +160,7 @@
</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><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/CustomProtocolManager.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -83,8 +83,10 @@
</span><span class="cx"> // WebProcessSupplement
</span><span class="cx"> void initialize(const WebProcessCreationParameters&) override;
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> // NetworkProcessSupplement
</span><span class="cx"> void initialize(const NetworkProcessCreationParameters&) override;
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/Network/CustomProtocols/soup/CustomProtocolManagerSoup.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -23,10 +23,13 @@
</span><span class="cx"> #include "ChildProcess.h"
</span><span class="cx"> #include "CustomProtocolManagerImpl.h"
</span><span class="cx"> #include "CustomProtocolManagerMessages.h"
</span><del>-#include "NetworkProcessCreationParameters.h"
</del><span class="cx"> #include "WebProcessCreationParameters.h"
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+#include "NetworkProcessCreationParameters.h"
+#endif
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> const char* CustomProtocolManager::supplementName()
</span><span class="lines">@@ -48,16 +51,25 @@
</span><span class="cx">
</span><span class="cx"> void CustomProtocolManager::initialize(const WebProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><del>- ASSERT(parameters.urlSchemesRegisteredForCustomProtocols.isEmpty());
- m_childProcess->parentProcessConnection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
- m_messageQueue = nullptr;
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ ASSERT(parameters.urlSchemesRegisteredForCustomProtocols.isEmpty() || !parameters.usesNetworkProcess);
+ if (parameters.usesNetworkProcess) {
+ m_childProcess->parentProcessConnection()->removeWorkQueueMessageReceiver(Messages::CustomProtocolManager::messageReceiverName());
+ m_messageQueue = nullptr;
+ return;
+ }
+#endif
+ for (size_t i = 0; i < parameters.urlSchemesRegisteredForCustomProtocols.size(); ++i)
+ registerScheme(parameters.urlSchemesRegisteredForCustomProtocols[i]);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkProcessCreationParameters.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "ArgumentCoders.h"
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -166,3 +168,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessCreationParameters.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef NetworkProcessCreationParameters_h
</span><span class="cx"> #define NetworkProcessCreationParameters_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><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">@@ -101,4 +103,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkProcessSupplement.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/Network/NetworkProcessSupplement.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -33,10 +33,12 @@
</span><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx">
</span><span class="cx"> class NetworkProcessSupplement : public ChildProcessSupplement {
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> public:
</span><span class="cx"> virtual void initialize(const NetworkProcessCreationParameters&)
</span><span class="cx"> {
</span><span class="cx"> }
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -158,3 +160,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedNetworkNetworkResourceLoadParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/Network/NetworkResourceLoadParameters.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> #include <WebCore/ResourceRequest.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> namespace IPC {
</span><span class="cx"> class ArgumentDecoder;
</span><span class="cx"> class ArgumentEncoder;
</span><span class="lines">@@ -66,4 +68,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/ProcessExecutablePath.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/ProcessExecutablePath.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -32,7 +32,9 @@
</span><span class="cx">
</span><span class="cx"> String executablePathOfWebProcess();
</span><span class="cx"> String executablePathOfPluginProcess();
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> String executablePathOfNetworkProcess();
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -43,6 +43,9 @@
</span><span class="cx"> , shouldEnableJIT(false)
</span><span class="cx"> , shouldEnableFTLJIT(false)
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+ , usesNetworkProcess(false)
+#endif
</ins><span class="cx"> , memoryCacheDisabled(false)
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> , hasImageServices(false)
</span><span class="lines">@@ -130,6 +133,10 @@
</span><span class="cx"> encoder << notificationPermissions;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+ encoder << usesNetworkProcess;
+#endif
+
</ins><span class="cx"> encoder << plugInAutoStartOriginHashes;
</span><span class="cx"> encoder << plugInAutoStartOrigins;
</span><span class="cx"> encoder << memoryCacheDisabled;
</span><span class="lines">@@ -284,6 +291,11 @@
</span><span class="cx"> return false;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (!decoder.decode(parameters.usesNetworkProcess))
+ return false;
+#endif
+
</ins><span class="cx"> if (!decoder.decode(parameters.plugInAutoStartOriginHashes))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.plugInAutoStartOrigins))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebProcessCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -154,6 +154,10 @@
</span><span class="cx"> HashMap<String, bool> notificationPermissions;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+ bool usesNetworkProcess;
+#endif
+
</ins><span class="cx"> HashMap<WebCore::SessionID, HashMap<unsigned, double>> plugInAutoStartOriginHashes;
</span><span class="cx"> Vector<String> plugInAutoStartOrigins;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedeflProcessExecutablePathEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -81,12 +81,14 @@
</span><span class="cx"> return webKitPluginProcessName;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -79,10 +79,12 @@
</span><span class="cx"> return findWebKitProcess("WebKitPluginProcess");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> String executablePathOfNetworkProcess()
</span><span class="cx"> {
</span><span class="cx"> return findWebKitProcess("WebKitNetworkProcess");
</span><span class="cx"> }
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CookieStorageShim.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShim.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef CookieStorageShim_h
</span><span class="cx"> #define CookieStorageShim_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -47,4 +49,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShim.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CookieStorageShim.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "CookieStorageShimLibrary.h"
</span><span class="cx"> #include "NetworkConnectionToWebProcess.h"
</span><span class="cx"> #include "NetworkProcessConnection.h"
</span><span class="lines">@@ -133,3 +135,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedmacCookieStorageShimLibrarycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</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 !PLATFORM(IOS)
</del><ins>+#if ENABLE(NETWORK_PROCESS) && !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 // !PLATFORM(IOS)
</del><ins>+#endif // ENABLE(NETWORK_PROCESS) && !PLATFORM(IOS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedmacCookieStorageShimLibraryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/Shared/mac/CookieStorageShimLibrary.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef CookieStorageShimLibrary_h
</span><span class="cx"> #define CookieStorageShimLibrary_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> typedef struct OpaqueCFHTTPCookieStorage* CFHTTPCookieStorageRef;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -38,4 +40,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #endif // CookieStorageShimLibrary_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> auto configuration = ProcessPoolConfiguration::create();
</span><span class="cx">
</span><span class="cx"> configuration->m_shouldHaveLegacyDataStore = true;
</span><ins>+ configuration->m_processModel = WebKit::ProcessModelSharedSecondaryProcess;
</ins><span class="cx"> configuration->m_useNetworkProcess = false;
</span><span class="cx"> configuration->m_cacheModel = WebKit::CacheModelDocumentViewer;
</span><span class="cx">
</span><span class="lines">@@ -73,6 +74,7 @@
</span><span class="cx"> auto copy = this->create();
</span><span class="cx">
</span><span class="cx"> copy->m_shouldHaveLegacyDataStore = this->m_shouldHaveLegacyDataStore;
</span><ins>+ copy->m_processModel = this->m_processModel;
</ins><span class="cx"> copy->m_useNetworkProcess = this->m_useNetworkProcess;
</span><span class="cx"> copy->m_maximumProcessCount = this->m_maximumProcessCount;
</span><span class="cx"> copy->m_cacheModel = this->m_cacheModel;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "CacheModel.h"
</span><ins>+#include "ProcessModel.h"
</ins><span class="cx"> #include <wtf/Ref.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -47,6 +48,9 @@
</span><span class="cx"> bool shouldHaveLegacyDataStore() const { return m_shouldHaveLegacyDataStore; }
</span><span class="cx"> void setShouldHaveLegacyDataStore(bool shouldHaveLegacyDataStore) { m_shouldHaveLegacyDataStore = shouldHaveLegacyDataStore; }
</span><span class="cx">
</span><ins>+ WebKit::ProcessModel processModel() const { return m_processModel; }
+ void setProcessModel(WebKit::ProcessModel processModel) { m_processModel = processModel; }
+
</ins><span class="cx"> bool useNetworkProcess() const { return m_useNetworkProcess; }
</span><span class="cx"> void setUseNetworkProcess(bool useNetworkProcess) { m_useNetworkProcess = useNetworkProcess; }
</span><span class="cx">
</span><span class="lines">@@ -92,6 +96,7 @@
</span><span class="cx"> private:
</span><span class="cx"> bool m_shouldHaveLegacyDataStore { false };
</span><span class="cx">
</span><ins>+ WebKit::ProcessModel m_processModel { WebKit::ProcessModelMultipleSecondaryProcesses };
</ins><span class="cx"> bool m_useNetworkProcess { true };
</span><span class="cx"> unsigned m_maximumProcessCount { 0 };
</span><span class="cx"> WebKit::CacheModel m_cacheModel { WebKit::CacheModelPrimaryWebBrowser };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPISessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APISession.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APISession.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/API/APISession.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -28,8 +28,10 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> #include "NetworkProcessMessages.h"
</span><span class="cx"> #include "WebProcessPool.h"
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="lines">@@ -78,10 +80,12 @@
</span><span class="cx">
</span><span class="cx"> Session::~Session()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace API
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "HTTPCookieAcceptPolicy.h"
</span><span class="cx"> #include "InjectedBundleHitTestResultMediaType.h"
</span><span class="cx"> #include "PluginModuleInfo.h"
</span><ins>+#include "ProcessModel.h"
</ins><span class="cx"> #include "ResourceCachesToClear.h"
</span><span class="cx"> #include "WKBundleHitTestResult.h"
</span><span class="cx"> #include "WKContext.h"
</span><span class="lines">@@ -229,6 +230,31 @@
</span><span class="cx"> return kWKCacheModelDocumentViewer;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline ProcessModel toProcessModel(WKProcessModel wkProcessModel)
+{
+ switch (wkProcessModel) {
+ case kWKProcessModelSharedSecondaryProcess:
+ return ProcessModelSharedSecondaryProcess;
+ case kWKProcessModelMultipleSecondaryProcesses:
+ return ProcessModelMultipleSecondaryProcesses;
+ }
+
+ ASSERT_NOT_REACHED();
+ return ProcessModelSharedSecondaryProcess;
+}
+
+inline WKProcessModel toAPI(ProcessModel processModel)
+{
+ switch (processModel) {
+ case ProcessModelSharedSecondaryProcess:
+ return kWKProcessModelSharedSecondaryProcess;
+ case ProcessModelMultipleSecondaryProcesses:
+ return kWKProcessModelMultipleSecondaryProcesses;
+ }
+
+ return kWKProcessModelSharedSecondaryProcess;
+}
+
</ins><span class="cx"> inline FontSmoothingLevel toFontSmoothingLevel(WKFontSmoothingLevel wkLevel)
</span><span class="cx"> {
</span><span class="cx"> switch (wkLevel) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -329,6 +329,16 @@
</span><span class="cx"> return toAPI(toImpl(contextRef)->cacheModel());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKContextSetProcessModel(WKContextRef contextRef, WKProcessModel processModel)
+{
+ toImpl(contextRef)->setProcessModel(toProcessModel(processModel));
+}
+
+WKProcessModel WKContextGetProcessModel(WKContextRef contextRef)
+{
+ return toAPI(toImpl(contextRef)->processModel());
+}
+
</ins><span class="cx"> void WKContextSetMaximumNumberOfProcesses(WKContextRef contextRef, unsigned numberOfProcesses)
</span><span class="cx"> {
</span><span class="cx"> toImpl(contextRef)->setMaximumNumberOfProcesses(numberOfProcesses);
</span><span class="lines">@@ -544,6 +554,11 @@
</span><span class="cx"> toImpl(contextRef)->setJavaScriptGarbageCollectorTimerEnabled(enable);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKContextSetUsesNetworkProcess(WKContextRef contextRef, bool usesNetworkProcess)
+{
+ toImpl(contextRef)->setUsesNetworkProcess(usesNetworkProcess);
+}
+
</ins><span class="cx"> void WKContextUseTestingNetworkSession(WKContextRef context)
</span><span class="cx"> {
</span><span class="cx"> toImpl(context)->useTestingNetworkSession();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> WKContextCopyWebCryptoMasterKeyCallback copyWebCryptoMasterKey;
</span><span class="cx"> } WKContextClientV1;
</span><span class="cx">
</span><del>-// FIXME: These can be removed once we are no longer supporting Mavericks.
</del><span class="cx"> enum {
</span><span class="cx"> kWKProcessModelSharedSecondaryProcess = 0,
</span><span class="cx"> kWKProcessModelMultipleSecondaryProcesses = 1
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -166,5 +166,10 @@
</span><span class="cx">
</span><span class="cx"> pid_t WKContextGetNetworkProcessIdentifier(WKContextRef contextRef)
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> return toImpl(contextRef)->networkProcessIdentifier();
</span><ins>+#else
+ UNUSED_PARAM(contextRef);
+ return 0;
+#endif
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessGroupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -192,6 +192,10 @@
</span><span class="cx">
</span><span class="cx"> auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
</span><span class="cx"> configuration->setInjectedBundlePath(bundleURL ? String(bundleURL.path) : String());
</span><ins>+#if PLATFORM(IOS)
+ configuration->setUseNetworkProcess(true);
+ configuration->setProcessModel(ProcessModelMultipleSecondaryProcesses);
+#endif
</ins><span class="cx">
</span><span class="cx"> _processPool = WebProcessPool::create(configuration);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessPoolmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> #import "CacheModel.h"
</span><span class="cx"> #import "DownloadClient.h"
</span><ins>+#import "ProcessModel.h"
</ins><span class="cx"> #import "SandboxUtilities.h"
</span><span class="cx"> #import "WKObject.h"
</span><span class="cx"> #import "WeakObjCPtr.h"
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIeflewk_contextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -570,18 +570,29 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#else
+ UNUSED_PARAM(ewkContext);
+ UNUSED_PARAM(processModel);
+ return false;
+#endif
</ins><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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#else
+ UNUSED_PARAM(ewkContext);
+ return EWK_PROCESS_MODEL_SHARED_SECONDARY;
+#endif
</ins><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="trunkSourceWebKit2UIProcessAPIgtkWebKitWebContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -193,6 +193,32 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_DEFINE_TYPE(WebKitWebContext, webkit_web_context, G_TYPE_OBJECT)
</span><span class="cx">
</span><ins>+static inline WebKit::ProcessModel toProcessModel(WebKitProcessModel webKitProcessModel)
+{
+ switch (webKitProcessModel) {
+ case WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS:
+ return ProcessModelSharedSecondaryProcess;
+ case WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES:
+ return ProcessModelMultipleSecondaryProcesses;
+ default:
+ ASSERT_NOT_REACHED();
+ return ProcessModelSharedSecondaryProcess;
+ }
+}
+
+static inline WebKitProcessModel toWebKitProcessModel(WebKit::ProcessModel processModel)
+{
+ switch (processModel) {
+ case ProcessModelSharedSecondaryProcess:
+ return WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS;
+ case ProcessModelMultipleSecondaryProcesses:
+ return WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES;
+ default:
+ ASSERT_NOT_REACHED();
+ return WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS;
+ }
+}
+
</ins><span class="cx"> static const char* injectedBundleDirectory()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(DEVELOPER_MODE)
</span><span class="lines">@@ -259,6 +285,7 @@
</span><span class="cx">
</span><span class="cx"> API::ProcessPoolConfiguration configuration;
</span><span class="cx"> configuration.setInjectedBundlePath(WebCore::filenameToString(bundleFilename.get()));
</span><ins>+ configuration.setProcessModel(ProcessModelSharedSecondaryProcess);
</ins><span class="cx"> configuration.setUseNetworkProcess(false);
</span><span class="cx">
</span><span class="cx"> WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object);
</span><span class="lines">@@ -1138,9 +1165,17 @@
</span><span class="cx"> *
</span><span class="cx"> * Since: 2.4
</span><span class="cx"> */
</span><del>-void webkit_web_context_set_process_model(WebKitWebContext*, WebKitProcessModel)
</del><ins>+void webkit_web_context_set_process_model(WebKitWebContext* context, WebKitProcessModel processModel)
</ins><span class="cx"> {
</span><del>- // FIXME: This is deprecated. Only WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES is supported now.
</del><ins>+ g_return_if_fail(WEBKIT_IS_WEB_CONTEXT(context));
+
+ ProcessModel newProcessModel(toProcessModel(processModel));
+
+ if (newProcessModel == context->priv->context->processModel())
+ return;
+
+ context->priv->context->setUsesNetworkProcess(newProcessModel == ProcessModelMultipleSecondaryProcesses);
+ context->priv->context->setProcessModel(newProcessModel);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1156,7 +1191,9 @@
</span><span class="cx"> */
</span><span class="cx"> WebKitProcessModel webkit_web_context_get_process_model(WebKitWebContext* context)
</span><span class="cx"> {
</span><del>- return WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES;
</del><ins>+ g_return_val_if_fail(WEBKIT_IS_WEB_CONTEXT(context), WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS);
+
+ return toWebKitProcessModel(context->priv->context->processModel());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebProcessPoolCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WebProcessPool.h"
</span><span class="cx">
</span><del>-#import "NetworkProcessCreationParameters.h"
-#import "NetworkProcessProxy.h"
</del><span class="cx"> #import "PluginProcessManager.h"
</span><span class="cx"> #import "SandboxUtilities.h"
</span><span class="cx"> #import "TextChecker.h"
</span><span class="lines">@@ -49,6 +47,11 @@
</span><span class="cx"> #import <WebCore/RuntimeApplicationChecks.h>
</span><span class="cx"> #import <sys/param.h>
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+#import "NetworkProcessCreationParameters.h"
+#import "NetworkProcessProxy.h"
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> #import "ArgumentCodersCF.h"
</span><span class="cx"> #import "WebMemoryPressureHandlerIOS.h"
</span><span class="lines">@@ -73,8 +76,10 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> static NSString * const WebKit2HTTPProxyDefaultsKey = @"WebKit2HTTPProxy";
</span><span class="cx"> static NSString * const WebKit2HTTPSProxyDefaultsKey = @"WebKit2HTTPSProxy";
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx"> static NSString * const WebKitNetworkCacheEnabledDefaultsKey = @"WebKitNetworkCacheEnabled";
</span><span class="lines">@@ -114,8 +119,10 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::updateProcessSuppressionState()
</span><span class="cx"> {
</span><del>- if (m_networkProcess)
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess() && m_networkProcess)
</ins><span class="cx"> m_networkProcess->setProcessSuppressionEnabled(processSuppressionEnabled());
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> if (!m_processSuppressionDisabledForPageCounter.value())
</span><span class="lines">@@ -190,6 +197,15 @@
</span><span class="cx">
</span><span class="cx"> parameters.uiProcessBundleIdentifier = String([[NSBundle mainBundle] bundleIdentifier]);
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (!usesNetworkProcess()) {
+#endif
+ for (const auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
+ parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
+#if ENABLE(NETWORK_PROCESS)
+ }
+#endif
+
</ins><span class="cx"> parameters.fontWhitelist = m_fontWhitelist;
</span><span class="cx">
</span><span class="cx"> if (m_bundleParameters) {
</span><span class="lines">@@ -220,6 +236,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> void WebProcessPool::platformInitializeNetworkProcess(NetworkProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> NSURLCache *urlCache = [NSURLCache sharedURLCache];
</span><span class="lines">@@ -254,6 +271,7 @@
</span><span class="cx"> parameters.uiProcessCookieStorageIdentifier.append(CFDataGetBytePtr(cookieStorageData.get()), CFDataGetLength(cookieStorageData.get()));
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -31,13 +31,16 @@
</span><span class="cx"> #include "AuthenticationChallengeProxy.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "DownloadProxyMap.h"
</span><del>-#include "NetworkProcessMessages.h"
-#include "NetworkProcessProxy.h"
</del><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><ins>+#if ENABLE(NETWORK_PROCESS)
+#include "NetworkProcessMessages.h"
+#include "NetworkProcessProxy.h"
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -71,8 +74,15 @@
</span><span class="cx"> if (!m_processPool)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (NetworkProcessProxy* networkProcess = m_processPool->networkProcess())
- networkProcess->connection()->send(Messages::NetworkProcess::CancelDownload(m_downloadID), 0);
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (m_processPool->usesNetworkProcess()) {
+ if (NetworkProcessProxy* networkProcess = m_processPool->networkProcess())
+ networkProcess->connection()->send(Messages::NetworkProcess::CancelDownload(m_downloadID), 0);
+ return;
+ }
+#endif
+
+ m_processPool->sendToAllProcesses(Messages::WebProcess::CancelDownload(m_downloadID));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DownloadProxy::invalidate()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLauncherProcessLaunchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -84,8 +84,10 @@
</span><span class="cx"> case PluginProcess:
</span><span class="cx"> return "pluginprocess";
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> case NetworkProcess:
</span><span class="cx"> return "networkprocess";
</span><ins>+#endif
</ins><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> case DatabaseProcess:
</span><span class="cx"> return "databaseprocess";
</span><span class="lines">@@ -110,10 +112,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> if (!strcmp(string, "networkprocess")) {
</span><span class="cx"> processType = NetworkProcess;
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -50,7 +50,9 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> PluginProcess,
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> NetworkProcess,
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -114,9 +114,11 @@
</span><span class="cx"> pluginPath = m_launchOptions.extraInitializationData.get("plugin-path");
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> case NetworkProcess:
</span><span class="cx"> executablePath = executablePathOfNetworkProcess();
</span><span class="cx"> break;
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/Launcher/gtk/ProcessLauncherGtk.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -76,9 +76,11 @@
</span><span class="cx"> realPluginPath = fileSystemRepresentation(pluginPath);
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> case NetworkProcess:
</span><span class="cx"> executablePath = executablePathOfNetworkProcess();
</span><span class="cx"> break;
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/Launcher/mac/ProcessLauncherMac.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -105,12 +105,14 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#endif
</ins><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">@@ -165,10 +167,12 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#endif
</ins><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> case ProcessLauncher::DatabaseProcess:
</span><span class="cx"> if (forDevelopment)
</span><span class="lines">@@ -202,9 +206,12 @@
</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>-#else
</del><ins>+#elif ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> // On Mac, leak a boost onto the NetworkProcess.
</span><span class="cx"> return launchOptions.processType == ProcessLauncher::NetworkProcess;
</span><ins>+#else
+ UNUSED_PARAM(launchOptions);
+ return false;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -476,9 +483,11 @@
</span><span class="cx"> processPath = [webKitBundle pathForAuxiliaryExecutable:@"PluginProcess.app"];
</span><span class="cx"> break;
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> case ProcessLauncher::NetworkProcess:
</span><span class="cx"> processPath = [webKitBundle pathForAuxiliaryExecutable:@"NetworkProcess.app"];
</span><span class="cx"> break;
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "NetworkProcessProxy.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "AuthenticationChallengeProxy.h"
</span><span class="cx"> #include "CustomProtocolManagerProxyMessages.h"
</span><span class="cx"> #include "DownloadProxyMessages.h"
</span><span class="lines">@@ -375,3 +377,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef NetworkProcessProxy_h
</span><span class="cx"> #define NetworkProcessProxy_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "ChildProcessProxy.h"
</span><span class="cx"> #include "CustomProtocolManagerProxy.h"
</span><span class="cx"> #include "ProcessLauncher.h"
</span><span class="lines">@@ -130,4 +132,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.messages.in 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -20,6 +20,8 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> messages -> NetworkProcessProxy LegacyReceiver {
</span><span class="cx"> DidCreateNetworkConnectionToWebProcess(IPC::Attachment connectionIdentifier)
</span><span class="cx">
</span><span class="lines">@@ -37,3 +39,5 @@
</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><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkmacNetworkProcessProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/Network/mac/NetworkProcessProxyMac.mm 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -28,6 +28,8 @@
</span><span class="cx">
</span><span class="cx"> #import "NetworkProcessMessages.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -57,3 +59,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworksoupNetworkProcessProxySoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/Network/soup/NetworkProcessProxySoup.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -24,8 +24,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "NetworkProcessProxy.h"
</span><del>-
</del><span class="cx"> #include <glib.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -42,3 +43,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessProcessModelhfromrev192672trunkSourceWebKit2NetworkProcessEntryPointmacLegacyProcessNetworkProcessMainmm"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/ProcessModel.h (from rev 192672, trunk/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/NetworkProcessMain.mm) (0 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessModel.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/ProcessModel.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef ProcessModel_h
+#define ProcessModel_h
+
+namespace WebKit {
+
+enum ProcessModel {
+ ProcessModelSharedSecondaryProcess,
+ ProcessModelMultipleSecondaryProcesses
+};
+
+} // namespace WebKit
+
+#endif // ProcessModel_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -85,8 +85,8 @@
</span><span class="cx">
</span><span class="cx"> bool WebCookieManagerProxy::shouldTerminate(WebProcessProxy*) const
</span><span class="cx"> {
</span><del>- // FIXME: Remove this.
- return true;
</del><ins>+ return processPool()->processModel() != ProcessModelSharedSecondaryProcess
+ || (m_arrayCallbacks.isEmpty() && m_httpCookieAcceptPolicyCallbacks.isEmpty());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebCookieManagerProxy::refWebContextSupplement()
</span><span class="lines">@@ -163,7 +163,10 @@
</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>- processPool()->sendToNetworkingProcess(Messages::WebCookieManager::SetHTTPCookieAcceptPolicy(policy));
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (processPool()->usesNetworkProcess())
+ processPool()->sendToNetworkingProcess(Messages::WebCookieManager::SetHTTPCookieAcceptPolicy(policy));
+#endif
</ins><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="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -312,6 +312,7 @@
</span><span class="cx"> // guarantees no process sharing for our user interface.
</span><span class="cx"> if (!s_processPool) {
</span><span class="cx"> auto configuration = API::ProcessPoolConfiguration::createWithLegacyOptions();
</span><ins>+ configuration->setProcessModel(ProcessModelMultipleSecondaryProcesses);
</ins><span class="cx"> s_processPool = &WebProcessPool::create(configuration.get()).leakRef();
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> #include "NativeWebMouseEvent.h"
</span><span class="cx"> #include "NativeWebWheelEvent.h"
</span><span class="cx"> #include "NavigationActionData.h"
</span><del>-#include "NetworkProcessMessages.h"
</del><span class="cx"> #include "NotificationPermissionRequest.h"
</span><span class="cx"> #include "NotificationPermissionRequestManager.h"
</span><span class="cx"> #include "PageClient.h"
</span><span class="lines">@@ -139,6 +138,10 @@
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+#include "NetworkProcessMessages.h"
+#endif
+
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "RemoteLayerTreeDrawingAreaProxy.h"
</span><span class="cx"> #include "RemoteLayerTreeScrollingPerformanceData.h"
</span><span class="lines">@@ -484,8 +487,10 @@
</span><span class="cx">
</span><span class="cx"> m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID, *this);
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> if (m_sessionID.isEphemeral())
</span><span class="cx"> m_process->processPool().sendToNetworkingProcess(Messages::NetworkProcess::EnsurePrivateBrowsingSession(m_sessionID));
</span><ins>+#endif
</ins><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">@@ -691,7 +696,10 @@
</span><span class="cx"> m_process->removeWebPage(m_pageID);
</span><span class="cx"> m_process->removeMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID);
</span><span class="cx">
</span><del>- m_process = m_process->processPool().createNewWebProcessRespectingProcessCountLimit();
</del><ins>+ if (m_process->processPool().processModel() == ProcessModelSharedSecondaryProcess)
+ m_process = m_process->processPool().ensureSharedWebProcess();
+ else
+ m_process = m_process->processPool().createNewWebProcessRespectingProcessCountLimit();
</ins><span class="cx">
</span><span class="cx"> ASSERT(m_process->state() != ChildProcessProxy::State::Terminated);
</span><span class="cx"> if (m_process->state() == ChildProcessProxy::State::Running)
</span><span class="lines">@@ -766,8 +774,10 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> if (sessionID.isEphemeral())
</span><span class="cx"> m_process->processPool().sendToNetworkingProcess(Messages::NetworkProcess::EnsurePrivateBrowsingSession(sessionID));
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -35,9 +35,6 @@
</span><span class="cx"> #include "DownloadProxy.h"
</span><span class="cx"> #include "DownloadProxyMessages.h"
</span><span class="cx"> #include "Logging.h"
</span><del>-#include "NetworkProcessCreationParameters.h"
-#include "NetworkProcessMessages.h"
-#include "NetworkProcessProxy.h"
</del><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include "StatisticsData.h"
</span><span class="cx"> #include "TextChecker.h"
</span><span class="lines">@@ -81,6 +78,11 @@
</span><span class="cx"> #include "DatabaseProcessMessages.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+#include "NetworkProcessCreationParameters.h"
+#include "NetworkProcessMessages.h"
+#include "NetworkProcessProxy.h"
+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> #include "ServicesController.h"
</span><span class="lines">@@ -103,6 +105,8 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+static const double sharedSecondaryProcessShutdownTimeout = 60;
+
</ins><span class="cx"> DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, processPoolCounter, ("WebProcessPool"));
</span><span class="cx">
</span><span class="cx"> Ref<WebProcessPool> WebProcessPool::create(API::ProcessPoolConfiguration& configuration)
</span><span class="lines">@@ -155,8 +159,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> , m_shouldUseTestingNetworkSession(false)
</span><span class="cx"> , m_processTerminationEnabled(true)
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> , m_canHandleHTTPSServerTrustEvaluation(true)
</span><span class="cx"> , m_didNetworkProcessCrash(false)
</span><ins>+#endif
</ins><span class="cx"> #if USE(SOUP)
</span><span class="cx"> , m_ignoreTLSErrors(true)
</span><span class="cx"> #endif
</span><span class="lines">@@ -248,8 +254,10 @@
</span><span class="cx"> processPoolCounter.decrement();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> if (m_networkProcess)
</span><span class="cx"> m_networkProcess->shutDownProcess();
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::initializeClient(const WKContextClientBase* client)
</span><span class="lines">@@ -283,6 +291,17 @@
</span><span class="cx"> m_downloadClient = WTF::move(downloadClient);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessPool::setProcessModel(ProcessModel processModel)
+{
+ // Guard against API misuse.
+ if (!m_processes.isEmpty())
+ CRASH();
+ if (processModel != ProcessModelSharedSecondaryProcess && !m_messagesToInjectedBundlePostedToEmptyContext.isEmpty())
+ CRASH();
+
+ m_configuration->setProcessModel(processModel);
+}
+
</ins><span class="cx"> void WebProcessPool::setMaximumNumberOfProcesses(unsigned maximumNumberOfProcesses)
</span><span class="cx"> {
</span><span class="cx"> // Guard against API misuse.
</span><span class="lines">@@ -294,7 +313,23 @@
</span><span class="cx">
</span><span class="cx"> IPC::Connection* WebProcessPool::networkingProcessConnection()
</span><span class="cx"> {
</span><del>- return m_networkProcess->connection();
</del><ins>+ switch (processModel()) {
+ case ProcessModelSharedSecondaryProcess:
+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess())
+ return m_networkProcess->connection();
+#endif
+ return m_processes[0]->connection();
+ case ProcessModelMultipleSecondaryProcesses:
+#if ENABLE(NETWORK_PROCESS)
+ ASSERT(usesNetworkProcess());
+ return m_networkProcess->connection();
+#else
+ break;
+#endif
+ }
+ ASSERT_NOT_REACHED();
+ return 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::languageChanged(void* context)
</span><span class="lines">@@ -305,8 +340,8 @@
</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)
- if (m_networkProcess)
</del><ins>+#if USE(SOUP) && ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess() && m_networkProcess)
</ins><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::UserPreferredLanguagesChanged(userPreferredLanguages()), 0);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -321,6 +356,25 @@
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::SetTextCheckerState(TextChecker::state()));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcessPool::setUsesNetworkProcess(bool usesNetworkProcess)
+{
+#if ENABLE(NETWORK_PROCESS)
+ m_configuration->setUseNetworkProcess(usesNetworkProcess);
+#else
+ UNUSED_PARAM(usesNetworkProcess);
+#endif
+}
+
+bool WebProcessPool::usesNetworkProcess() const
+{
+#if ENABLE(NETWORK_PROCESS)
+ return m_configuration->useNetworkProcess();
+#else
+ return false;
+#endif
+}
+
+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> NetworkProcessProxy& WebProcessPool::ensureNetworkProcess()
</span><span class="cx"> {
</span><span class="cx"> if (m_networkProcess)
</span><span class="lines">@@ -405,6 +459,7 @@
</span><span class="cx">
</span><span class="cx"> m_networkProcess->getNetworkProcessConnection(reply);
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void WebProcessPool::ensureDatabaseProcess()
</span><span class="lines">@@ -472,12 +527,14 @@
</span><span class="cx"> {
</span><span class="cx"> m_iconDatabase->setPrivateBrowsingEnabled(privateBrowsingEnabled);
</span><span class="cx">
</span><del>- if (networkProcess()) {
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess() && networkProcess()) {
</ins><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><ins>+#endif // ENABLED(NETWORK_PROCESS)
</ins><span class="cx">
</span><span class="cx"> if (privateBrowsingEnabled)
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::EnsurePrivateBrowsingSession(SessionID::legacyPrivateSessionID()));
</span><span class="lines">@@ -512,9 +569,20 @@
</span><span class="cx"> m_processWithPageCache = process;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WebProcessProxy& WebProcessPool::ensureSharedWebProcess()
+{
+ ASSERT(processModel() == ProcessModelSharedSecondaryProcess);
+ if (m_processes.isEmpty())
+ createNewWebProcess();
+ return *m_processes[0];
+}
+
</ins><span class="cx"> WebProcessProxy& WebProcessPool::createNewWebProcess()
</span><span class="cx"> {
</span><del>- ensureNetworkProcess();
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess())
+ ensureNetworkProcess();
+#endif
</ins><span class="cx">
</span><span class="cx"> Ref<WebProcessProxy> process = WebProcessProxy::create(*this);
</span><span class="cx">
</span><span class="lines">@@ -578,7 +646,7 @@
</span><span class="cx"> // iconDatabasePath is non-empty by default, but m_iconDatabase isn't enabled in UI process unless setDatabasePath is called explicitly.
</span><span class="cx"> parameters.iconDatabaseEnabled = !iconDatabasePath().isEmpty();
</span><span class="cx">
</span><del>- parameters.terminationTimeout = 0;
</del><ins>+ parameters.terminationTimeout = (processModel() == ProcessModelSharedSecondaryProcess) ? sharedSecondaryProcessShutdownTimeout : 0;
</ins><span class="cx">
</span><span class="cx"> parameters.textCheckerState = TextChecker::state();
</span><span class="cx">
</span><span class="lines">@@ -591,6 +659,10 @@
</span><span class="cx"> supplement<WebNotificationManagerProxy>()->populateCopyOfNotificationPermissions(parameters.notificationPermissions);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+ parameters.usesNetworkProcess = usesNetworkProcess();
+#endif
+
</ins><span class="cx"> parameters.plugInAutoStartOriginHashes = m_plugInAutoStartProvider.autoStartOriginHashesCopy();
</span><span class="cx"> copyToVector(m_plugInAutoStartProvider.autoStartOrigins(), parameters.plugInAutoStartOrigins);
</span><span class="cx">
</span><span class="lines">@@ -634,8 +706,16 @@
</span><span class="cx">
</span><span class="cx"> m_processes.append(process.ptr());
</span><span class="cx">
</span><del>- ASSERT(m_messagesToInjectedBundlePostedToEmptyContext.isEmpty());
</del><ins>+ if (processModel() == ProcessModelSharedSecondaryProcess) {
+ for (size_t i = 0; i != m_messagesToInjectedBundlePostedToEmptyContext.size(); ++i) {
+ auto& messageNameAndBody = m_messagesToInjectedBundlePostedToEmptyContext[i];
</ins><span class="cx">
</span><ins>+ process->send(Messages::WebProcess::HandleInjectedBundleMessage(messageNameAndBody.first, UserData(process->transformObjectsToHandles(messageNameAndBody.second.get()).get())), 0);
+ }
+ m_messagesToInjectedBundlePostedToEmptyContext.clear();
+ } else
+ ASSERT(m_messagesToInjectedBundlePostedToEmptyContext.isEmpty());
+
</ins><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> // Initialize remote inspector connection now that we have a sub-process that is hosting one of our web views.
</span><span class="cx"> Inspector::RemoteInspector::singleton();
</span><span class="lines">@@ -718,12 +798,28 @@
</span><span class="cx">
</span><span class="cx"> // FIXME (Multi-WebProcess): <rdar://problem/12239765> Some of the invalidation calls below are still necessary in multi-process mode, but they should only affect data structures pertaining to the process being disconnected.
</span><span class="cx"> // Clearing everything causes assertion failures, so it's less trouble to skip that for now.
</span><ins>+ if (processModel() != ProcessModelSharedSecondaryProcess) {
+ RefPtr<WebProcessProxy> protect(process);
+ if (m_processWithPageCache == process)
+ m_processWithPageCache = 0;
+
+ static_cast<WebContextSupplement*>(supplement<WebGeolocationManagerProxy>())->processDidClose(process);
+
+ m_processes.removeFirst(process);
+ return;
+ }
+
+ WebContextSupplementMap::const_iterator it = m_supplements.begin();
+ WebContextSupplementMap::const_iterator end = m_supplements.end();
+ for (; it != end; ++it)
+ it->value->processDidClose(process);
+
+ // The vector may have the last reference to process proxy, which in turn may have the last reference to the context.
+ // Since vector elements are destroyed in place, we would recurse into WebProcessProxy destructor
+ // if it were invoked from Vector::remove(). RefPtr delays destruction until it's safe.
</ins><span class="cx"> RefPtr<WebProcessProxy> protect(process);
</span><span class="cx"> if (m_processWithPageCache == process)
</span><del>- m_processWithPageCache = 0;
-
- static_cast<WebContextSupplement*>(supplement<WebGeolocationManagerProxy>())->processDidClose(process);
-
</del><ins>+ m_processWithPageCache = nullptr;
</ins><span class="cx"> m_processes.removeFirst(process);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -755,14 +851,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<WebProcessProxy> process;
</span><del>- if (m_haveInitialEmptyProcess) {
- process = m_processes.last();
- m_haveInitialEmptyProcess = false;
- } else if (pageConfiguration->relatedPage()) {
- // Sharing processes, e.g. when creating the page via window.open().
- process = &pageConfiguration->relatedPage()->process();
- } else
- process = &createNewWebProcessRespectingProcessCountLimit();
</del><ins>+ if (processModel() == ProcessModelSharedSecondaryProcess) {
+ process = &ensureSharedWebProcess();
+ } else {
+ if (m_haveInitialEmptyProcess) {
+ process = m_processes.last();
+ m_haveInitialEmptyProcess = false;
+ } else if (pageConfiguration->relatedPage()) {
+ // Sharing processes, e.g. when creating the page via window.open().
+ process = &pageConfiguration->relatedPage()->process();
+ } else
+ process = &createNewWebProcessRespectingProcessCountLimit();
+ }
</ins><span class="cx">
</span><span class="cx"> return process->createWebPage(pageClient, WTF::move(pageConfiguration));
</span><span class="cx"> }
</span><span class="lines">@@ -770,16 +870,18 @@
</span><span class="cx"> DownloadProxy* WebProcessPool::download(WebPageProxy* initiatingPage, const ResourceRequest& request)
</span><span class="cx"> {
</span><span class="cx"> DownloadProxy* downloadProxy = createDownloadProxy(request);
</span><ins>+ uint64_t initiatingPageID = initiatingPage ? initiatingPage->pageID() : 0;
</ins><span class="cx"> SessionID sessionID = initiatingPage ? initiatingPage->sessionID() : SessionID::defaultSessionID();
</span><span class="cx">
</span><del>- if (networkProcess()) {
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess() && networkProcess()) {
</ins><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><ins>+#endif
</ins><span class="cx">
</span><del>- // FIXME: make networkProcess() return a reference so this is not necessary.
- ASSERT_NOT_REACHED();
</del><ins>+ m_processes[0]->send(Messages::WebProcess::DownloadRequest(sessionID, downloadProxy->downloadID(), initiatingPageID, request), 0);
</ins><span class="cx"> return downloadProxy;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -791,18 +893,25 @@
</span><span class="cx"> if (!path.isEmpty())
</span><span class="cx"> SandboxExtension::createHandle(path, SandboxExtension::ReadWrite, sandboxExtensionHandle);
</span><span class="cx">
</span><del>- if (networkProcess()) {
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess() && networkProcess()) {
</ins><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><ins>+#endif
</ins><span class="cx">
</span><del>- // FIXME: make networkProcess() return a reference so this is not necessary.
- ASSERT_NOT_REACHED();
</del><ins>+ m_processes[0]->send(Messages::WebProcess::ResumeDownload(downloadProxy->downloadID(), resumeData->dataReference(), path, sandboxExtensionHandle), 0);
</ins><span class="cx"> return downloadProxy;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::postMessageToInjectedBundle(const String& messageName, API::Object* messageBody)
</span><span class="cx"> {
</span><ins>+ if (m_processes.isEmpty()) {
+ if (processModel() == ProcessModelSharedSecondaryProcess)
+ m_messagesToInjectedBundlePostedToEmptyContext.append(std::make_pair(messageName, messageBody));
+ return;
+ }
+
</ins><span class="cx"> for (auto& process : m_processes) {
</span><span class="cx"> // FIXME: Return early if the message body contains any references to WKPageRefs/WKFrameRefs etc. since they're local to a process.
</span><span class="cx"> process->send(Messages::WebProcess::HandleInjectedBundleMessage(messageName, UserData(process->transformObjectsToHandles(messageBody).get())), 0);
</span><span class="lines">@@ -831,6 +940,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> PlatformProcessIdentifier WebProcessPool::networkProcessIdentifier()
</span><span class="cx"> {
</span><span class="cx"> if (!m_networkProcess)
</span><span class="lines">@@ -838,6 +948,7 @@
</span><span class="cx">
</span><span class="cx"> return m_networkProcess->processIdentifier();
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void WebProcessPool::setAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)
</span><span class="cx"> {
</span><span class="lines">@@ -877,9 +988,15 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::setCanHandleHTTPSServerTrustEvaluation(bool value)
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> m_canHandleHTTPSServerTrustEvaluation = value;
</span><del>- if (m_networkProcess)
</del><ins>+ if (usesNetworkProcess() && m_networkProcess) {
</ins><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::SetCanHandleHTTPSServerTrustEvaluation(value), 0);
</span><ins>+ return;
+ }
+#else
+ UNUSED_PARAM(value);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::registerURLSchemeAsLocal(const String& urlScheme)
</span><span class="lines">@@ -947,8 +1064,10 @@
</span><span class="cx"> m_configuration->setCacheModel(cacheModel);
</span><span class="cx"> sendToAllProcesses(Messages::WebProcess::SetCacheModel(cacheModel));
</span><span class="cx">
</span><del>- if (m_networkProcess)
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess() && m_networkProcess)
</ins><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::SetCacheModel(cacheModel), 0);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::setDefaultRequestTimeoutInterval(double timeoutInterval)
</span><span class="lines">@@ -958,9 +1077,15 @@
</span><span class="cx">
</span><span class="cx"> DownloadProxy* WebProcessPool::createDownloadProxy(const ResourceRequest& request)
</span><span class="cx"> {
</span><del>- ensureNetworkProcess();
- ASSERT(m_networkProcess);
- return m_networkProcess->createDownloadProxy(request);
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess()) {
+ ensureNetworkProcess();
+ ASSERT(m_networkProcess);
+ return m_networkProcess->createDownloadProxy(request);
+ }
+#endif
+
+ return ensureSharedWebProcess().createDownloadProxy(request);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::addMessageReceiver(IPC::StringReference messageReceiverName, IPC::MessageReceiver& messageReceiver)
</span><span class="lines">@@ -1057,10 +1182,12 @@
</span><span class="cx"> void WebProcessPool::useTestingNetworkSession()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_processes.isEmpty());
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> ASSERT(!m_networkProcess);
</span><span class="cx">
</span><span class="cx"> if (m_networkProcess)
</span><span class="cx"> return;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> if (!m_processes.isEmpty())
</span><span class="cx"> return;
</span><span class="lines">@@ -1070,18 +1197,22 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::allowSpecificHTTPSCertificateForHost(const WebCertificateInfo* certificate, const String& host)
</span><span class="cx"> {
</span><del>- if (m_networkProcess) {
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess() && m_networkProcess) {
</ins><span class="cx"> m_networkProcess->send(Messages::NetworkProcess::AllowSpecificHTTPSCertificateForHost(certificate->certificateInfo(), host), 0);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+#endif
</ins><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="cx"> return;
</span><ins>+#else
+ UNUSED_PARAM(certificate);
+ UNUSED_PARAM(host);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !PLATFORM(IOS)
</span><del>- // FIXME: Why is this only on iOS? Can we remove it?
</del><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -1122,19 +1253,40 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::requestWebContentStatistics(StatisticsRequest* request)
</span><span class="cx"> {
</span><del>- // FIXME (Multi-WebProcess) <rdar://problem/13200059>: Make getting statistics from multiple WebProcesses work.
</del><ins>+ if (processModel() == ProcessModelSharedSecondaryProcess) {
+ if (m_processes.isEmpty())
+ return;
+
+ uint64_t requestID = request->addOutstandingRequest();
+ m_statisticsRequests.set(requestID, request);
+ m_processes[0]->send(Messages::WebProcess::GetWebCoreStatistics(requestID), 0);
+
+ } else {
+ // FIXME (Multi-WebProcess) <rdar://problem/13200059>: Make getting statistics from multiple WebProcesses work.
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::requestNetworkingStatistics(StatisticsRequest* request)
</span><span class="cx"> {
</span><del>- if (!m_networkProcess) {
</del><ins>+ bool networkProcessUnavailable;
+#if ENABLE(NETWORK_PROCESS)
+ networkProcessUnavailable = !usesNetworkProcess() || !m_networkProcess;
+#else
+ networkProcessUnavailable = true;
+#endif
+
+ if (networkProcessUnavailable) {
</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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#else
+ UNUSED_PARAM(request);
+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -34,9 +34,9 @@
</span><span class="cx"> #include "GenericCallback.h"
</span><span class="cx"> #include "MessageReceiver.h"
</span><span class="cx"> #include "MessageReceiverMap.h"
</span><del>-#include "NetworkProcessProxy.h"
</del><span class="cx"> #include "PlugInAutoStartProvider.h"
</span><span class="cx"> #include "PluginInfoStore.h"
</span><ins>+#include "ProcessModel.h"
</ins><span class="cx"> #include "ProcessThrottler.h"
</span><span class="cx"> #include "StatisticsRequest.h"
</span><span class="cx"> #include "VisitedLinkStore.h"
</span><span class="lines">@@ -59,6 +59,10 @@
</span><span class="cx"> #include "DatabaseProcessProxy.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+#include "NetworkProcessProxy.h"
+#endif
+
</ins><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> #include "WebMediaSessionFocusManager.h"
</span><span class="cx"> #endif
</span><span class="lines">@@ -82,12 +86,14 @@
</span><span class="cx"> class WebIconDatabase;
</span><span class="cx"> class WebPageGroup;
</span><span class="cx"> class WebPageProxy;
</span><del>-struct NetworkProcessCreationParameters;
</del><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><ins>+#if ENABLE(NETWORK_PROCESS)
+struct NetworkProcessCreationParameters;
+#endif
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> int networkProcessLatencyQOS();
</span><span class="lines">@@ -136,6 +142,9 @@
</span><span class="cx"> void setHistoryClient(std::unique_ptr<API::LegacyContextHistoryClient>);
</span><span class="cx"> void setDownloadClient(std::unique_ptr<API::DownloadClient>);
</span><span class="cx">
</span><ins>+ void setProcessModel(ProcessModel); // Can only be called when there are no processes running.
+ ProcessModel processModel() const { return m_configuration->processModel(); }
+
</ins><span class="cx"> void setMaximumNumberOfProcesses(unsigned); // Can only be called when there are no processes running.
</span><span class="cx"> unsigned maximumNumberOfProcesses() const { return !m_configuration->maximumProcessCount() ? UINT_MAX : m_configuration->maximumProcessCount(); }
</span><span class="cx">
</span><span class="lines">@@ -184,7 +193,9 @@
</span><span class="cx"> void clearPluginClientPolicies();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> PlatformProcessIdentifier networkProcessIdentifier();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void setAlwaysUsesComplexTextCodePath(bool);
</span><span class="cx"> void setShouldUseFontSmoothing(bool);
</span><span class="lines">@@ -275,11 +286,16 @@
</span><span class="cx">
</span><span class="cx"> // Network Process Management
</span><span class="cx">
</span><ins>+ void setUsesNetworkProcess(bool);
+ bool usesNetworkProcess() const;
+
+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void ensureDatabaseProcess();
</span><span class="lines">@@ -362,7 +378,9 @@
</span><span class="cx"> void requestWebContentStatistics(StatisticsRequest*);
</span><span class="cx"> void requestNetworkingStatistics(StatisticsRequest*);
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> void platformInitializeNetworkProcess(NetworkProcessCreationParameters&);
</span><ins>+#endif
</ins><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">@@ -482,9 +500,11 @@
</span><span class="cx">
</span><span class="cx"> bool m_processTerminationEnabled;
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> bool m_canHandleHTTPSServerTrustEvaluation;
</span><span class="cx"> bool m_didNetworkProcessCrash;
</span><span class="cx"> RefPtr<NetworkProcessProxy> m_networkProcess;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> RefPtr<DatabaseProcessProxy> m_databaseProcess;
</span><span class="lines">@@ -519,15 +539,55 @@
</span><span class="cx"> template<typename T>
</span><span class="cx"> void WebProcessPool::sendToNetworkingProcess(T&& message)
</span><span class="cx"> {
</span><del>- if (m_networkProcess && m_networkProcess->canSendMessage())
- m_networkProcess->send(std::forward<T>(message), 0);
</del><ins>+ switch (processModel()) {
+ case ProcessModelSharedSecondaryProcess:
+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess()) {
+ if (m_networkProcess && m_networkProcess->canSendMessage())
+ m_networkProcess->send(std::forward<T>(message), 0);
+ return;
+ }
+#endif
+ if (!m_processes.isEmpty() && m_processes[0]->canSendMessage())
+ m_processes[0]->send(std::forward<T>(message), 0);
+ return;
+ case ProcessModelMultipleSecondaryProcesses:
+#if ENABLE(NETWORK_PROCESS)
+ if (m_networkProcess && m_networkProcess->canSendMessage())
+ m_networkProcess->send(std::forward<T>(message), 0);
+ return;
+#else
+ break;
+#endif
+ }
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="cx"> void WebProcessPool::sendToNetworkingProcessRelaunchingIfNecessary(T&& message)
</span><span class="cx"> {
</span><del>- ensureNetworkProcess();
- m_networkProcess->send(std::forward<T>(message), 0);
</del><ins>+ switch (processModel()) {
+ case ProcessModelSharedSecondaryProcess:
+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess()) {
+ ensureNetworkProcess();
+ m_networkProcess->send(std::forward<T>(message), 0);
+ return;
+ }
+#endif
+ ensureSharedWebProcess();
+ m_processes[0]->send(std::forward<T>(message), 0);
+ return;
+ case ProcessModelMultipleSecondaryProcesses:
+#if ENABLE(NETWORK_PROCESS)
+ ensureNetworkProcess();
+ m_networkProcess->send(std::forward<T>(message), 0);
+ return;
+#else
+ break;
+#endif
+ }
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="lines">@@ -556,12 +616,17 @@
</span><span class="cx"> void WebProcessPool::sendToAllProcessesRelaunchingThemIfNecessary(const T& message)
</span><span class="cx"> {
</span><span class="cx"> // FIXME (Multi-WebProcess): WebProcessPool doesn't track processes that have exited, so it cannot relaunch these. Perhaps this functionality won't be needed in this mode.
</span><ins>+ if (processModel() == ProcessModelSharedSecondaryProcess)
+ ensureSharedWebProcess();
</ins><span class="cx"> sendToAllProcesses(message);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="cx"> void WebProcessPool::sendToOneProcess(T&& message)
</span><span class="cx"> {
</span><ins>+ if (processModel() == ProcessModelSharedSecondaryProcess)
+ ensureSharedWebProcess();
+
</ins><span class="cx"> bool messageSent = false;
</span><span class="cx"> size_t processCount = m_processes.size();
</span><span class="cx"> for (size_t i = 0; i < processCount; ++i) {
</span><span class="lines">@@ -573,7 +638,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!messageSent) {
</del><ins>+ if (!messageSent && processModel() == ProcessModelMultipleSecondaryProcesses) {
</ins><span class="cx"> warmInitialProcess();
</span><span class="cx"> RefPtr<WebProcessProxy> process = m_processes.last();
</span><span class="cx"> if (process->canSendMessage())
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx">
</span><span class="cx"> // If this was the last WebPage open in that web process, and we have no other reason to keep it alive, let it go.
</span><span class="cx"> // We only allow this when using a network process, as otherwise the WebProcess needs to preserve its session state.
</span><del>- if (state() == State::Terminated || !canTerminateChildProcess())
</del><ins>+ if (!m_processPool->usesNetworkProcess() || state() == State::Terminated || !canTerminateChildProcess())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> shutDown();
</span><span class="lines">@@ -427,10 +427,12 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#endif // ENABLE(NETWORK_PROCESS)
</ins><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">@@ -700,6 +702,18 @@
</span><span class="cx"> send(Messages::WebProcess::SetTextCheckerState(TextChecker::state()), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+DownloadProxy* WebProcessProxy::createDownloadProxy(const ResourceRequest& request)
+{
+#if ENABLE(NETWORK_PROCESS)
+ ASSERT(!m_processPool->usesNetworkProcess());
+#endif
+
+ if (!m_downloadProxyMap)
+ m_downloadProxyMap = std::make_unique<DownloadProxyMap>(this);
+
+ return m_downloadProxyMap->createDownloadProxy(m_processPool, request);
+}
+
</ins><span class="cx"> void WebProcessProxy::didSaveToPageCache()
</span><span class="cx"> {
</span><span class="cx"> m_processPool->processDidCachePage(this);
</span><span class="lines">@@ -933,6 +947,7 @@
</span><span class="cx"> m_throttler.didCancelProcessSuspension();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> void WebProcessProxy::reinstateNetworkProcessAssertionState(NetworkProcessProxy& newNetworkProcessProxy)
</span><span class="cx"> {
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="lines">@@ -947,10 +962,11 @@
</span><span class="cx"> UNUSED_PARAM(newNetworkProcessProxy);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void WebProcessProxy::didSetAssertionState(AssertionState state)
</span><span class="cx"> {
</span><del>-#if PLATFORM(IOS)
</del><ins>+#if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> ASSERT(!m_backgroundTokenForNetworkProcess || !m_foregroundTokenForNetworkProcess);
</span><span class="cx">
</span><span class="cx"> switch (state) {
</span><span class="lines">@@ -962,12 +978,14 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case AssertionState::Background:
</span><del>- m_backgroundTokenForNetworkProcess = processPool().ensureNetworkProcess().throttler().backgroundActivityToken();
</del><ins>+ if (processPool().usesNetworkProcess())
+ m_backgroundTokenForNetworkProcess = processPool().ensureNetworkProcess().throttler().backgroundActivityToken();
</ins><span class="cx"> m_foregroundTokenForNetworkProcess = nullptr;
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case AssertionState::Foreground:
</span><del>- m_foregroundTokenForNetworkProcess = processPool().ensureNetworkProcess().throttler().foregroundActivityToken();
</del><ins>+ if (processPool().usesNetworkProcess())
+ m_foregroundTokenForNetworkProcess = processPool().ensureNetworkProcess().throttler().foregroundActivityToken();
</ins><span class="cx"> m_backgroundTokenForNetworkProcess = nullptr;
</span><span class="cx"> for (auto& page : m_pageMap.values())
</span><span class="cx"> page->processWillBecomeForeground();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -152,7 +152,9 @@
</span><span class="cx">
</span><span class="cx"> ProcessThrottler& throttler() { return m_throttler; }
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> void reinstateNetworkProcessAssertionState(NetworkProcessProxy&);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit WebProcessProxy(WebProcessPool&);
</span><span class="lines">@@ -184,7 +186,9 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> void getNetworkProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetNetworkProcessConnection::DelayedReply>);
</span><ins>+#endif
</ins><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">@@ -249,7 +253,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)
</del><ins>+#if PLATFORM(IOS) && ENABLE(NETWORK_PROCESS)
</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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.messages.in 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -38,7 +38,9 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> GetNetworkProcessConnection() -> (IPC::Attachment connectionHandle) Delayed
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -94,10 +94,12 @@
</span><span class="cx"> {
</span><span class="cx"> platformDestroy();
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #include "APIProcessPoolConfiguration.h"
</span><span class="cx"> #include "Logging.h"
</span><del>-#include "NetworkProcessMessages.h"
</del><span class="cx"> #include "WebCookieManagerProxy.h"
</span><span class="cx"> #include "WebInspectorServer.h"
</span><span class="cx"> #include "WebProcessCreationParameters.h"
</span><span class="lines">@@ -42,6 +41,10 @@
</span><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+#include "NetworkProcessMessages.h"
+#endif
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static void initInspectorServer()
</span><span class="lines">@@ -95,6 +98,16 @@
</span><span class="cx"> parameters.urlSchemesRegisteredAsLocal.append("resource");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (!usesNetworkProcess()) {
+ parameters.urlSchemesRegisteredForCustomProtocols = supplement<WebSoupCustomProtocolRequestManager>()->registeredSchemesForCustomProtocols();
+
+ supplement<WebCookieManagerProxy>()->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
+ parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
+
+ parameters.ignoreTLSErrors = m_ignoreTLSErrors;
+ parameters.diskCacheDirectory = m_configuration->diskCacheDirectory();
+ }
+
</ins><span class="cx"> parameters.memoryCacheDisabled = m_memoryCacheDisabled || cacheModel() == CacheModelDocumentViewer;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -136,8 +149,13 @@
</span><span class="cx"> void WebProcessPool::setIgnoreTLSErrors(bool ignoreTLSErrors)
</span><span class="cx"> {
</span><span class="cx"> m_ignoreTLSErrors = ignoreTLSErrors;
</span><del>- if (networkProcess())
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess() && networkProcess()) {
</ins><span class="cx"> networkProcess()->send(Messages::NetworkProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors), 0);
</span><ins>+ return;
+ }
+#endif
+ sendToAllProcesses(Messages::WebProcess::SetIgnoreTLSErrors(m_ignoreTLSErrors));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesssoupWebProcessPoolSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/UIProcess/soup/WebProcessPoolSoup.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> #include "WebProcessPool.h"
</span><span class="cx">
</span><span class="cx"> #include "NetworkProcessCreationParameters.h"
</span><span class="lines">@@ -46,3 +47,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -1460,6 +1460,7 @@
</span><span class="cx"> BC5750981268F3C6006F0F12 /* WebPopupMenuProxyMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */; };
</span><span class="cx"> BC575613126E0138006F0F12 /* APIError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BC575612126E0138006F0F12 /* APIError.cpp */; };
</span><span class="cx"> BC59548915C7868500FD1E3E /* WebKit2.h in Headers */ = {isa = PBXBuildFile; fileRef = BC59548815C7868500FD1E3E /* WebKit2.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><ins>+ BC597075116591D000551FCA /* ProcessModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BC597074116591D000551FCA /* ProcessModel.h */; };
</ins><span class="cx"> BC5C75C814954DA600BC4775 /* WKConnectionInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = BC5C75C614954DA600BC4775 /* WKConnectionInternal.h */; };
</span><span class="cx"> BC5D24A116CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
</span><span class="cx"> BC5D24A216CC3B9E007D5461 /* ChildProcessMain.mm in Sources */ = {isa = PBXBuildFile; fileRef = BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */; };
</span><span class="lines">@@ -3731,6 +3732,7 @@
</span><span class="cx"> BC5750961268F3C6006F0F12 /* WebPopupMenuProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPopupMenuProxyMac.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC575612126E0138006F0F12 /* APIError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = APIError.cpp; sourceTree = "<group>"; };
</span><span class="cx"> BC59548815C7868500FD1E3E /* WebKit2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKit2.h; sourceTree = "<group>"; };
</span><ins>+ BC597074116591D000551FCA /* ProcessModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessModel.h; sourceTree = "<group>"; };
</ins><span class="cx"> BC5C75C614954DA600BC4775 /* WKConnectionInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKConnectionInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> BC5D249F16CC3B9E007D5461 /* ChildProcessMain.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ChildProcessMain.mm; sourceTree = "<group>"; };
</span><span class="cx"> BC5D24B816CC40BB007D5461 /* BaseLegacyProcess.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BaseLegacyProcess.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -6236,6 +6238,7 @@
</span><span class="cx"> 1AC7537A183A9FDB0072CB15 /* PageLoadState.h */,
</span><span class="cx"> 37716A59195B910500EE8B1B /* ProcessAssertion.cpp */,
</span><span class="cx"> 86F9536018FF4FD4001DB2EF /* ProcessAssertion.h */,
</span><ins>+ BC597074116591D000551FCA /* ProcessModel.h */,
</ins><span class="cx"> 86E67A22190F411800004AB7 /* ProcessThrottler.cpp */,
</span><span class="cx"> 86E67A21190F411800004AB7 /* ProcessThrottler.h */,
</span><span class="cx"> 83048AE51ACA45DC0082C832 /* ProcessThrottlerClient.h */,
</span><span class="lines">@@ -7986,6 +7989,7 @@
</span><span class="cx"> E1CC1B9012D7EADF00625838 /* PrintInfo.h in Headers */,
</span><span class="cx"> 86F9536518FF58F5001DB2EF /* ProcessAssertion.h in Headers */,
</span><span class="cx"> BC1A7C581136E19C00FB7167 /* ProcessLauncher.h in Headers */,
</span><ins>+ BC597075116591D000551FCA /* ProcessModel.h in Headers */,
</ins><span class="cx"> 86E67A251910B9D100004AB7 /* ProcessThrottler.h in Headers */,
</span><span class="cx"> 83048AE61ACA45DC0082C832 /* ProcessThrottlerClient.h in Headers */,
</span><span class="cx"> 2D7F13101A702FBA009A6FBD /* ProcessType.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2Prefixh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2Prefix.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2Prefix.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebKit2Prefix.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -36,6 +36,8 @@
</span><span class="cx">
</span><span class="cx"> #define ENABLE_WEB_PROCESS_SANDBOX 1
</span><span class="cx">
</span><ins>+#define ENABLE_NETWORK_PROCESS 1
+
</ins><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">@@ -57,6 +59,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><ins>+#define ENABLE_NETWORK_PROCESS 1
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "BlobRegistryProxy.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "NetworkConnectionToWebProcessMessages.h"
</span><span class="cx"> #include "NetworkProcessConnection.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="lines">@@ -38,6 +40,8 @@
</span><span class="cx">
</span><span class="cx"> void BlobRegistryProxy::registerFileBlobURL(const WebCore::URL& url, PassRefPtr<BlobDataFileReference> file, const String& contentType)
</span><span class="cx"> {
</span><ins>+ ASSERT(WebProcess::singleton().usesNetworkProcess());
+
</ins><span class="cx"> SandboxExtension::Handle extensionHandle;
</span><span class="cx">
</span><span class="cx"> // File path can be empty when submitting a form file input without a file, see bug 111778.
</span><span class="lines">@@ -49,26 +53,36 @@
</span><span class="cx">
</span><span class="cx"> void BlobRegistryProxy::registerBlobURL(const URL& url, Vector<BlobPart> blobParts, const String& contentType)
</span><span class="cx"> {
</span><ins>+ ASSERT(WebProcess::singleton().usesNetworkProcess());
+
</ins><span class="cx"> WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURL(url, blobParts, contentType), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryProxy::registerBlobURL(const URL& url, const URL& srcURL)
</span><span class="cx"> {
</span><ins>+ ASSERT(WebProcess::singleton().usesNetworkProcess());
+
</ins><span class="cx"> WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLFromURL(url, srcURL), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryProxy::unregisterBlobURL(const URL& url)
</span><span class="cx"> {
</span><ins>+ ASSERT(WebProcess::singleton().usesNetworkProcess());
+
</ins><span class="cx"> WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::UnregisterBlobURL(url), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void BlobRegistryProxy::registerBlobURLForSlice(const URL& url, const URL& srcURL, long long start, long long end)
</span><span class="cx"> {
</span><ins>+ ASSERT(WebProcess::singleton().usesNetworkProcess());
+
</ins><span class="cx"> WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::RegisterBlobURLForSlice(url, srcURL, start, end), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned long long BlobRegistryProxy::blobSize(const URL& url)
</span><span class="cx"> {
</span><ins>+ ASSERT(WebProcess::singleton().usesNetworkProcess());
+
</ins><span class="cx"> uint64_t resultSize;
</span><span class="cx"> if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::BlobSize(url), Messages::NetworkConnectionToWebProcess::BlobSize::Reply(resultSize), 0))
</span><span class="cx"> return 0;
</span><span class="lines">@@ -76,3 +90,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef BlobRegistryProxy_h
</span><span class="cx"> #define BlobRegistryProxy_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include <WebCore/BlobRegistry.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -42,4 +44,6 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -37,6 +37,8 @@
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -96,3 +98,5 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> namespace IPC {
</span><span class="cx"> class DataReference;
</span><span class="cx"> }
</span><span class="lines">@@ -80,4 +82,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.messages.in 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -20,6 +20,8 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> messages -> NetworkProcessConnection LegacyReceiver {
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><span class="lines">@@ -27,3 +29,5 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> #include <WebCore/SubresourceLoader.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -284,3 +286,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -32,6 +32,8 @@
</span><span class="cx"> #include <WebCore/ResourceLoader.h>
</span><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class NetworkProcessConnection;
</span><span class="lines">@@ -75,4 +77,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebResourceLoader.h"
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetworkProcessConnection.h"
</span><span class="lines">@@ -219,3 +221,5 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef WebResourceLoader_h
</span><span class="cx"> #define WebResourceLoader_h
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><span class="cx"> #include "Connection.h"
</span><span class="cx"> #include "MessageSender.h"
</span><span class="cx"> #include "ShareableResource.h"
</span><span class="lines">@@ -92,4 +94,6 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
+
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -20,6 +20,8 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
+
</ins><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">@@ -37,3 +39,5 @@
</span><span class="cx"> DidReceiveResource(WebKit::ShareableResource::Handle resource, double finishTime)
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
+#endif // ENABLE(NETWORK_PROCESS)
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapeNetscapeBrowserFuncscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -1053,7 +1053,11 @@
</span><span class="cx"> netscapeFuncs.popupcontextmenu = 0;
</span><span class="cx"> netscapeFuncs.convertpoint = 0;
</span><span class="cx"> #endif
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> netscapeFuncs.urlredirectresponse = NPN_URLRedirectResponse;
</span><ins>+#else
+ netscapeFuncs.urlredirectresponse = 0;
+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePlugin.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -400,12 +400,16 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#else
+ controller()->continueStreamLoad(stream->streamID());
+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -26,12 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebPlatformStrategies.h"
</span><span class="cx">
</span><del>-#include "BlobRegistryProxy.h"
</del><span class="cx"> #include "BlockingResponseMap.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "HangDetectionDisabler.h"
</span><del>-#include "NetworkConnectionToWebProcessMessages.h"
-#include "NetworkProcessConnection.h"
</del><span class="cx"> #include "NetworkResourceLoadParameters.h"
</span><span class="cx"> #include "PluginInfoStore.h"
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="lines">@@ -47,7 +44,6 @@
</span><span class="cx"> #include "WebPasteboardProxyMessages.h"
</span><span class="cx"> #include "WebProcess.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><del>-#include "WebResourceLoadScheduler.h"
</del><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">@@ -67,6 +63,13 @@
</span><span class="cx"> #include <WebCore/URL.h>
</span><span class="cx"> #include <wtf/Atomics.h>
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+#include "BlobRegistryProxy.h"
+#include "NetworkConnectionToWebProcessMessages.h"
+#include "NetworkProcessConnection.h"
+#include "WebResourceLoadScheduler.h"
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -109,56 +112,114 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> auto& webProcess = WebProcess::singleton();
</span><del>- String result;
- if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesForDOM(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(result), 0))
- return String();
- return result;
</del><ins>+ if (webProcess.usesNetworkProcess()) {
+ String result;
+ if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesForDOM(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesForDOM::Reply(result), 0))
+ return String();
+ return result;
+ }
+#endif
+
+ return WebCore::cookiesForDOM(session, firstParty, url);
</ins><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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> auto& webProcess = WebProcess::singleton();
</span><del>- webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetCookiesFromDOM(SessionTracker::sessionID(session), firstParty, url, cookieString), 0);
</del><ins>+ if (webProcess.usesNetworkProcess()) {
+ webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::SetCookiesFromDOM(SessionTracker::sessionID(session), firstParty, url, cookieString), 0);
+ return;
+ }
+#endif
+
+ WebCore::setCookiesFromDOM(session, firstParty, url, cookieString);
</ins><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>- bool result;
- if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesEnabled(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesEnabled::Reply(result), 0))
- return false;
- return result;
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ auto& webProcess = WebProcess::singleton();
+ if (webProcess.usesNetworkProcess()) {
+ bool result;
+ if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookiesEnabled(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookiesEnabled::Reply(result), 0))
+ return false;
+ return result;
+ }
+#endif
+
+ return WebCore::cookiesEnabled(session, firstParty, url);
</ins><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>- String result;
- if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue::Reply(result), 0))
- return String();
- return result;
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ auto& webProcess = WebProcess::singleton();
+ if (webProcess.usesNetworkProcess()) {
+ String result;
+ if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::CookieRequestHeaderFieldValue::Reply(result), 0))
+ return String();
+ return result;
+ }
+#endif
+
+ return WebCore::cookieRequestHeaderFieldValue(session, firstParty, url);
</ins><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 (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::GetRawCookies(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::GetRawCookies::Reply(rawCookies), 0))
- return false;
- return true;
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ auto& webProcess = WebProcess::singleton();
+ if (webProcess.usesNetworkProcess()) {
+ if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::GetRawCookies(SessionTracker::sessionID(session), firstParty, url), Messages::NetworkConnectionToWebProcess::GetRawCookies::Reply(rawCookies), 0))
+ return false;
+ return true;
+ }
+#endif
+
+ return WebCore::getRawCookies(session, firstParty, url, rawCookies);
</ins><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>- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::DeleteCookie(SessionTracker::sessionID(session), url, cookieName), 0);
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ auto& webProcess = WebProcess::singleton();
+ if (webProcess.usesNetworkProcess()) {
+ webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::DeleteCookie(SessionTracker::sessionID(session), url, cookieName), 0);
+ return;
+ }
+#endif
+
+ WebCore::deleteCookie(session, url, cookieName);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // LoaderStrategy
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> ResourceLoadScheduler* WebPlatformStrategies::resourceLoadScheduler()
</span><span class="cx"> {
</span><del>- return &WebProcess::singleton().webResourceLoadScheduler();
</del><ins>+ static ResourceLoadScheduler* scheduler;
+ if (!scheduler) {
+ auto& webProcess = WebProcess::singleton();
+ if (webProcess.usesNetworkProcess())
+ scheduler = &webProcess.webResourceLoadScheduler();
+ else
+ scheduler = WebCore::resourceLoadScheduler();
+ }
+
+ return scheduler;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPlatformStrategies::loadResourceSynchronously(NetworkingContext* context, unsigned long resourceLoadIdentifier, const ResourceRequest& request, StoredCredentials storedCredentials, ClientCredentialPolicy clientCredentialPolicy, ResourceError& error, ResourceResponse& response, Vector<char>& data)
</span><span class="cx"> {
</span><ins>+ auto& webProcess = WebProcess::singleton();
+ if (!webProcess.usesNetworkProcess()) {
+ LoaderStrategy::loadResourceSynchronously(context, resourceLoadIdentifier, request, storedCredentials, clientCredentialPolicy, error, response, data);
+ return;
+ }
+
</ins><span class="cx"> WebFrameNetworkingContext* webContext = static_cast<WebFrameNetworkingContext*>(context);
</span><span class="cx"> // FIXME: Some entities in WebCore use WebCore's "EmptyFrameLoaderClient" instead of having a proper WebFrameLoaderClient.
</span><span class="cx"> // EmptyFrameLoaderClient shouldn't exist and everything should be using a WebFrameLoaderClient,
</span><span class="lines">@@ -182,7 +243,7 @@
</span><span class="cx">
</span><span class="cx"> HangDetectionDisabler hangDetectionDisabler;
</span><span class="cx">
</span><del>- if (!WebProcess::singleton().networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
</del><ins>+ if (!webProcess.networkConnection()->connection()->sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
</ins><span class="cx"> response = ResourceResponse();
</span><span class="cx"> error = internalError(request.url());
</span><span class="cx"> }
</span><span class="lines">@@ -195,6 +256,12 @@
</span><span class="cx"> if (!networkingContext)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ auto& webProcess = WebProcess::singleton();
+ if (!webProcess.usesNetworkProcess()) {
+ LoaderStrategy::createPingHandle(networkingContext, request, shouldUseCredentialStorage);
+ return;
+ }
+
</ins><span class="cx"> WebFrameNetworkingContext* webContext = static_cast<WebFrameNetworkingContext*>(networkingContext);
</span><span class="cx"> WebFrameLoaderClient* webFrameLoaderClient = webContext->webFrameLoaderClient();
</span><span class="cx"> WebFrame* webFrame = webFrameLoaderClient ? webFrameLoaderClient->webFrame() : nullptr;
</span><span class="lines">@@ -206,13 +273,16 @@
</span><span class="cx"> loadParameters.allowStoredCredentials = shouldUseCredentialStorage ? AllowStoredCredentials : DoNotAllowStoredCredentials;
</span><span class="cx"> loadParameters.shouldClearReferrerOnHTTPSToHTTPRedirect = networkingContext->shouldClearReferrerOnHTTPSToHTTPRedirect();
</span><span class="cx">
</span><del>- WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::LoadPing(loadParameters), 0);
</del><ins>+ webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::LoadPing(loadParameters), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> BlobRegistry* WebPlatformStrategies::createBlobRegistry()
</span><span class="cx"> {
</span><ins>+ if (!WebProcess::singleton().usesNetworkProcess())
+ return LoaderStrategy::createBlobRegistry();
</ins><span class="cx"> return new BlobRegistryProxy;
</span><span class="cx"> }
</span><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -59,10 +59,12 @@
</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><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><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><ins>+#endif
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebFrame.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -33,13 +33,10 @@
</span><span class="cx"> #include "InjectedBundleNodeHandle.h"
</span><span class="cx"> #include "InjectedBundleRangeHandle.h"
</span><span class="cx"> #include "InjectedBundleScriptWorld.h"
</span><del>-#include "NetworkConnectionToWebProcessMessages.h"
-#include "NetworkProcessConnection.h"
</del><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><del>-#include "WebCoreArgumentCoders.h"
</del><span class="cx"> #include "WebDocumentLoader.h"
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><span class="lines">@@ -84,6 +81,12 @@
</span><span class="cx"> #include <WebCore/LegacyWebArchive.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+#include "NetworkConnectionToWebProcessMessages.h"
+#include "NetworkProcessConnection.h"
+#include "WebCoreArgumentCoders.h"
+#endif
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> #include <wtf/RefCountedLeakCounter.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -254,9 +257,23 @@
</span><span class="cx"> m_policyDownloadID = 0;
</span><span class="cx">
</span><span class="cx"> auto& webProcess = WebProcess::singleton();
</span><ins>+#if USE(NETWORK_SESSION)
+ ASSERT(webProcess.usesNetworkProcess());
+#endif
</ins><span class="cx"> SessionID sessionID = page() ? page()->sessionID() : SessionID::defaultSessionID();
</span><del>- webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::StartDownload(sessionID, policyDownloadID, request), 0);
- return;
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (webProcess.usesNetworkProcess()) {
+ webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::StartDownload(sessionID, policyDownloadID, request), 0);
+ return;
+ }
+#endif
+
+#if USE(NETWORK_SESSION)
+ // Using NETWORK_SESSION requires the use of a network process.
+ RELEASE_ASSERT_NOT_REACHED();
+#else
+ webProcess.downloadManager().startDownload(sessionID, policyDownloadID, request);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebFrame::convertMainResourceLoadToDownload(DocumentLoader* documentLoader, SessionID sessionID, const ResourceRequest& request, const ResourceResponse& response)
</span><span class="lines">@@ -269,12 +286,39 @@
</span><span class="cx"> SubresourceLoader* mainResourceLoader = documentLoader->mainResourceLoader();
</span><span class="cx">
</span><span class="cx"> auto& webProcess = WebProcess::singleton();
</span><del>- // Use 0 to indicate that the resource load can't be converted and a new download must be started.
- // This can happen if there is no loader because the main resource is in the WebCore memory cache,
- // or because the conversion was attempted when not calling SubresourceLoader::didReceiveResponse().
- uint64_t mainResourceLoadIdentifier = mainResourceLoader ? mainResourceLoader->identifier() : 0;
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+#if USE(NETWORK_SESSION)
+ ASSERT(webProcess.usesNetworkProcess());
+#endif
+ if (webProcess.usesNetworkProcess()) {
+ // Use 0 to indicate that the resource load can't be converted and a new download must be started.
+ // This can happen if there is no loader because the main resource is in the WebCore memory cache,
+ // or because the conversion was attempted when not calling SubresourceLoader::didReceiveResponse().
+ uint64_t mainResourceLoadIdentifier;
+ if (mainResourceLoader)
+ mainResourceLoadIdentifier = mainResourceLoader->identifier();
+ else
+ mainResourceLoadIdentifier = 0;
</ins><span class="cx">
</span><del>- webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ConvertMainResourceLoadToDownload(sessionID, mainResourceLoadIdentifier, policyDownloadID, request, response), 0);
</del><ins>+ webProcess.networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::ConvertMainResourceLoadToDownload(sessionID, mainResourceLoadIdentifier, policyDownloadID, request, response), 0);
+ return;
+ }
+#endif
+
+ if (!mainResourceLoader) {
+ // The main resource has already been loaded. Start a new download instead.
+#if !USE(NETWORK_SESSION)
+ webProcess.downloadManager().startDownload(sessionID, policyDownloadID, request);
+#endif
+ return;
+ }
+
+#if USE(NETWORK_SESSION)
+ // Using NETWORK_SESSION requires the use of a network process.
+ RELEASE_ASSERT_NOT_REACHED();
+#else
+ webProcess.downloadManager().convertHandleToDownload(policyDownloadID, documentLoader->mainResourceLoader()->handle(), request, response);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebFrame::source() const
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "InjectedBundle.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "NetworkConnectionToWebProcessMessages.h"
</span><del>-#include "NetworkProcessConnection.h"
</del><span class="cx"> #include "PluginProcessConnectionManager.h"
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="cx"> #include "StatisticsData.h"
</span><span class="lines">@@ -61,7 +60,6 @@
</span><span class="cx"> #include "WebProcessMessages.h"
</span><span class="cx"> #include "WebProcessPoolMessages.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><del>-#include "WebResourceLoadScheduler.h"
</del><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">@@ -103,9 +101,12 @@
</span><span class="cx"> #include "ObjCObjectGraph.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> #include "CookieStorageShim.h"
</span><span class="cx"> #endif
</span><ins>+#include "NetworkProcessConnection.h"
+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><span class="cx"> #include "SecItemShim.h"
</span><span class="lines">@@ -123,6 +124,10 @@
</span><span class="cx"> #include "WebBatteryManager.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+#include "WebResourceLoadScheduler.h"
+#endif
+
</ins><span class="cx"> #if ENABLE(REMOTE_INSPECTOR)
</span><span class="cx"> #include <JavaScriptCore/RemoteInspector.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -156,8 +161,11 @@
</span><span class="cx"> , m_fullKeyboardAccessEnabled(false)
</span><span class="cx"> , m_textCheckerState()
</span><span class="cx"> , m_iconDatabaseProxy(new WebIconDatabaseProxy(this))
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+ , m_usesNetworkProcess(false)
</ins><span class="cx"> , m_webResourceLoadScheduler(new WebResourceLoadScheduler)
</span><span class="cx"> , m_dnsPrefetchHystereris([this](HysteresisState state) { if (state == HysteresisState::Stopped) m_dnsPrefetchedHosts.clear(); })
</span><ins>+#endif
</ins><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">@@ -244,10 +252,34 @@
</span><span class="cx"> connection->setOnlySendMessagesAsDispatchWhenWaitingForSyncReplyWhenProcessingSuchAMessage(true);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebProcess::didCreateDownload()
+{
+ disableTermination();
+}
+
+void WebProcess::didDestroyDownload()
+{
+ enableTermination();
+}
+
+IPC::Connection* WebProcess::downloadProxyConnection()
+{
+ return parentProcessConnection();
+}
+
+AuthenticationManager& WebProcess::downloadsAuthenticationManager()
+{
+ return *supplement<AuthenticationManager>();
+}
+
</ins><span class="cx"> void WebProcess::initializeWebProcess(WebProcessCreationParameters&& parameters)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_pageMap.isEmpty());
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
+ m_usesNetworkProcess = parameters.usesNetworkProcess;
+#endif
+
</ins><span class="cx"> #if OS(LINUX)
</span><span class="cx"> WebCore::MemoryPressureHandler::ReliefLogger::setLoggingEnabled(parameters.shouldEnableMemoryPressureReliefLogging);
</span><span class="cx"> #endif
</span><span class="lines">@@ -326,11 +358,14 @@
</span><span class="cx"> if (parameters.shouldUseTestingNetworkSession)
</span><span class="cx"> NetworkStorageSession::switchToNewTestingSession();
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> ensureNetworkProcessConnection();
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- CookieStorageShim::singleton().initialize();
</del><ins>+ if (usesNetworkProcess())
+ CookieStorageShim::singleton().initialize();
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> setTerminationTimeout(parameters.terminationTimeout);
</span><span class="cx">
</span><span class="cx"> resetPlugInAutoStartOriginHashes(parameters.plugInAutoStartOriginHashes);
</span><span class="lines">@@ -361,8 +396,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> void WebProcess::ensureNetworkProcessConnection()
</span><span class="cx"> {
</span><ins>+ if (!m_usesNetworkProcess)
+ return;
+
</ins><span class="cx"> if (m_networkProcessConnection)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -383,6 +422,7 @@
</span><span class="cx"> return;
</span><span class="cx"> m_networkProcessConnection = NetworkProcessConnection::create(connectionIdentifier);
</span><span class="cx"> }
</span><ins>+#endif // ENABLE(NETWORK_PROCESS)
</ins><span class="cx">
</span><span class="cx"> void WebProcess::registerURLSchemeAsEmptyDocument(const String& urlScheme)
</span><span class="cx"> {
</span><span class="lines">@@ -471,6 +511,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+DownloadManager& WebProcess::downloadManager()
+{
+ ASSERT(!usesNetworkProcess());
+
+ static NeverDestroyed<DownloadManager> downloadManager(this);
+ return downloadManager;
+}
+
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> PluginProcessConnectionManager& WebProcess::pluginProcessConnectionManager()
</span><span class="cx"> {
</span><span class="lines">@@ -533,6 +581,7 @@
</span><span class="cx"> bool WebProcess::shouldTerminate()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_pageMap.isEmpty());
</span><ins>+ ASSERT(usesNetworkProcess() || !downloadManager().isDownloading());
</ins><span class="cx">
</span><span class="cx"> // FIXME: the ShouldTerminate message should also send termination parameters, such as any session cookies that need to be preserved.
</span><span class="cx"> bool shouldTerminate = false;
</span><span class="lines">@@ -976,8 +1025,20 @@
</span><span class="cx"> injectedBundle->setBundleParameters(value);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool WebProcess::usesNetworkProcess() const
+{
+#if ENABLE(NETWORK_PROCESS)
+ return m_usesNetworkProcess;
+#else
+ return false;
+#endif
+}
+
+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> NetworkProcessConnection* WebProcess::networkConnection()
</span><span class="cx"> {
</span><ins>+ ASSERT(m_usesNetworkProcess);
+
</ins><span class="cx"> // If we've lost our connection to the network process (e.g. it crashed) try to re-establish it.
</span><span class="cx"> if (!m_networkProcessConnection)
</span><span class="cx"> ensureNetworkProcessConnection();
</span><span class="lines">@@ -1003,6 +1064,7 @@
</span><span class="cx"> {
</span><span class="cx"> return *m_webResourceLoadScheduler;
</span><span class="cx"> }
</span><ins>+#endif // ENABLED(NETWORK_PROCESS)
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void WebProcess::webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection* connection)
</span><span class="lines">@@ -1046,6 +1108,27 @@
</span><span class="cx">
</span><span class="cx"> #endif // ENABLED(DATABASE_PROCESS)
</span><span class="cx">
</span><ins>+void WebProcess::downloadRequest(SessionID sessionID, uint64_t downloadID, uint64_t initiatingPageID, const ResourceRequest& request)
+{
+ WebPage* initiatingPage = initiatingPageID ? webPage(initiatingPageID) : 0;
+
+ ResourceRequest requestWithOriginalURL = request;
+ if (initiatingPage)
+ initiatingPage->mainFrame()->loader().setOriginalURLForDownloadRequest(requestWithOriginalURL);
+
+ downloadManager().startDownload(sessionID, downloadID, requestWithOriginalURL);
+}
+
+void WebProcess::resumeDownload(uint64_t downloadID, const IPC::DataReference& resumeData, const String& path, const WebKit::SandboxExtension::Handle& sandboxExtensionHandle)
+{
+ downloadManager().resumeDownload(downloadID, resumeData, path, sandboxExtensionHandle);
+}
+
+void WebProcess::cancelDownload(uint64_t downloadID)
+{
+ downloadManager().cancelDownload(downloadID);
+}
+
</ins><span class="cx"> void WebProcess::setEnhancedAccessibility(bool flag)
</span><span class="cx"> {
</span><span class="cx"> WebCore::AXObjectCache::setEnhancedUserInterfaceAccessibility(flag);
</span><span class="lines">@@ -1387,12 +1470,18 @@
</span><span class="cx"> if (hostname.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_dnsPrefetchedHosts.add(hostname).isNewEntry)
- networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::PrefetchDNS(hostname), 0);
- // The DNS prefetched hosts cache is only to avoid asking for the same hosts too many times
- // in a very short period of time, producing a lot of IPC traffic. So we clear this cache after
- // some time of no DNS requests.
- m_dnsPrefetchHystereris.impulse();
</del><ins>+#if ENABLE(NETWORK_PROCESS)
+ if (usesNetworkProcess()) {
+ if (m_dnsPrefetchedHosts.add(hostname).isNewEntry)
+ networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::PrefetchDNS(hostname), 0);
+ // The DNS prefetched hosts cache is only to avoid asking for the same hosts too many times
+ // in a very short period of time, producing a lot of IPC traffic. So we clear this cache after
+ // some time of no DNS requests.
+ m_dnsPrefetchHystereris.impulse();
+ return;
+ }
+#endif
+ WebCore::prefetchDNS(hostname);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CacheModel.h"
</span><span class="cx"> #include "ChildProcess.h"
</span><ins>+#include "DownloadManager.h"
</ins><span class="cx"> #include "DrawingArea.h"
</span><span class="cx"> #include "PluginProcessConnectionManager.h"
</span><span class="cx"> #include "ResourceCachesToClear.h"
</span><span class="lines">@@ -70,9 +71,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+class DownloadManager;
</ins><span class="cx"> class EventDispatcher;
</span><span class="cx"> class InjectedBundle;
</span><del>-class NetworkProcessConnection;
</del><span class="cx"> class ObjCObjectGraph;
</span><span class="cx"> class UserData;
</span><span class="cx"> class WebConnectionToUIProcess;
</span><span class="lines">@@ -81,17 +82,22 @@
</span><span class="cx"> class WebPage;
</span><span class="cx"> class WebPageGroupProxy;
</span><span class="cx"> class WebProcessSupplement;
</span><del>-class WebResourceLoadScheduler;
</del><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><ins>+#if ENABLE(NETWORK_PROCESS)
+class NetworkProcessConnection;
+class WebResourceLoadScheduler;
+#endif
+
</ins><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> class WebToDatabaseProcessConnection;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-class WebProcess : public ChildProcess {
</del><ins>+class WebProcess : public ChildProcess, private DownloadManager::Client {
+ friend class NeverDestroyed<DownloadManager>;
</ins><span class="cx"> public:
</span><span class="cx"> static WebProcess& singleton();
</span><span class="cx">
</span><span class="lines">@@ -141,6 +147,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> const TextCheckerState& textCheckerState() const { return m_textCheckerState; }
</span><ins>+ DownloadManager& downloadManager();
</ins><span class="cx">
</span><span class="cx"> void clearResourceCaches(ResourceCachesToClear = AllResourceCaches);
</span><span class="cx">
</span><span class="lines">@@ -150,9 +157,13 @@
</span><span class="cx">
</span><span class="cx"> EventDispatcher& eventDispatcher() { return *m_eventDispatcher; }
</span><span class="cx">
</span><ins>+ bool usesNetworkProcess() const;
+
+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> NetworkProcessConnection* networkConnection();
</span><span class="cx"> void networkProcessConnectionClosed(NetworkProcessConnection*);
</span><span class="cx"> WebResourceLoadScheduler& webResourceLoadScheduler();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void webToDatabaseProcessConnectionClosed(WebToDatabaseProcessConnection*);
</span><span class="lines">@@ -211,6 +222,12 @@
</span><span class="cx"> WebProcess();
</span><span class="cx"> ~WebProcess();
</span><span class="cx">
</span><ins>+ // DownloadManager::Client.
+ virtual void didCreateDownload() override;
+ virtual void didDestroyDownload() override;
+ virtual IPC::Connection* downloadProxyConnection() override;
+ virtual AuthenticationManager& downloadsAuthenticationManager() override;
+
</ins><span class="cx"> void initializeWebProcess(WebProcessCreationParameters&&);
</span><span class="cx"> void platformInitializeWebProcess(WebProcessCreationParameters&&);
</span><span class="cx">
</span><span class="lines">@@ -342,11 +359,14 @@
</span><span class="cx">
</span><span class="cx"> WebIconDatabaseProxy* m_iconDatabaseProxy;
</span><span class="cx">
</span><ins>+#if ENABLE(NETWORK_PROCESS)
</ins><span class="cx"> void ensureNetworkProcessConnection();
</span><span class="cx"> RefPtr<NetworkProcessConnection> m_networkProcessConnection;
</span><ins>+ bool m_usesNetworkProcess;
</ins><span class="cx"> WebResourceLoadScheduler* m_webResourceLoadScheduler;
</span><span class="cx"> HashSet<String> m_dnsPrefetchedHosts;
</span><span class="cx"> WebCore::HysteresisActivity m_dnsPrefetchHystereris;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><span class="cx"> void ensureWebToDatabaseProcessConnection();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -62,6 +62,12 @@
</span><span class="cx"> void StartMemorySampler(WebKit::SandboxExtension::Handle sampleLogFileHandle, String sampleLogFilePath, double interval);
</span><span class="cx"> void StopMemorySampler();
</span><span class="cx">
</span><ins>+ # Downloads. This should really be in a Download.messages.in, but it seemed unnecessary to create a new file just for
+ # three messages.
+ DownloadRequest(WebCore::SessionID sessionID, uint64_t downloadID, uint64_t initiatingPageID, WebCore::ResourceRequest request)
+ ResumeDownload(uint64_t downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
+ CancelDownload(uint64_t downloadID)
+
</ins><span class="cx"> SetTextCheckerState(struct WebKit::TextCheckerState textCheckerState)
</span><span class="cx">
</span><span class="cx"> SetEnhancedAccessibility(bool flag)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesssoupWebProcessSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/WebProcess/soup/WebProcessSoup.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -49,6 +49,18 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+static uint64_t getCacheDiskFreeSize(SoupCache* cache)
+{
+ ASSERT(cache);
+
+ GUniqueOutPtr<char> cacheDir;
+ g_object_get(G_OBJECT(cache), "cache-dir", &cacheDir.outPtr(), NULL);
+ if (!cacheDir)
+ return 0;
+
+ return WebCore::getVolumeFreeSizeForPath(cacheDir.get());
+}
+
</ins><span class="cx"> void WebProcess::platformSetCacheModel(CacheModel cacheModel)
</span><span class="cx"> {
</span><span class="cx"> unsigned cacheTotalCapacity = 0;
</span><span class="lines">@@ -61,7 +73,13 @@
</span><span class="cx"> unsigned long urlCacheDiskCapacity = 0;
</span><span class="cx">
</span><span class="cx"> uint64_t diskFreeSize = 0;
</span><ins>+ SoupCache* cache = nullptr;
</ins><span class="cx">
</span><ins>+ if (!usesNetworkProcess()) {
+ cache = WebCore::SoupNetworkSession::defaultSession().cache();
+ diskFreeSize = getCacheDiskFreeSize(cache) / WTF::MB;
+ }
+
</ins><span class="cx"> uint64_t memSize = WTF::ramSize() / WTF::MB;
</span><span class="cx"> calculateCacheSizes(cacheModel, memSize, diskFreeSize,
</span><span class="cx"> cacheTotalCapacity, cacheMinDeadCapacity, cacheMaxDeadCapacity, deadDecodedDataDeletionInterval,
</span><span class="lines">@@ -76,12 +94,35 @@
</span><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> WebCore::PageCache::singleton().setShouldClearBackingStores(true);
</span><span class="cx"> #endif
</span><ins>+
+ if (!usesNetworkProcess()) {
+ if (urlCacheDiskCapacity > soup_cache_get_max_size(cache))
+ soup_cache_set_max_size(cache, urlCacheDiskCapacity);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::platformClearResourceCaches(ResourceCachesToClear cachesToClear)
</span><span class="cx"> {
</span><ins>+ if (cachesToClear == InMemoryResourceCachesOnly)
+ return;
+
+ // If we're using the network process then it is the only one that needs to clear the disk cache.
+ if (usesNetworkProcess())
+ return;
+
+ soup_cache_clear(WebCore::SoupNetworkSession::defaultSession().cache());
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+static void setSoupSessionAcceptLanguage(const Vector<String>& languages)
+{
+ WebCore::SoupNetworkSession::defaultSession().setAcceptLanguages(languages);
+}
+
+static void languageChanged(void*)
+{
+ setSoupSessionAcceptLanguage(WebCore::userPreferredLanguages());
+}
+
</ins><span class="cx"> void WebProcess::platformInitializeWebProcess(WebProcessCreationParameters&& parameters)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(SECCOMP_FILTERS)
</span><span class="lines">@@ -94,18 +135,62 @@
</span><span class="cx"> seccompFilters.initialize();
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><ins>+
+ if (usesNetworkProcess())
+ return;
+
+ ASSERT(!parameters.diskCacheDirectory.isEmpty());
+
+ // We used to use the given cache directory for the soup cache, but now we use a subdirectory to avoid
+ // conflicts with other cache files in the same directory. Remove the old cache files if they still exist.
+ WebCore::SoupNetworkSession::defaultSession().clearCache(WebCore::directoryName(parameters.diskCacheDirectory));
+
+#if ENABLE(NETWORK_CACHE)
+ // When network cache is enabled, the disk cache directory is the network process one.
+ CString diskCachePath = WebCore::pathByAppendingComponent(WebCore::directoryName(parameters.diskCacheDirectory), "webkit").utf8();
+#else
+ CString diskCachePath = parameters.diskCacheDirectory.utf8();
+#endif
+
+ GRefPtr<SoupCache> soupCache = adoptGRef(soup_cache_new(diskCachePath.data(), SOUP_CACHE_SINGLE_USER));
+ WebCore::SoupNetworkSession::defaultSession().setCache(soupCache.get());
+ // Set an initial huge max_size for the SoupCache so the call to soup_cache_load() won't evict any cached
+ // resource. The final size of the cache will be set by NetworkProcess::platformSetCacheModel().
+ unsigned initialMaxSize = soup_cache_get_max_size(soupCache.get());
+ soup_cache_set_max_size(soupCache.get(), G_MAXUINT);
+ soup_cache_load(soupCache.get());
+ soup_cache_set_max_size(soupCache.get(), initialMaxSize);
+
+ if (!parameters.cookiePersistentStoragePath.isEmpty()) {
+ supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStoragePath,
+ parameters.cookiePersistentStorageType);
+ }
+ supplement<WebCookieManager>()->setHTTPCookieAcceptPolicy(parameters.cookieAcceptPolicy);
+
+ if (!parameters.languages.isEmpty())
+ setSoupSessionAcceptLanguage(parameters.languages);
+
+ setIgnoreTLSErrors(parameters.ignoreTLSErrors);
+
+ WebCore::addLanguageChangeObserver(this, languageChanged);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::platformTerminate()
</span><span class="cx"> {
</span><ins>+ if (!usesNetworkProcess())
+ WebCore::removeLanguageChangeObserver(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::setIgnoreTLSErrors(bool ignoreTLSErrors)
</span><span class="cx"> {
</span><ins>+ ASSERT(!usesNetworkProcess());
+ WebCore::ResourceHandle::setIgnoreSSLErrors(ignoreTLSErrors);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo& certificateInfo, const String& host)
</span><span class="cx"> {
</span><ins>+ ASSERT(!usesNetworkProcess());
+ WebCore::ResourceHandle::setClientCertificate(host, certificateInfo.certificate());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2configh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/config.h (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/config.h 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/WebKit2/config.h 2015-11-20 03:52:56 UTC (rev 192673)
</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 PLATFORM(COCOA) || PLATFORM(GTK)
</del><ins>+#if ENABLE(NETWORK_PROCESS) && (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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/cmake/OptionsEfl.cmake 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -106,6 +106,7 @@
</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><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS PUBLIC ON)
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -186,6 +186,7 @@
</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><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS PRIVATE ON)
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsMac.cmake 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/cmake/OptionsMac.cmake 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -220,6 +220,7 @@
</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><ins>+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_NETWORK_PROCESS PRIVATE ON)
</ins><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 (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/WebKitFeatures.cmake 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Source/cmake/WebKitFeatures.cmake 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -128,6 +128,7 @@
</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><ins>+ WEBKIT_OPTION_DEFINE(ENABLE_NETWORK_PROCESS "Toggle dedicated network process support in WebKit2" PRIVATE OFF)
</ins><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>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Tools/ChangeLog 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-11-19 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r192667 and r192668.
+ https://bugs.webkit.org/show_bug.cgi?id=151476
+
+ broke api tests (Requested by alexchristensen on #webkit).
+
+ Reverted changesets:
+
+ "Remove the non-NetworkProcess configurations"
+ https://bugs.webkit.org/show_bug.cgi?id=151418
+ http://trac.webkit.org/changeset/192667
+
+ "Fix GTK Build after r192667."
+ http://trac.webkit.org/changeset/192668
+
</ins><span class="cx"> 2015-11-19 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove the non-NetworkProcess configurations
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2macGetPIDAfterAbortedProcessLaunchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> TEST(WebKit2, GetPIDAfterAbortedProcessLaunch)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><ins>+ WKContextSetUsesNetworkProcess(context.get(), true);
</ins><span class="cx">
</span><span class="cx"> PlatformWebView webView(context.get());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (192672 => 192673)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-11-20 02:45:09 UTC (rev 192672)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-11-20 03:52:56 UTC (rev 192673)
</span><span class="lines">@@ -400,6 +400,11 @@
</span><span class="cx">
</span><span class="cx"> m_geolocationProvider = std::make_unique<GeolocationProviderMock>(m_context.get());
</span><span class="cx">
</span><ins>+#if PLATFORM(EFL)
+ WKContextSetUsesNetworkProcess(m_context.get(), false);
+ WKContextSetProcessModel(m_context.get(), kWKProcessModelSharedSecondaryProcess);
+#endif
+
</ins><span class="cx"> if (const char* dumpRenderTreeTemp = libraryPathForTesting()) {
</span><span class="cx"> String temporaryFolder = String::fromUTF8(dumpRenderTreeTemp);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>