Diff
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2019-02-12 11:40:43 UTC (rev 241293)
@@ -41,6 +41,7 @@
auto configuration = ProcessPoolConfiguration::createWithWebsiteDataStoreConfiguration(WebsiteDataStore::legacyDefaultDataStoreConfiguration());
configuration->m_shouldHaveLegacyDataStore = true;
+ configuration->m_maximumProcessCount = 1;
configuration->m_cacheModel = WebKit::CacheModel::DocumentViewer;
return configuration;
@@ -89,6 +90,7 @@
auto copy = this->create();
copy->m_shouldHaveLegacyDataStore = this->m_shouldHaveLegacyDataStore;
+ copy->m_maximumProcessCount = this->m_maximumProcessCount;
copy->m_cacheModel = this->m_cacheModel;
copy->m_diskCacheDirectory = this->m_diskCacheDirectory;
copy->m_diskCacheSpeculativeValidationEnabled = this->m_diskCacheSpeculativeValidationEnabled;
@@ -131,7 +133,6 @@
copy->m_suppressesConnectionTerminationOnSystemChange = this->m_suppressesConnectionTerminationOnSystemChange;
#endif
copy->m_customWebContentServiceBundleIdentifier = this->m_customWebContentServiceBundleIdentifier;
- copy->m_usesSingleWebProcess = m_usesSingleWebProcess;
return copy;
}
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2019-02-12 11:40:43 UTC (rev 241293)
@@ -56,8 +56,8 @@
bool shouldHaveLegacyDataStore() const { return m_shouldHaveLegacyDataStore; }
void setShouldHaveLegacyDataStore(bool shouldHaveLegacyDataStore) { m_shouldHaveLegacyDataStore = shouldHaveLegacyDataStore; }
- bool usesSingleWebProcess() const { return m_usesSingleWebProcess; }
- void setUsesSingleWebProcess(bool enabled) { m_usesSingleWebProcess = enabled; }
+ unsigned maximumProcessCount() const { return m_maximumProcessCount; }
+ void setMaximumProcessCount(unsigned maximumProcessCount) { m_maximumProcessCount = maximumProcessCount; }
bool isAutomaticProcessWarmingEnabled() const
{
@@ -190,6 +190,7 @@
private:
bool m_shouldHaveLegacyDataStore { false };
+ unsigned m_maximumProcessCount { 0 };
bool m_diskCacheSpeculativeValidationEnabled { false };
WebKit::CacheModel m_cacheModel { WebKit::CacheModel::PrimaryWebBrowser };
@@ -226,7 +227,6 @@
bool m_clientWouldBenefitFromAutomaticProcessPrewarming { false };
WTF::String m_customWebContentServiceBundleIdentifier;
bool m_isJITEnabled { true };
- bool m_usesSingleWebProcess { false };
#if PLATFORM(IOS_FAMILY)
WTF::String m_ctDataConnectionServiceType;
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/C/WKContext.cpp (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/C/WKContext.cpp 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/C/WKContext.cpp 2019-02-12 11:40:43 UTC (rev 241293)
@@ -326,15 +326,14 @@
return WebKit::toAPI(WebKit::toImpl(contextRef)->cacheModel());
}
-void WKContextSetMaximumNumberOfProcesses(WKContextRef, unsigned)
+void WKContextSetMaximumNumberOfProcesses(WKContextRef contextRef, unsigned numberOfProcesses)
{
- // Deprecated.
+ WebKit::toImpl(contextRef)->setMaximumNumberOfProcesses(numberOfProcesses);
}
-unsigned WKContextGetMaximumNumberOfProcesses(WKContextRef)
+unsigned WKContextGetMaximumNumberOfProcesses(WKContextRef contextRef)
{
- // Deprecated.
- return std::numeric_limits<unsigned>::max();
+ return WebKit::toImpl(contextRef)->maximumNumberOfProcesses();
}
void WKContextSetAlwaysUsesComplexTextCodePath(WKContextRef contextRef, bool alwaysUseComplexTextCodePath)
@@ -406,16 +405,6 @@
WebKit::toImpl(contextRef)->configuration().setIsAutomaticProcessWarmingEnabled(value);
}
-void WKContextSetUsesSingleWebProcess(WKContextRef contextRef, bool value)
-{
- WebKit::toImpl(contextRef)->configuration().setUsesSingleWebProcess(value);
-}
-
-bool WKContextGetUsesSingleWebProcess(WKContextRef contextRef)
-{
- return WebKit::toImpl(contextRef)->configuration().usesSingleWebProcess();
-}
-
void WKContextSetCustomWebContentServiceBundleIdentifier(WKContextRef contextRef, WKStringRef name)
{
WebKit::toImpl(contextRef)->setCustomWebContentServiceBundleIdentifier(WebKit::toImpl(name)->string());
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/C/WKContext.h (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/C/WKContext.h 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/C/WKContext.h 2019-02-12 11:40:43 UTC (rev 241293)
@@ -131,12 +131,9 @@
// FIXME: Move these to WKDeprecatedFunctions.cpp once support for Mavericks has been dropped.
WK_EXPORT void WKContextSetProcessModel(WKContextRef, WKProcessModel);
-WK_EXPORT void WKContextSetMaximumNumberOfProcesses(WKContextRef context, unsigned numberOfProcesses) WK_C_API_DEPRECATED;
-WK_EXPORT unsigned WKContextGetMaximumNumberOfProcesses(WKContextRef context) WK_C_API_DEPRECATED;
+WK_EXPORT void WKContextSetMaximumNumberOfProcesses(WKContextRef context, unsigned numberOfProcesses);
+WK_EXPORT unsigned WKContextGetMaximumNumberOfProcesses(WKContextRef context);
-WK_EXPORT void WKContextSetUsesSingleWebProcess(WKContextRef, bool);
-WK_EXPORT bool WKContextGetUsesSingleWebProcess(WKContextRef);
-
WK_EXPORT void WKContextStartMemorySampler(WKContextRef context, WKDoubleRef interval);
WK_EXPORT void WKContextStopMemorySampler(WKContextRef context);
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm 2019-02-12 11:40:43 UTC (rev 241293)
@@ -199,6 +199,11 @@
_processPool->registerURLSchemeAsCanDisplayOnlyIfCanRequest(scheme);
}
+- (void)_setMaximumNumberOfProcesses:(NSUInteger)value
+{
+ _processPool->setMaximumNumberOfProcesses(value);
+}
+
- (void)_setCanHandleHTTPSServerTrustEvaluation:(BOOL)value
{
_processPool->setCanHandleHTTPSServerTrustEvaluation(value);
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h 2019-02-12 11:40:43 UTC (rev 241293)
@@ -114,6 +114,7 @@
// Test only.
- (void)_setAllowsAnySSLCertificateForServiceWorker:(BOOL)allows WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
- (void)_registerURLSchemeServiceWorkersCanHandle:(NSString *)scheme WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
+- (void)_setMaximumNumberOfProcesses:(NSUInteger)value WK_API_AVAILABLE(macosx(10.13.4), ios(11.3));
- (void)_getActivePagesOriginsInWebProcessForTesting:(pid_t)pid completionHandler:(void(^)(NSArray<NSString *> *))completionHandler WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
- (BOOL)_networkProcessHasEntitlementForTesting:(NSString *)entitlement WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2019-02-12 11:40:43 UTC (rev 241293)
@@ -34,8 +34,7 @@
@interface _WKProcessPoolConfiguration : NSObject <NSCopying>
@property (nonatomic, copy) NSURL *injectedBundleURL;
-@property (nonatomic) NSUInteger maximumProcessCount WK_API_DEPRECATED("It is no longer possible to limit the number of processes", macosx(WK_MAC_TBA, WK_MAC_TBA), ios(WK_IOS_TBA, WK_IOS_TBA));
-@property (nonatomic) BOOL usesSingleWebProcess WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
+@property (nonatomic) NSUInteger maximumProcessCount;
@property (nonatomic, nullable, copy) NSString *customWebContentServiceBundleIdentifier WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
@property (nonatomic) BOOL ignoreSynchronousMessagingTimeoutsForTesting WK_API_AVAILABLE(macosx(10.12), ios(10.0));
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2019-02-12 11:40:43 UTC (rev 241293)
@@ -64,13 +64,12 @@
- (NSUInteger)maximumProcessCount
{
- // Deprecated.
- return NSUIntegerMax;
+ return _processPoolConfiguration->maximumProcessCount();
}
- (void)setMaximumProcessCount:(NSUInteger)maximumProcessCount
{
- // Deprecated.
+ _processPoolConfiguration->setMaximumProcessCount(maximumProcessCount);
}
- (NSInteger)diskCacheSizeOverride
@@ -291,16 +290,6 @@
_processPoolConfiguration->setCacheModel(WebKit::CacheModel::PrimaryWebBrowser);
}
-- (BOOL)usesSingleWebProcess
-{
- return _processPoolConfiguration->usesSingleWebProcess();
-}
-
-- (void)setUsesSingleWebProcess:(BOOL)enabled
-{
- _processPoolConfiguration->setUsesSingleWebProcess(enabled);
-}
-
- (BOOL)suppressesConnectionTerminationOnSystemChange
{
return _processPoolConfiguration->suppressesConnectionTerminationOnSystemChange();
@@ -366,7 +355,7 @@
- (NSString *)description
{
- NSString *description = [NSString stringWithFormat:@"<%@: %p", NSStringFromClass(self.class), self];
+ NSString *description = [NSString stringWithFormat:@"<%@: %p; maximumProcessCount = %lu", NSStringFromClass(self.class), self, static_cast<unsigned long>([self maximumProcessCount])];
if (!_processPoolConfiguration->injectedBundlePath().isEmpty())
return [description stringByAppendingFormat:@"; injectedBundleURL: \"%@\">", [self injectedBundleURL]];
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/API/glib/WebKitWebContext.cpp 2019-02-12 11:40:43 UTC (rev 241293)
@@ -334,6 +334,7 @@
API::ProcessPoolConfiguration configuration;
configuration.setInjectedBundlePath(FileSystem::stringFromFileSystemRepresentation(bundleFilename.get()));
+ configuration.setMaximumProcessCount(1);
configuration.setDiskCacheSpeculativeValidationEnabled(true);
WebKitWebContext* webContext = WEBKIT_WEB_CONTEXT(object);
@@ -1516,6 +1517,14 @@
return;
context->priv->processModel = processModel;
+ switch (context->priv->processModel) {
+ case WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS:
+ context->priv->processPool->setMaximumNumberOfProcesses(1);
+ break;
+ case WEBKIT_PROCESS_MODEL_MULTIPLE_SECONDARY_PROCESSES:
+ context->priv->processPool->setMaximumNumberOfProcesses(context->priv->processCountLimit);
+ break;
+ }
}
/**
@@ -1558,6 +1567,8 @@
return;
context->priv->processCountLimit = limit;
+ if (context->priv->processModel != WEBKIT_PROCESS_MODEL_SHARED_SECONDARY_PROCESS)
+ context->priv->processPool->setMaximumNumberOfProcesses(limit);
}
/**
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/WebProcessPool.cpp (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/WebProcessPool.cpp 2019-02-12 11:40:43 UTC (rev 241293)
@@ -406,6 +406,11 @@
#endif
}
+void WebProcessPool::setMaximumNumberOfProcesses(unsigned maximumNumberOfProcesses)
+{
+ m_configuration->setMaximumProcessCount(maximumNumberOfProcesses);
+}
+
void WebProcessPool::setCustomWebContentServiceBundleIdentifier(const String& customWebContentServiceBundleIdentifier)
{
// Guard against API misuse.
@@ -1089,8 +1094,8 @@
WebProcessProxy& WebProcessPool::createNewWebProcessRespectingProcessCountLimit(WebsiteDataStore& websiteDataStore)
{
- if (!usesSingleWebProcess())
- return createNewWebProcess(websiteDataStore);
+ // FIXME: https://bugs.webkit.org/show_bug.cgi?id=168676
+ // Once WebsiteDataStores are truly per-view instead of per-process, remove this nonsense.
#if PLATFORM(COCOA)
bool mustMatchDataStore = API::WebsiteDataStore::defaultDataStoreExists() && &websiteDataStore != &API::WebsiteDataStore::defaultDataStore()->websiteDataStore();
@@ -1098,6 +1103,10 @@
bool mustMatchDataStore = false;
#endif
+ if (m_processes.size() < maximumNumberOfProcesses())
+ return createNewWebProcess(websiteDataStore);
+
+ WebProcessProxy* processToReuse = nullptr;
for (auto& process : m_processes) {
if (mustMatchDataStore && &process->websiteDataStore() != &websiteDataStore)
continue;
@@ -1105,9 +1114,11 @@
if (is<ServiceWorkerProcessProxy>(*process))
continue;
#endif
- return *process;
+ // Choose the process with fewest pages.
+ if (!processToReuse || processToReuse->pageCount() > process->pageCount())
+ processToReuse = process.get();
}
- return createNewWebProcess(websiteDataStore);
+ return processToReuse ? *processToReuse : createNewWebProcess(websiteDataStore);
}
Ref<WebPageProxy> WebProcessPool::createWebPage(PageClient& pageClient, Ref<API::PageConfiguration>&& pageConfiguration)
@@ -1293,7 +1304,7 @@
void WebProcessPool::didReachGoodTimeToPrewarm()
{
- if (!configuration().isAutomaticProcessWarmingEnabled() || !configuration().processSwapsOnNavigation() || usesSingleWebProcess())
+ if (!configuration().isAutomaticProcessWarmingEnabled() || !configuration().processSwapsOnNavigation())
return;
if (MemoryPressureHandler::singleton().isUnderMemoryPressure()) {
@@ -2163,9 +2174,6 @@
return createNewWebProcess(page.websiteDataStore());
};
- if (usesSingleWebProcess())
- return completionHandler(page.process(), nullptr, "Single WebProcess mode is enabled"_s);
-
if (processSwapRequestedByClient == ProcessSwapRequestedByClient::Yes)
return completionHandler(createNewProcess(), nullptr, "Process swap was requested by the client"_s);
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/WebProcessPool.h (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/WebProcessPool.h 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/UIProcess/WebProcessPool.h 2019-02-12 11:40:43 UTC (rev 241293)
@@ -157,6 +157,9 @@
void setAutomationClient(std::unique_ptr<API::AutomationClient>&&);
void setLegacyCustomProtocolManagerClient(std::unique_ptr<API::CustomProtocolManagerClient>&&);
+ void setMaximumNumberOfProcesses(unsigned); // Can only be called when there are no processes running.
+ unsigned maximumNumberOfProcesses() const { return !m_configuration->maximumProcessCount() ? UINT_MAX : m_configuration->maximumProcessCount(); }
+
void setCustomWebContentServiceBundleIdentifier(const String&);
const String& customWebContentServiceBundleIdentifier() { return m_configuration->customWebContentServiceBundleIdentifier(); }
@@ -527,8 +530,6 @@
static void languageChanged(void* context);
void languageChanged();
- bool usesSingleWebProcess() const { return m_configuration->usesSingleWebProcess(); }
-
#if PLATFORM(IOS_FAMILY)
String cookieStorageDirectory() const;
#endif
Modified: releases/WebKitGTK/webkit-2.24/Tools/MiniBrowser/mac/AppDelegate.m (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Tools/MiniBrowser/mac/AppDelegate.m 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Tools/MiniBrowser/mac/AppDelegate.m 2019-02-12 11:40:43 UTC (rev 241293)
@@ -100,7 +100,7 @@
_WKProcessPoolConfiguration *processConfiguration = [[[_WKProcessPoolConfiguration alloc] init] autorelease];
processConfiguration.diskCacheSpeculativeValidationEnabled = ![SettingsController shared].networkCacheSpeculativeRevalidationDisabled;
if ([SettingsController shared].perWindowWebProcessesDisabled)
- processConfiguration.usesSingleWebProcess = YES;
+ processConfiguration.maximumProcessCount = 1;
if ([SettingsController shared].processSwapOnWindowOpenWithOpenerEnabled)
processConfiguration.processSwapsOnWindowOpenWithOpener = true;
Modified: releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKit/UserMedia.cpp (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKit/UserMedia.cpp 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKit/UserMedia.cpp 2019-02-12 11:40:43 UTC (rev 241293)
@@ -106,6 +106,7 @@
TEST(WebKit, OnDeviceChangeCrash)
{
auto context = adoptWK(WKContextCreateWithConfiguration(nullptr));
+ WKContextSetMaximumNumberOfProcesses(context.get(), 1);
WKRetainPtr<WKPageGroupRef> pageGroup(AdoptWK, WKPageGroupCreateWithIdentifier(Util::toWK("GetUserMedia").get()));
WKPreferencesRef preferences = WKPageGroupGetPreferences(pageGroup.get());
@@ -130,7 +131,7 @@
WKPageLoadURL(webView.page(), url.get());
// Load a second page in same process.
- PlatformWebView webView2(webView.page());
+ PlatformWebView webView2(context.get(), pageGroup.get());
WKPageSetPageUIClient(webView2.page(), &uiClient.base);
WKPageNavigationClientV0 navigationClient;
memset(&navigationClient, 0, sizeof(navigationClient));
Modified: releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResponsivenessTimer.mm (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResponsivenessTimer.mm 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResponsivenessTimer.mm 2019-02-12 11:40:43 UTC (rev 241293)
@@ -60,6 +60,7 @@
{
auto processPoolConfiguration = adoptNS([_WKProcessPoolConfiguration new]);
auto processPool = adoptNS([[WKProcessPool alloc] _initWithConfiguration:processPoolConfiguration.get()]);
+ [processPool _setMaximumNumberOfProcesses:1];
auto delegate = adoptNS([ResponsivenessTimerDelegate new]);
auto configuration = adoptNS([WKWebViewConfiguration new]);
Modified: releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKitCocoa/ServiceWorkerBasic.mm 2019-02-12 11:40:43 UTC (rev 241293)
@@ -970,6 +970,7 @@
configuration.processPool = (WKProcessPool *)context.get();
auto pool = configuration.processPool;
[pool _registerURLSchemeServiceWorkersCanHandle:@"sw"];
+ [pool _setMaximumNumberOfProcesses:5];
configuration.websiteDataStore = (WKWebsiteDataStore *)WKContextGetWebsiteDataStore(context.get());
}
@@ -1248,6 +1249,8 @@
newConfiguration.get().websiteDataStore = [WKWebsiteDataStore nonPersistentDataStore];
[newConfiguration.get().websiteDataStore _setServiceWorkerRegistrationDirectory: @"~/nonexistingfolder"];
+ [newConfiguration.get().processPool _setMaximumNumberOfProcesses:1];
+
webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:newConfiguration.get()]);
request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"sw://host/regularPageWithoutConnection.html"]];
[webView loadRequest:request];
@@ -1258,7 +1261,7 @@
newConfiguration.get().websiteDataStore = [configuration websiteDataStore];
webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:newConfiguration.get()]);
- EXPECT_EQ(2u, webView.get().configuration.processPool._webProcessCountIgnoringPrewarmed);
+ EXPECT_EQ(1u, webView.get().configuration.processPool._webProcessCountIgnoringPrewarmed);
request = [NSURLRequest requestWithURL:[NSURL URLWithString:@"sw://host/regularPageWithConnection.html"]];
[webView loadRequest:request];
TestWebKitAPI::Util::run(&done);
@@ -1265,7 +1268,7 @@
done = false;
// Make sure that loading the simple page did not start the service worker process.
- EXPECT_EQ(2u, webView.get().configuration.processPool._webProcessCountIgnoringPrewarmed);
+ EXPECT_EQ(1u, webView.get().configuration.processPool._webProcessCountIgnoringPrewarmed);
[[configuration websiteDataStore] removeDataOfTypes:[WKWebsiteDataStore allWebsiteDataTypes] modifiedSince:[NSDate distantPast] completionHandler:^() {
done = true;
Modified: releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKitCocoa/UserContentController.mm 2019-02-12 11:40:43 UTC (rev 241293)
@@ -237,6 +237,7 @@
{
RetainPtr<WKWebViewConfiguration> configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
RetainPtr<_WKProcessPoolConfiguration> processPoolConfiguration = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
+ [processPoolConfiguration setMaximumProcessCount:1];
[configuration setProcessPool:[[[WKProcessPool alloc] _initWithConfiguration:processPoolConfiguration.get()] autorelease]];
RetainPtr<WKWebView> webView = webViewForScriptMessageHandlerMultipleHandlerRemovalTest(configuration.get());
Modified: releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm (241292 => 241293)
--- releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm 2019-02-12 10:47:54 UTC (rev 241292)
+++ releases/WebKitGTK/webkit-2.24/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm 2019-02-12 11:40:43 UTC (rev 241293)
@@ -36,6 +36,7 @@
auto configuration = adoptNS([[_WKProcessPoolConfiguration alloc] init]);
[configuration setInjectedBundleURL:[NSURL fileURLWithPath:@"/path/to/injected.wkbundle"]];
+ [configuration setMaximumProcessCount:42];
[configuration setCustomWebContentServiceBundleIdentifier:@"org.webkit.WebContent.custom"];
[configuration setIgnoreSynchronousMessagingTimeoutsForTesting:YES];
[configuration setAttrStyleEnabled:YES];
@@ -64,6 +65,7 @@
auto copy = adoptNS([configuration copy]);
EXPECT_TRUE([[configuration injectedBundleURL] isEqual:[copy injectedBundleURL]]);
+ EXPECT_EQ([configuration maximumProcessCount], [copy maximumProcessCount]);
EXPECT_TRUE([[configuration customWebContentServiceBundleIdentifier] isEqual:[copy customWebContentServiceBundleIdentifier]]);
EXPECT_EQ([configuration ignoreSynchronousMessagingTimeoutsForTesting], [copy ignoreSynchronousMessagingTimeoutsForTesting]);
EXPECT_EQ([configuration attrStyleEnabled], [copy attrStyleEnabled]);