Diff
Modified: trunk/Source/WebKit/ChangeLog (251675 => 251676)
--- trunk/Source/WebKit/ChangeLog 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/ChangeLog 2019-10-28 21:57:39 UTC (rev 251676)
@@ -1,5 +1,44 @@
2019-10-28 Alex Christensen <achristen...@webkit.org>
+ Remove unused _WKProcessPoolConfiguration SPI
+ https://bugs.webkit.org/show_bug.cgi?id=203066
+
+ Reviewed by Youenn Fablet.
+
+ After rdar://problem/56260478 this is not used, so away it goes!
+
+ * NetworkProcess/NetworkProcess.h:
+ (WebKit::NetworkProcess::suppressesConnectionTerminationOnSystemChange const): Deleted.
+ * NetworkProcess/NetworkProcessCreationParameters.cpp:
+ (WebKit::NetworkProcessCreationParameters::encode const):
+ (WebKit::NetworkProcessCreationParameters::decode):
+ * NetworkProcess/NetworkProcessCreationParameters.h:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
+ * NetworkProcess/cocoa/NetworkSessionCocoa.h:
+ * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ (WebKit::globalCTDataConnectionServiceType): Deleted.
+ (WebKit::NetworkSessionCocoa::ctDataConnectionServiceType const): Deleted.
+ (WebKit::NetworkSessionCocoa::setCTDataConnectionServiceType): Deleted.
+ * NetworkProcess/ios/NetworkConnectionToWebProcessIOS.mm:
+ (WebKit::NetworkConnectionToWebProcess::paymentCoordinatorCTDataConnectionServiceType):
+ * UIProcess/API/APIProcessPoolConfiguration.cpp:
+ (API::ProcessPoolConfiguration::copy):
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+ (-[_WKProcessPoolConfiguration suppressesConnectionTerminationOnSystemChange]): Deleted.
+ (-[_WKProcessPoolConfiguration setSuppressesConnectionTerminationOnSystemChange:]): Deleted.
+ (-[_WKProcessPoolConfiguration CTDataConnectionServiceType]): Deleted.
+ (-[_WKProcessPoolConfiguration setCTDataConnectionServiceType:]): Deleted.
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+ * UIProcess/ios/WebPageProxyIOS.mm:
+ (WebKit::WebPageProxy::paymentCoordinatorCTDataConnectionServiceType):
+
+2019-10-28 Alex Christensen <achristen...@webkit.org>
+
Remove unused WKWebsiteDataStore setter SPI
https://bugs.webkit.org/show_bug.cgi?id=203114
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (251675 => 251676)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2019-10-28 21:57:39 UTC (rev 251676)
@@ -186,7 +186,6 @@
#if PLATFORM(COCOA)
RetainPtr<CFDataRef> sourceApplicationAuditData() const;
- bool suppressesConnectionTerminationOnSystemChange() const { return m_suppressesConnectionTerminationOnSystemChange; }
#endif
#if PLATFORM(COCOA) || USE(SOUP)
void getHostNamesWithHSTSCache(WebCore::NetworkStorageSession&, HashSet<String>&);
@@ -494,8 +493,6 @@
// multiple requests to clear the cache can come in before previous requests complete, and we need to wait for all of them.
// In the future using WorkQueue and a counting semaphore would work, as would WorkQueue supporting the libdispatch concept of "work groups".
dispatch_group_t m_clearCacheDispatchGroup { nullptr };
-
- bool m_suppressesConnectionTerminationOnSystemChange { false };
#endif
#if ENABLE(CONTENT_EXTENSIONS)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (251675 => 251676)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2019-10-28 21:57:39 UTC (rev 251676)
@@ -53,12 +53,8 @@
#if PLATFORM(COCOA)
encoder << uiProcessBundleIdentifier;
encoder << uiProcessSDKVersion;
-#if PLATFORM(IOS_FAMILY)
- encoder << ctDataConnectionServiceType;
-#endif
IPC::encode(encoder, networkATSContext.get());
encoder << storageAccessAPIEnabled;
- encoder << suppressesConnectionTerminationOnSystemChange;
#endif
encoder << defaultDataStoreParameters;
#if USE(SOUP)
@@ -120,16 +116,10 @@
return false;
if (!decoder.decode(result.uiProcessSDKVersion))
return false;
-#if PLATFORM(IOS_FAMILY)
- if (!decoder.decode(result.ctDataConnectionServiceType))
- return false;
-#endif
if (!IPC::decode(decoder, result.networkATSContext))
return false;
if (!decoder.decode(result.storageAccessAPIEnabled))
return false;
- if (!decoder.decode(result.suppressesConnectionTerminationOnSystemChange))
- return false;
#endif
Optional<WebsiteDataStoreParameters> defaultDataStoreParameters;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (251675 => 251676)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2019-10-28 21:57:39 UTC (rev 251676)
@@ -68,12 +68,8 @@
#if PLATFORM(COCOA)
String uiProcessBundleIdentifier;
uint32_t uiProcessSDKVersion { 0 };
-#if PLATFORM(IOS_FAMILY)
- String ctDataConnectionServiceType;
-#endif
RetainPtr<CFDataRef> networkATSContext;
bool storageAccessAPIEnabled;
- bool suppressesConnectionTerminationOnSystemChange;
#endif
WebsiteDataStoreParameters defaultDataStoreParameters;
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (251675 => 251676)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2019-10-28 21:57:39 UTC (rev 251676)
@@ -95,10 +95,6 @@
m_uiProcessBundleIdentifier = parameters.uiProcessBundleIdentifier;
-#if PLATFORM(IOS_FAMILY)
- NetworkSessionCocoa::setCTDataConnectionServiceType(parameters.ctDataConnectionServiceType);
-#endif
-
initializeNetworkSettings();
#if PLATFORM(MAC)
@@ -106,7 +102,6 @@
#endif
WebCore::NetworkStorageSession::setStorageAccessAPIEnabled(parameters.storageAccessAPIEnabled);
- m_suppressesConnectionTerminationOnSystemChange = parameters.suppressesConnectionTerminationOnSystemChange;
// FIXME: Most of what this function does for cache size gets immediately overridden by setCacheModel().
// - memory cache size passed from UI process is always ignored;
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h (251675 => 251676)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h 2019-10-28 21:57:39 UTC (rev 251676)
@@ -59,11 +59,8 @@
const String& boundInterfaceIdentifier() const;
const String& sourceApplicationBundleIdentifier() const;
const String& sourceApplicationSecondaryIdentifier() const;
- // Must be called before any NetworkSession has been created.
- // FIXME: Move this to NetworkSessionCreationParameters.
#if PLATFORM(IOS_FAMILY)
- const String& ctDataConnectionServiceType() const;
- static void setCTDataConnectionServiceType(const String&);
+ const String& dataConnectionServiceType() const { return m_dataConnectionServiceType; }
#endif
NetworkDataTaskCocoa* dataTaskForIdentifier(NetworkDataTaskCocoa::TaskIdentifier, WebCore::StoredCredentialsPolicy);
@@ -138,6 +135,7 @@
bool m_shouldLogCookieInformation { false };
Seconds m_loadThrottleLatency;
bool m_fastServerTrustEvaluationEnabled { false };
+ String m_dataConnectionServiceType;
};
} // namespace WebKit
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (251675 => 251676)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2019-10-28 21:57:39 UTC (rev 251676)
@@ -944,25 +944,6 @@
return m_sourceApplicationSecondaryIdentifier;
}
-#if PLATFORM(IOS_FAMILY)
-static String& globalCTDataConnectionServiceType()
-{
- static NeverDestroyed<String> ctDataConnectionServiceType;
- return ctDataConnectionServiceType.get();
-}
-
-const String& NetworkSessionCocoa::ctDataConnectionServiceType() const
-{
- return globalCTDataConnectionServiceType();
-}
-
-void NetworkSessionCocoa::setCTDataConnectionServiceType(const String& type)
-{
- ASSERT(!sessionsCreated);
- globalCTDataConnectionServiceType() = type;
-}
-#endif
-
std::unique_ptr<NetworkSession> NetworkSessionCocoa::create(NetworkProcess& networkProcess, NetworkSessionCreationParameters&& parameters)
{
return makeUnique<NetworkSessionCocoa>(networkProcess, WTFMove(parameters));
@@ -1000,6 +981,7 @@
, m_shouldLogCookieInformation(parameters.shouldLogCookieInformation)
, m_loadThrottleLatency(parameters.loadThrottleLatency)
, m_fastServerTrustEvaluationEnabled(parameters.fastServerTrustEvaluationEnabled)
+ , m_dataConnectionServiceType(parameters.dataConnectionServiceType)
{
ASSERT(hasProcessPrivilege(ProcessPrivilege::CanAccessRawCookies));
@@ -1044,11 +1026,8 @@
configuration.connectionProxyDictionary = proxyDictionary(parameters.httpProxy, parameters.httpsProxy);
#if PLATFORM(IOS_FAMILY)
- String ctDataConnectionServiceType = parameters.dataConnectionServiceType;
- if (ctDataConnectionServiceType.isEmpty())
- ctDataConnectionServiceType = globalCTDataConnectionServiceType();
- if (!ctDataConnectionServiceType.isEmpty())
- configuration._CTDataConnectionServiceType = ctDataConnectionServiceType;
+ if (!m_dataConnectionServiceType.isEmpty())
+ configuration._CTDataConnectionServiceType = m_dataConnectionServiceType;
#endif
#if ENABLE(LEGACY_CUSTOM_PROTOCOL_MANAGER)
@@ -1063,7 +1042,7 @@
#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || PLATFORM(IOS_FAMILY)
// FIXME: Replace @"kCFStreamPropertyAutoErrorOnSystemChange" with a constant from the SDK once rdar://problem/40650244 is in a build.
- if (networkProcess.suppressesConnectionTerminationOnSystemChange() || parameters.suppressesConnectionTerminationOnSystemChange)
+ if (parameters.suppressesConnectionTerminationOnSystemChange)
configuration._socketStreamProperties = @{ @"kCFStreamPropertyAutoErrorOnSystemChange" : @NO };
#endif
Modified: trunk/Source/WebKit/NetworkProcess/ios/NetworkConnectionToWebProcessIOS.mm (251675 => 251676)
--- trunk/Source/WebKit/NetworkProcess/ios/NetworkConnectionToWebProcessIOS.mm 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/NetworkProcess/ios/NetworkConnectionToWebProcessIOS.mm 2019-10-28 21:57:39 UTC (rev 251676)
@@ -62,7 +62,7 @@
const String& NetworkConnectionToWebProcess::paymentCoordinatorCTDataConnectionServiceType(const WebPaymentCoordinatorProxy&)
{
if (auto* session = static_cast<NetworkSessionCocoa*>(networkSession()))
- return session->ctDataConnectionServiceType();
+ return session->dataConnectionServiceType();
return emptyString();
}
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp (251675 => 251676)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2019-10-28 21:57:39 UTC (rev 251676)
@@ -70,9 +70,6 @@
copy->m_isAutomaticProcessWarmingEnabledByClient = this->m_isAutomaticProcessWarmingEnabledByClient;
copy->m_usesWebProcessCache = this->m_usesWebProcessCache;
copy->m_usesBackForwardCache = this->m_usesBackForwardCache;
-#if PLATFORM(COCOA)
- copy->m_suppressesConnectionTerminationOnSystemChange = this->m_suppressesConnectionTerminationOnSystemChange;
-#endif
copy->m_customWebContentServiceBundleIdentifier = this->m_customWebContentServiceBundleIdentifier;
copy->m_usesSingleWebProcess = m_usesSingleWebProcess;
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (251675 => 251676)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2019-10-28 21:57:39 UTC (rev 251676)
@@ -117,11 +117,6 @@
void setShouldConfigureJSCForTesting(bool value) { m_shouldConfigureJSCForTesting = value; }
bool isJITEnabled() const { return m_isJITEnabled; }
void setJITEnabled(bool enabled) { m_isJITEnabled = enabled; }
-
-#if PLATFORM(IOS_FAMILY)
- const WTF::String& ctDataConnectionServiceType() const { return m_ctDataConnectionServiceType; }
- void setCTDataConnectionServiceType(const WTF::String& ctDataConnectionServiceType) { m_ctDataConnectionServiceType = ctDataConnectionServiceType; }
-#endif
ProcessID presentingApplicationPID() const { return m_presentingApplicationPID; }
void setPresentingApplicationPID(ProcessID pid) { m_presentingApplicationPID = pid; }
@@ -141,11 +136,6 @@
const WTF::String& customWebContentServiceBundleIdentifier() const { return m_customWebContentServiceBundleIdentifier; }
void setCustomWebContentServiceBundleIdentifier(const WTF::String& customWebContentServiceBundleIdentifier) { m_customWebContentServiceBundleIdentifier = customWebContentServiceBundleIdentifier; }
-
-#if PLATFORM(COCOA)
- bool suppressesConnectionTerminationOnSystemChange() const { return m_suppressesConnectionTerminationOnSystemChange; }
- void setSuppressesConnectionTerminationOnSystemChange(bool suppressesConnectionTerminationOnSystemChange) { m_suppressesConnectionTerminationOnSystemChange = suppressesConnectionTerminationOnSystemChange; }
-#endif
private:
WTF::String m_injectedBundlePath;
@@ -179,10 +169,6 @@
#if PLATFORM(IOS_FAMILY)
WTF::String m_ctDataConnectionServiceType;
#endif
-
-#if PLATFORM(COCOA)
- bool m_suppressesConnectionTerminationOnSystemChange { false };
-#endif
};
} // namespace API
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (251675 => 251676)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2019-10-28 21:57:39 UTC (rev 251676)
@@ -57,7 +57,6 @@
@property (nonatomic, nullable, copy) NSString *sourceApplicationSecondaryIdentifier WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.sourceApplicationSecondaryIdentifier", macos(10.12.3, 10.14.4), ios(10.3, 12.2));
@property (nonatomic) BOOL shouldCaptureAudioInUIProcess WK_API_AVAILABLE(macos(10.13), ios(11.0));
#if TARGET_OS_IPHONE
-@property (nonatomic, nullable, copy) NSString *CTDataConnectionServiceType WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.dataConnectionServiceType", ios(10.3, WK_IOS_TBA));
@property (nonatomic) BOOL alwaysRunsAtBackgroundPriority WK_API_AVAILABLE(ios(10.3));
@property (nonatomic) BOOL shouldTakeUIBackgroundAssertion WK_API_AVAILABLE(ios(11.0));
#endif
@@ -68,7 +67,6 @@
@property (nonatomic) BOOL prewarmsProcessesAutomatically WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
@property (nonatomic) BOOL usesWebProcessCache WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
@property (nonatomic) BOOL pageCacheEnabled WK_API_AVAILABLE(macos(10.14), ios(12.0));
-@property (nonatomic) BOOL suppressesConnectionTerminationOnSystemChange WK_API_DEPRECATED_WITH_REPLACEMENT("_WKWebsiteDataStoreConfiguration.suppressesConnectionTerminationOnSystemChange", macos(10.14, WK_MAC_TBA), ios(12.0, WK_IOS_TBA));
@property (nonatomic, getter=isJITEnabled) BOOL JITEnabled WK_API_AVAILABLE(macos(10.14.4), ios(12.2));
@property (nonatomic, nullable, copy, setter=setHSTSStorageDirectory:) NSURL *hstsStorageDirectory WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (251675 => 251676)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2019-10-28 21:57:39 UTC (rev 251676)
@@ -331,11 +331,6 @@
_processPoolConfiguration->setUsesSingleWebProcess(enabled);
}
-- (BOOL)suppressesConnectionTerminationOnSystemChange
-{
- return _processPoolConfiguration->suppressesConnectionTerminationOnSystemChange();
-}
-
- (BOOL)isJITEnabled
{
return _processPoolConfiguration->isJITEnabled();
@@ -360,22 +355,7 @@
return [NSURL fileURLWithPath:WebKit::LegacyGlobalSettings::singleton().hstsStorageDirectory() isDirectory:YES];
}
-- (void)setSuppressesConnectionTerminationOnSystemChange:(BOOL)suppressesConnectionTerminationOnSystemChange
-{
- _processPoolConfiguration->setSuppressesConnectionTerminationOnSystemChange(suppressesConnectionTerminationOnSystemChange);
-}
-
#if PLATFORM(IOS_FAMILY)
-- (NSString *)CTDataConnectionServiceType
-{
- return _processPoolConfiguration->ctDataConnectionServiceType();
-}
-
-- (void)setCTDataConnectionServiceType:(NSString *)ctDataConnectionServiceType
-{
- _processPoolConfiguration->setCTDataConnectionServiceType(ctDataConnectionServiceType);
-}
-
- (BOOL)alwaysRunsAtBackgroundPriority
{
return _processPoolConfiguration->alwaysRunsAtBackgroundPriority();
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (251675 => 251676)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2019-10-28 21:57:39 UTC (rev 251676)
@@ -293,10 +293,6 @@
parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
-#if PLATFORM(IOS_FAMILY)
- parameters.ctDataConnectionServiceType = m_configuration->ctDataConnectionServiceType();
-#endif
-
parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
#if PLATFORM(MAC)
@@ -306,7 +302,6 @@
#endif
parameters.storageAccessAPIEnabled = storageAccessAPIEnabled();
- parameters.suppressesConnectionTerminationOnSystemChange = m_configuration->suppressesConnectionTerminationOnSystemChange();
parameters.shouldEnableITPDatabase = [defaults boolForKey:[NSString stringWithFormat:@"InternalDebug%@", WebPreferencesKey::isITPDatabaseEnabledKey().createCFString().get()]];
Modified: trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (251675 => 251676)
--- trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2019-10-28 21:57:39 UTC (rev 251676)
@@ -1290,10 +1290,10 @@
const String& WebPageProxy::paymentCoordinatorCTDataConnectionServiceType(const WebPaymentCoordinatorProxy&)
{
- return process().processPool().configuration().ctDataConnectionServiceType();
+ return websiteDataStore().configuration().dataConnectionServiceType();
}
-#endif
+#endif // ENABLE(APPLE_PAY)
static bool desktopClassBrowsingSupported()
{
Modified: trunk/Tools/ChangeLog (251675 => 251676)
--- trunk/Tools/ChangeLog 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Tools/ChangeLog 2019-10-28 21:57:39 UTC (rev 251676)
@@ -1,3 +1,13 @@
+2019-10-28 Alex Christensen <achristen...@webkit.org>
+
+ Remove unused _WKProcessPoolConfiguration SPI
+ https://bugs.webkit.org/show_bug.cgi?id=203066
+
+ Reviewed by Youenn Fablet.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm:
+ (TEST):
+
2019-10-28 Brady Eidson <beid...@apple.com>
Expose _printOperationWithPrintInfo: SPI as API
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm (251675 => 251676)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm 2019-10-28 21:52:07 UTC (rev 251675)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKProcessPoolConfiguration.mm 2019-10-28 21:57:39 UTC (rev 251676)
@@ -52,7 +52,6 @@
[configuration setAlwaysRevalidatedURLSchemes:@[ @"afp", @"smb" ]];
[configuration setShouldCaptureAudioInUIProcess:YES];
#if PLATFORM(IOS_FAMILY)
- [configuration setCTDataConnectionServiceType:@"best"];
[configuration setAlwaysRunsAtBackgroundPriority:YES];
[configuration setShouldTakeUIBackgroundAssertion:YES];
#endif
@@ -62,7 +61,6 @@
[configuration setProcessSwapsOnWindowOpenWithOpener:YES];
[configuration setPrewarmsProcessesAutomatically:YES];
[configuration setPageCacheEnabled:YES];
- [configuration setSuppressesConnectionTerminationOnSystemChange:YES];
auto copy = adoptNS([configuration copy]);
@@ -77,7 +75,6 @@
EXPECT_TRUE([[configuration alwaysRevalidatedURLSchemes] isEqual:[copy alwaysRevalidatedURLSchemes]]);
EXPECT_EQ([configuration shouldCaptureAudioInUIProcess], [copy shouldCaptureAudioInUIProcess]);
#if PLATFORM(IOS_FAMILY)
- EXPECT_TRUE([[configuration CTDataConnectionServiceType] isEqual:[copy CTDataConnectionServiceType]]);
EXPECT_EQ([configuration alwaysRunsAtBackgroundPriority], [copy alwaysRunsAtBackgroundPriority]);
EXPECT_EQ([configuration shouldTakeUIBackgroundAssertion], [copy shouldTakeUIBackgroundAssertion]);
#endif
@@ -87,7 +84,6 @@
EXPECT_EQ([configuration processSwapsOnWindowOpenWithOpener], [copy processSwapsOnWindowOpenWithOpener]);
EXPECT_EQ([configuration prewarmsProcessesAutomatically], [copy prewarmsProcessesAutomatically]);
EXPECT_EQ([configuration pageCacheEnabled], [copy pageCacheEnabled]);
- EXPECT_EQ([configuration suppressesConnectionTerminationOnSystemChange], [copy suppressesConnectionTerminationOnSystemChange]);
}
TEST(WKProcessPool, _javascript_Configuration)
