<!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>[192808] 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/192808">192808</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-11-30 11:11:09 -0800 (Mon, 30 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make ProcessModel always MultipleSecondaryProcesses
https://bugs.webkit.org/show_bug.cgi?id=151662
Reviewed by Antti Koivisto.
Source/WebKit2:
Single WebProcess behavior can still be achieved by setting the maximum number of WebProcesses to 1.
* Shared/API/c/WKDeprecatedFunctions.cpp:
(WKContextSetUsesNetworkProcess):
(WKContextSetProcessModel):
(WKContextGetProcessModel):
(WKGraphicsContextGetCGContext):
* UIProcess/API/APIProcessPoolConfiguration.cpp:
(API::ProcessPoolConfiguration::createWithLegacyOptions):
(API::ProcessPoolConfiguration::copy):
* UIProcess/API/APIProcessPoolConfiguration.h:
* UIProcess/API/C/WKAPICast.h:
(WebKit::toAPI):
(WebKit::toFontSmoothingLevel):
(WebKit::toProcessModel): Deleted.
* UIProcess/API/C/WKContext.cpp:
(WKContextGetCacheModel):
(WKContextSetMaximumNumberOfProcesses):
(WKContextSetProcessModel): Deleted.
(WKContextGetProcessModel): Deleted.
* UIProcess/API/C/WKContext.h:
* UIProcess/API/Cocoa/WKProcessGroup.mm:
(-[WKProcessGroup initWithInjectedBundleURL:]):
* UIProcess/API/Cocoa/WKProcessPool.mm:
* UIProcess/API/efl/ewk_context.cpp:
(EwkContext::cacheModel):
(EwkContext::setProcessModel):
(EwkContext::processModel):
(EwkContext::clearResourceCache):
(EwkContext::jsGlobalContext):
(ewk_context_message_from_extensions_callback_set):
(ewk_context_process_model_set):
(ewk_context_process_model_get):
(ewk_context_tls_error_policy_get):
(toWKProcessModel): Deleted.
(toEwkProcessModel): Deleted.
* UIProcess/API/gtk/WebKitWebContext.cpp:
* UIProcess/ProcessModel.h: Removed.
* UIProcess/WebCookieManagerProxy.cpp:
(WebKit::WebCookieManagerProxy::shouldTerminate):
(WebKit::WebCookieManagerProxy::refWebContextSupplement):
* UIProcess/WebInspectorProxy.cpp:
(WebKit::WebInspectorProxy::inspectorProcessPool):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::reattachToWebProcess):
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::create):
(WebKit::WebProcessPool::setDownloadClient):
(WebKit::WebProcessPool::setMaximumNumberOfProcesses):
(WebKit::WebProcessPool::processDidCachePage):
(WebKit::WebProcessPool::createNewWebProcess):
(WebKit::WebProcessPool::disconnectProcess):
(WebKit::WebProcessPool::createWebPage):
(WebKit::WebProcessPool::postMessageToInjectedBundle):
(WebKit::WebProcessPool::requestWebContentStatistics):
(WebKit::WebProcessPool::requestNetworkingStatistics):
(WebKit::WebProcessPool::setProcessModel): Deleted.
(WebKit::WebProcessPool::ensureSharedWebProcess): Deleted.
* UIProcess/WebProcessPool.h:
(WebKit::WebProcessPool::sendToAllProcessesRelaunchingThemIfNecessary):
(WebKit::WebProcessPool::sendToOneProcess):
* WebKit2.xcodeproj/project.pbxproj:
Tools:
* TestWebKitAPI/Tests/WebKit2/Geolocation.cpp:
(TestWebKitAPI::TEST):
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::generatePageConfiguration):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp">trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp</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="#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="#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="#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="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2Geolocationcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
<h3>Removed 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="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/ChangeLog 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -1,3 +1,73 @@
</span><ins>+2015-11-30 Alex Christensen <achristensen@webkit.org>
+
+ Make ProcessModel always MultipleSecondaryProcesses
+ https://bugs.webkit.org/show_bug.cgi?id=151662
+
+ Reviewed by Antti Koivisto.
+
+ Single WebProcess behavior can still be achieved by setting the maximum number of WebProcesses to 1.
+
+ * Shared/API/c/WKDeprecatedFunctions.cpp:
+ (WKContextSetUsesNetworkProcess):
+ (WKContextSetProcessModel):
+ (WKContextGetProcessModel):
+ (WKGraphicsContextGetCGContext):
+ * UIProcess/API/APIProcessPoolConfiguration.cpp:
+ (API::ProcessPoolConfiguration::createWithLegacyOptions):
+ (API::ProcessPoolConfiguration::copy):
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+ * UIProcess/API/C/WKAPICast.h:
+ (WebKit::toAPI):
+ (WebKit::toFontSmoothingLevel):
+ (WebKit::toProcessModel): Deleted.
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextGetCacheModel):
+ (WKContextSetMaximumNumberOfProcesses):
+ (WKContextSetProcessModel): Deleted.
+ (WKContextGetProcessModel): Deleted.
+ * UIProcess/API/C/WKContext.h:
+ * UIProcess/API/Cocoa/WKProcessGroup.mm:
+ (-[WKProcessGroup initWithInjectedBundleURL:]):
+ * UIProcess/API/Cocoa/WKProcessPool.mm:
+ * UIProcess/API/efl/ewk_context.cpp:
+ (EwkContext::cacheModel):
+ (EwkContext::setProcessModel):
+ (EwkContext::processModel):
+ (EwkContext::clearResourceCache):
+ (EwkContext::jsGlobalContext):
+ (ewk_context_message_from_extensions_callback_set):
+ (ewk_context_process_model_set):
+ (ewk_context_process_model_get):
+ (ewk_context_tls_error_policy_get):
+ (toWKProcessModel): Deleted.
+ (toEwkProcessModel): Deleted.
+ * UIProcess/API/gtk/WebKitWebContext.cpp:
+ * UIProcess/ProcessModel.h: Removed.
+ * UIProcess/WebCookieManagerProxy.cpp:
+ (WebKit::WebCookieManagerProxy::shouldTerminate):
+ (WebKit::WebCookieManagerProxy::refWebContextSupplement):
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::WebInspectorProxy::inspectorProcessPool):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::reattachToWebProcess):
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::create):
+ (WebKit::WebProcessPool::setDownloadClient):
+ (WebKit::WebProcessPool::setMaximumNumberOfProcesses):
+ (WebKit::WebProcessPool::processDidCachePage):
+ (WebKit::WebProcessPool::createNewWebProcess):
+ (WebKit::WebProcessPool::disconnectProcess):
+ (WebKit::WebProcessPool::createWebPage):
+ (WebKit::WebProcessPool::postMessageToInjectedBundle):
+ (WebKit::WebProcessPool::requestWebContentStatistics):
+ (WebKit::WebProcessPool::requestNetworkingStatistics):
+ (WebKit::WebProcessPool::setProcessModel): Deleted.
+ (WebKit::WebProcessPool::ensureSharedWebProcess): Deleted.
+ * UIProcess/WebProcessPool.h:
+ (WebKit::WebProcessPool::sendToAllProcessesRelaunchingThemIfNecessary):
+ (WebKit::WebProcessPool::sendToOneProcess):
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-11-30 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][Cache] We should not speculatively revalidate transient resources
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDeprecatedFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/Shared/API/c/WKDeprecatedFunctions.cpp 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -139,6 +139,15 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WKContextSetProcessModel(WKContextRef, WKProcessModel)
+{
+}
+
+WKProcessModel WKContextGetProcessModel(WKContextRef)
+{
+ return kWKProcessModelMultipleSecondaryProcesses;
+}
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> CGContextRef WKGraphicsContextGetCGContext(WKGraphicsContextRef graphicsContext)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.cpp 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -41,14 +41,7 @@
</span><span class="cx"> auto configuration = ProcessPoolConfiguration::create();
</span><span class="cx">
</span><span class="cx"> configuration->m_shouldHaveLegacyDataStore = true;
</span><del>-#if PLATFORM(GTK)
- // FIXME: Remove this ifdef once all ports have switched to use always NetworkProcess.
- // See https://bugs.webkit.org/show_bug.cgi?id=151418.
- configuration->m_processModel = WebKit::ProcessModelMultipleSecondaryProcesses;
</del><span class="cx"> configuration->m_maximumProcessCount = 1;
</span><del>-#else
- configuration->m_processModel = WebKit::ProcessModelSharedSecondaryProcess;
-#endif
</del><span class="cx"> configuration->m_cacheModel = WebKit::CacheModelDocumentViewer;
</span><span class="cx">
</span><span class="cx"> configuration->m_applicationCacheDirectory = WebKit::WebProcessPool::legacyPlatformDefaultApplicationCacheDirectory();
</span><span class="lines">@@ -80,7 +73,6 @@
</span><span class="cx"> auto copy = this->create();
</span><span class="cx">
</span><span class="cx"> copy->m_shouldHaveLegacyDataStore = this->m_shouldHaveLegacyDataStore;
</span><del>- copy->m_processModel = this->m_processModel;
</del><span class="cx"> copy->m_maximumProcessCount = this->m_maximumProcessCount;
</span><span class="cx"> copy->m_cacheModel = this->m_cacheModel;
</span><span class="cx"> copy->m_diskCacheSizeOverride = this->m_diskCacheSizeOverride;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIProcessPoolConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/API/APIProcessPoolConfiguration.h 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "CacheModel.h"
</span><del>-#include "ProcessModel.h"
</del><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">@@ -48,9 +47,6 @@
</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><del>- WebKit::ProcessModel processModel() const { return m_processModel; }
- void setProcessModel(WebKit::ProcessModel processModel) { m_processModel = processModel; }
-
</del><span class="cx"> unsigned maximumProcessCount() const { return m_maximumProcessCount; }
</span><span class="cx"> void setMaximumProcessCount(unsigned maximumProcessCount) { m_maximumProcessCount = maximumProcessCount; }
</span><span class="cx">
</span><span class="lines">@@ -93,7 +89,6 @@
</span><span class="cx"> private:
</span><span class="cx"> bool m_shouldHaveLegacyDataStore { false };
</span><span class="cx">
</span><del>- WebKit::ProcessModel m_processModel { WebKit::ProcessModelMultipleSecondaryProcesses };
</del><span class="cx"> unsigned m_maximumProcessCount { 0 };
</span><span class="cx"> WebKit::CacheModel m_cacheModel { WebKit::CacheModelPrimaryWebBrowser };
</span><span class="cx"> int64_t m_diskCacheSizeOverride { -1 };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "HTTPCookieAcceptPolicy.h"
</span><span class="cx"> #include "InjectedBundleHitTestResultMediaType.h"
</span><span class="cx"> #include "PluginModuleInfo.h"
</span><del>-#include "ProcessModel.h"
</del><span class="cx"> #include "ResourceCachesToClear.h"
</span><span class="cx"> #include "WKBundleHitTestResult.h"
</span><span class="cx"> #include "WKContext.h"
</span><span class="lines">@@ -230,31 +229,6 @@
</span><span class="cx"> return kWKCacheModelDocumentViewer;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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;
-}
-
</del><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 (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -329,16 +329,6 @@
</span><span class="cx"> return toAPI(toImpl(contextRef)->cacheModel());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKContextSetProcessModel(WKContextRef contextRef, WKProcessModel processModel)
-{
- toImpl(contextRef)->setProcessModel(toProcessModel(processModel));
-}
-
-WKProcessModel WKContextGetProcessModel(WKContextRef contextRef)
-{
- return toAPI(toImpl(contextRef)->processModel());
-}
-
</del><span class="cx"> void WKContextSetMaximumNumberOfProcesses(WKContextRef contextRef, unsigned numberOfProcesses)
</span><span class="cx"> {
</span><span class="cx"> toImpl(contextRef)->setMaximumNumberOfProcesses(numberOfProcesses);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.h (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.h 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -75,6 +75,7 @@
</span><span class="cx"> WKContextCopyWebCryptoMasterKeyCallback copyWebCryptoMasterKey;
</span><span class="cx"> } WKContextClientV1;
</span><span class="cx">
</span><ins>+// FIXME: Remove these once support for Mavericks has been dropped.
</ins><span class="cx"> enum {
</span><span class="cx"> kWKProcessModelSharedSecondaryProcess = 0,
</span><span class="cx"> kWKProcessModelMultipleSecondaryProcesses = 1
</span><span class="lines">@@ -111,8 +112,9 @@
</span><span class="cx"> WK_EXPORT void WKContextSetCacheModel(WKContextRef context, WKCacheModel cacheModel);
</span><span class="cx"> WK_EXPORT WKCacheModel WKContextGetCacheModel(WKContextRef context);
</span><span class="cx">
</span><del>-WK_EXPORT void WKContextSetProcessModel(WKContextRef context, WKProcessModel processModel);
-WK_EXPORT WKProcessModel WKContextGetProcessModel(WKContextRef context);
</del><ins>+// FIXME: Move these to WKDeprecatedFunctions.cpp once support for Mavericks has been dropped.
+WK_EXPORT void WKContextSetProcessModel(WKContextRef, WKProcessModel);
+WK_EXPORT WKProcessModel WKContextGetProcessModel(WKContextRef);
</ins><span class="cx">
</span><span class="cx"> WK_EXPORT void WKContextSetMaximumNumberOfProcesses(WKContextRef context, unsigned numberOfProcesses);
</span><span class="cx"> WK_EXPORT unsigned WKContextGetMaximumNumberOfProcesses(WKContextRef context);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKProcessGroupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessGroup.mm 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -192,9 +192,6 @@
</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><del>-#if PLATFORM(IOS)
- configuration->setProcessModel(ProcessModelMultipleSecondaryProcesses);
-#endif
</del><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 (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKProcessPool.mm 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx">
</span><span class="cx"> #import "CacheModel.h"
</span><span class="cx"> #import "DownloadClient.h"
</span><del>-#import "ProcessModel.h"
</del><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 (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/API/efl/ewk_context.cpp 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -257,45 +257,13 @@
</span><span class="cx"> return static_cast<Ewk_Cache_Model>(WKContextGetCacheModel(m_context.get()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline WKProcessModel toWKProcessModel(Ewk_Process_Model processModel)
</del><ins>+void EwkContext::setProcessModel(Ewk_Process_Model)
</ins><span class="cx"> {
</span><del>- switch (processModel) {
- case EWK_PROCESS_MODEL_SHARED_SECONDARY:
- return kWKProcessModelSharedSecondaryProcess;
- case EWK_PROCESS_MODEL_MULTIPLE_SECONDARY:
- return kWKProcessModelMultipleSecondaryProcesses;
- }
- ASSERT_NOT_REACHED();
-
- return kWKProcessModelSharedSecondaryProcess;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-void EwkContext::setProcessModel(Ewk_Process_Model processModel)
-{
- WKProcessModel newWKProcessModel = toWKProcessModel(processModel);
-
- if (WKContextGetProcessModel(m_context.get()) == newWKProcessModel)
- return;
-
- WKContextSetProcessModel(m_context.get(), newWKProcessModel);
-}
-
-inline Ewk_Process_Model toEwkProcessModel(WKProcessModel processModel)
-{
- switch (processModel) {
- case kWKProcessModelSharedSecondaryProcess:
- return EWK_PROCESS_MODEL_SHARED_SECONDARY;
- case kWKProcessModelMultipleSecondaryProcesses:
- return EWK_PROCESS_MODEL_MULTIPLE_SECONDARY;
- }
- ASSERT_NOT_REACHED();
-
- return EWK_PROCESS_MODEL_SHARED_SECONDARY;
-}
-
</del><span class="cx"> Ewk_Process_Model EwkContext::processModel() const
</span><span class="cx"> {
</span><del>- return toEwkProcessModel(WKContextGetProcessModel(m_context.get()));
</del><ins>+ return EWK_PROCESS_MODEL_MULTIPLE_SECONDARY;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="lines">@@ -311,7 +279,6 @@
</span><span class="cx"> WKResourceCacheManagerClearCacheForAllOrigins(WKContextGetResourceCacheManager(m_context.get()), WKResourceCachesToClearAll);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> JSGlobalContextRef EwkContext::jsGlobalContext()
</span><span class="cx"> {
</span><span class="cx"> if (!m_jsGlobalContext)
</span><span class="lines">@@ -567,20 +534,15 @@
</span><span class="cx"> impl->setMessageFromExtensionCallback(callback, userData);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Eina_Bool ewk_context_process_model_set(Ewk_Context* ewkContext, Ewk_Process_Model processModel)
</del><ins>+Eina_Bool ewk_context_process_model_set(Ewk_Context* ewkContext, Ewk_Process_Model)
</ins><span class="cx"> {
</span><span class="cx"> EWK_OBJ_GET_IMPL_OR_RETURN(EwkContext, ewkContext, impl, false);
</span><del>-
- impl->setProcessModel(processModel);
-
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ewk_Process_Model ewk_context_process_model_get(const Ewk_Context* ewkContext)
</span><span class="cx"> {
</span><del>- EWK_OBJ_GET_IMPL_OR_RETURN(const EwkContext, ewkContext, impl, EWK_PROCESS_MODEL_SHARED_SECONDARY);
-
- return impl->processModel();
</del><ins>+ return EWK_PROCESS_MODEL_MULTIPLE_SECONDARY;
</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="trunkSourceWebKit2UIProcessProcessModelh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/UIProcess/ProcessModel.h (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ProcessModel.h 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/ProcessModel.h 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -1,38 +0,0 @@
</span><del>-/*
- * 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
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -85,8 +85,7 @@
</span><span class="cx">
</span><span class="cx"> bool WebCookieManagerProxy::shouldTerminate(WebProcessProxy*) const
</span><span class="cx"> {
</span><del>- return processPool()->processModel() != ProcessModelSharedSecondaryProcess
- || (m_arrayCallbacks.isEmpty() && m_httpCookieAcceptPolicyCallbacks.isEmpty());
</del><ins>+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebCookieManagerProxy::refWebContextSupplement()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -312,7 +312,6 @@
</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><del>- configuration->setProcessModel(ProcessModelMultipleSecondaryProcesses);
</del><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 (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -691,10 +691,7 @@
</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>- if (m_process->processPool().processModel() == ProcessModelSharedSecondaryProcess)
- m_process = m_process->processPool().ensureSharedWebProcess();
- else
- m_process = m_process->processPool().createNewWebProcessRespectingProcessCountLimit();
</del><ins>+ 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></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -102,8 +102,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-static const double sharedSecondaryProcessShutdownTimeout = 60;
-
</del><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">@@ -281,17 +279,6 @@
</span><span class="cx"> m_downloadClient = WTF::move(downloadClient);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> void WebProcessPool::setMaximumNumberOfProcesses(unsigned maximumNumberOfProcesses)
</span><span class="cx"> {
</span><span class="cx"> // Guard against API misuse.
</span><span class="lines">@@ -521,14 +508,6 @@
</span><span class="cx"> m_processWithPageCache = process;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebProcessProxy& WebProcessPool::ensureSharedWebProcess()
-{
- ASSERT(processModel() == ProcessModelSharedSecondaryProcess);
- if (m_processes.isEmpty())
- createNewWebProcess();
- return *m_processes[0];
-}
-
</del><span class="cx"> WebProcessProxy& WebProcessPool::createNewWebProcess()
</span><span class="cx"> {
</span><span class="cx"> ensureNetworkProcess();
</span><span class="lines">@@ -595,7 +574,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 = (processModel() == ProcessModelSharedSecondaryProcess) ? sharedSecondaryProcessShutdownTimeout : 0;
</del><ins>+ parameters.terminationTimeout = 0;
</ins><span class="cx">
</span><span class="cx"> parameters.textCheckerState = TextChecker::state();
</span><span class="cx">
</span><span class="lines">@@ -651,16 +630,8 @@
</span><span class="cx">
</span><span class="cx"> m_processes.append(process.ptr());
</span><span class="cx">
</span><del>- if (processModel() == ProcessModelSharedSecondaryProcess) {
- for (size_t i = 0; i != m_messagesToInjectedBundlePostedToEmptyContext.size(); ++i) {
- auto& messageNameAndBody = m_messagesToInjectedBundlePostedToEmptyContext[i];
</del><ins>+ ASSERT(m_messagesToInjectedBundlePostedToEmptyContext.isEmpty());
</ins><span class="cx">
</span><del>- process->send(Messages::WebProcess::HandleInjectedBundleMessage(messageNameAndBody.first, UserData(process->transformObjectsToHandles(messageNameAndBody.second.get()).get())), 0);
- }
- m_messagesToInjectedBundlePostedToEmptyContext.clear();
- } else
- ASSERT(m_messagesToInjectedBundlePostedToEmptyContext.isEmpty());
-
</del><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">@@ -741,30 +712,14 @@
</span><span class="cx"> if (m_haveInitialEmptyProcess && process == m_processes.last())
</span><span class="cx"> m_haveInitialEmptyProcess = false;
</span><span class="cx">
</span><del>- // 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.
</del><ins>+ // FIXME (Multi-WebProcess): <rdar://problem/12239765> Some of the invalidation calls of the other supplements are still necessary in multi-process mode, but they should only affect data structures pertaining to the process being disconnected.
</ins><span class="cx"> // Clearing everything causes assertion failures, so it's less trouble to skip that for now.
</span><del>- 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.
</del><span class="cx"> RefPtr<WebProcessProxy> protect(process);
</span><span class="cx"> if (m_processWithPageCache == process)
</span><span class="cx"> m_processWithPageCache = nullptr;
</span><ins>+
+ static_cast<WebContextSupplement*>(supplement<WebGeolocationManagerProxy>())->processDidClose(process);
+
</ins><span class="cx"> m_processes.removeFirst(process);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -796,18 +751,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<WebProcessProxy> process;
</span><del>- 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();
- }
</del><ins>+ 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">@@ -844,12 +795,6 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::postMessageToInjectedBundle(const String& messageName, API::Object* messageBody)
</span><span class="cx"> {
</span><del>- if (m_processes.isEmpty()) {
- if (processModel() == ProcessModelSharedSecondaryProcess)
- m_messagesToInjectedBundlePostedToEmptyContext.append(std::make_pair(messageName, messageBody));
- return;
- }
-
</del><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">@@ -1157,17 +1102,7 @@
</span><span class="cx">
</span><span class="cx"> void WebProcessPool::requestWebContentStatistics(StatisticsRequest* request)
</span><span class="cx"> {
</span><del>- 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.
- }
</del><ins>+ // 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></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessPool.h (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/UIProcess/WebProcessPool.h 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "NetworkProcessProxy.h"
</span><span class="cx"> #include "PlugInAutoStartProvider.h"
</span><span class="cx"> #include "PluginInfoStore.h"
</span><del>-#include "ProcessModel.h"
</del><span class="cx"> #include "ProcessThrottler.h"
</span><span class="cx"> #include "StatisticsRequest.h"
</span><span class="cx"> #include "VisitedLinkStore.h"
</span><span class="lines">@@ -136,9 +135,6 @@
</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><del>- void setProcessModel(ProcessModel); // Can only be called when there are no processes running.
- ProcessModel processModel() const { return m_configuration->processModel(); }
-
</del><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">@@ -245,7 +241,6 @@
</span><span class="cx">
</span><span class="cx"> void allowSpecificHTTPSCertificateForHost(const WebCertificateInfo*, const String& host);
</span><span class="cx">
</span><del>- WebProcessProxy& ensureSharedWebProcess();
</del><span class="cx"> WebProcessProxy& createNewWebProcessRespectingProcessCountLimit(); // Will return an existing one if limit is met.
</span><span class="cx"> void warmInitialProcess();
</span><span class="cx">
</span><span class="lines">@@ -558,17 +553,12 @@
</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><del>- if (processModel() == ProcessModelSharedSecondaryProcess)
- ensureSharedWebProcess();
</del><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><del>- if (processModel() == ProcessModelSharedSecondaryProcess)
- ensureSharedWebProcess();
-
</del><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">@@ -580,7 +570,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!messageSent && processModel() == ProcessModelMultipleSecondaryProcesses) {
</del><ins>+ if (!messageSent) {
</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="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -1460,7 +1460,6 @@
</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><del>- BC597075116591D000551FCA /* ProcessModel.h in Headers */ = {isa = PBXBuildFile; fileRef = BC597074116591D000551FCA /* ProcessModel.h */; };
</del><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">@@ -3732,7 +3731,6 @@
</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><del>- BC597074116591D000551FCA /* ProcessModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessModel.h; sourceTree = "<group>"; };
</del><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">@@ -6238,7 +6236,6 @@
</span><span class="cx"> 1AC7537A183A9FDB0072CB15 /* PageLoadState.h */,
</span><span class="cx"> 37716A59195B910500EE8B1B /* ProcessAssertion.cpp */,
</span><span class="cx"> 86F9536018FF4FD4001DB2EF /* ProcessAssertion.h */,
</span><del>- BC597074116591D000551FCA /* ProcessModel.h */,
</del><span class="cx"> 86E67A22190F411800004AB7 /* ProcessThrottler.cpp */,
</span><span class="cx"> 86E67A21190F411800004AB7 /* ProcessThrottler.h */,
</span><span class="cx"> 83048AE51ACA45DC0082C832 /* ProcessThrottlerClient.h */,
</span><span class="lines">@@ -7989,7 +7986,6 @@
</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><del>- BC597075116591D000551FCA /* ProcessModel.h in Headers */,
</del><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="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Tools/ChangeLog 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-11-30 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Make ProcessModel always MultipleSecondaryProcesses
+ https://bugs.webkit.org/show_bug.cgi?id=151662
+
+ Reviewed by Antti Koivisto.
+
+ * TestWebKitAPI/Tests/WebKit2/Geolocation.cpp:
+ (TestWebKitAPI::TEST):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::generatePageConfiguration):
+
+2015-11-30 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Make usesNetworkProcess always true
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=151580
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2Geolocationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/Geolocation.cpp 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -250,6 +250,7 @@
</span><span class="cx"> TEST(WebKit2, GeolocationTransitionToHighAccuracy)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><ins>+ WKContextSetMaximumNumberOfProcesses(context.get(), 1);
</ins><span class="cx">
</span><span class="cx"> GeolocationTransitionToHighAccuracyStateTracker stateTracker;
</span><span class="cx"> setupGeolocationProvider(context.get(), &stateTracker);
</span><span class="lines">@@ -314,6 +315,7 @@
</span><span class="cx"> TEST(WebKit2, GeolocationTransitionToLowAccuracy)
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKContextRef> context(AdoptWK, WKContextCreate());
</span><ins>+ WKContextSetMaximumNumberOfProcesses(context.get(), 1);
</ins><span class="cx">
</span><span class="cx"> GeolocationTransitionToLowAccuracyStateTracker stateTracker;
</span><span class="cx"> setupGeolocationProvider(context.get(), &stateTracker);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (192807 => 192808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-11-30 19:06:15 UTC (rev 192807)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-11-30 19:11:09 UTC (rev 192808)
</span><span class="lines">@@ -400,10 +400,6 @@
</span><span class="cx">
</span><span class="cx"> m_geolocationProvider = std::make_unique<GeolocationProviderMock>(m_context.get());
</span><span class="cx">
</span><del>-#if PLATFORM(EFL)
- WKContextSetProcessModel(m_context.get(), kWKProcessModelSharedSecondaryProcess);
-#endif
-
</del><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>