Diff
Modified: branches/safari-609-branch/Source/WebKit/ChangeLog (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/ChangeLog 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/ChangeLog 2020-02-06 05:11:59 UTC (rev 255903)
@@ -1,3 +1,82 @@
+2020-02-05 Russell Epstein <[email protected]>
+
+ Cherry-pick r254081. rdar://problem/59161343
+
+ Remove _WKProcessPoolConfiguration.CTDataConnectionServiceType and suppressesConnectionTerminationOnSystemChange
+ https://bugs.webkit.org/show_bug.cgi?id=205751
+
+ Patch by Alex Christensen <[email protected]> on 2020-01-06
+ Reviewed by Darin Adler.
+
+ Their replacements on _WKWebViewConfiguration have been adopted.
+
+ * 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::dataConnectionServiceType const):
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ (WebKit::globalCTDataConnectionServiceType): Deleted.
+ (WebKit::NetworkSessionCocoa::setCTDataConnectionServiceType): Deleted.
+ * 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):
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@254081 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-06 Alex Christensen <[email protected]>
+
+ Remove _WKProcessPoolConfiguration.CTDataConnectionServiceType and suppressesConnectionTerminationOnSystemChange
+ https://bugs.webkit.org/show_bug.cgi?id=205751
+
+ Reviewed by Darin Adler.
+
+ Their replacements on _WKWebViewConfiguration have been adopted.
+
+ * 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::dataConnectionServiceType const):
+ (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+ (WebKit::globalCTDataConnectionServiceType): Deleted.
+ (WebKit::NetworkSessionCocoa::setCTDataConnectionServiceType): Deleted.
+ * 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):
+
2020-02-05 Brent Fulgham <[email protected]>
Correct branch sandboxes. rdar://problem/59098315
Modified: branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcess.h (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcess.h 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcess.h 2020-02-06 05:11:59 UTC (rev 255903)
@@ -185,7 +185,6 @@
void logDiagnosticMessageWithValue(WebPageProxyIdentifier, const String& message, const String& description, double value, unsigned significantFigures, WebCore::ShouldSample);
#if PLATFORM(COCOA)
- bool suppressesConnectionTerminationOnSystemChange() const { return m_suppressesConnectionTerminationOnSystemChange; }
RetainPtr<CFDataRef> sourceApplicationAuditData() const;
#endif
#if PLATFORM(COCOA) || USE(SOUP)
@@ -534,7 +533,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: branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2020-02-06 05:11:59 UTC (rev 255903)
@@ -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)
@@ -119,16 +115,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: branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2020-02-06 05:11:59 UTC (rev 255903)
@@ -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: branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2020-02-06 05:11:59 UTC (rev 255903)
@@ -92,10 +92,6 @@
_CFNetworkSetATSContext(parameters.networkATSContext.get());
m_uiProcessBundleIdentifier = parameters.uiProcessBundleIdentifier;
-
-#if PLATFORM(IOS_FAMILY)
- NetworkSessionCocoa::setCTDataConnectionServiceType(parameters.ctDataConnectionServiceType);
-#endif
initializeNetworkSettings();
@@ -104,7 +100,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: branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h 2020-02-06 05:11:59 UTC (rev 255903)
@@ -74,7 +74,6 @@
const String& sourceApplicationBundleIdentifier() const;
const String& sourceApplicationSecondaryIdentifier() const;
#if PLATFORM(IOS_FAMILY)
- static void setCTDataConnectionServiceType(const String&);
const String& dataConnectionServiceType() const;
#endif
Modified: branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2020-02-06 05:11:59 UTC (rev 255903)
@@ -981,22 +981,8 @@
}
#if PLATFORM(IOS_FAMILY)
-static String& globalCTDataConnectionServiceType()
-{
- static NeverDestroyed<String> ctDataConnectionServiceType;
- return ctDataConnectionServiceType.get();
-}
-
-void NetworkSessionCocoa::setCTDataConnectionServiceType(const String& type)
-{
- ASSERT(!sessionsCreated);
- globalCTDataConnectionServiceType() = type;
-}
-
const String& NetworkSessionCocoa::dataConnectionServiceType() const
{
- if (!globalCTDataConnectionServiceType().isEmpty())
- return globalCTDataConnectionServiceType();
return m_dataConnectionServiceType;
}
#endif
@@ -1081,9 +1067,7 @@
configuration.connectionProxyDictionary = proxyDictionary(parameters.httpProxy, parameters.httpsProxy);
#if PLATFORM(IOS_FAMILY)
- if (!globalCTDataConnectionServiceType().isEmpty())
- configuration._CTDataConnectionServiceType = globalCTDataConnectionServiceType();
- else if (!m_dataConnectionServiceType.isEmpty())
+ if (!m_dataConnectionServiceType.isEmpty())
configuration._CTDataConnectionServiceType = m_dataConnectionServiceType;
#endif
@@ -1095,7 +1079,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: branches/safari-609-branch/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2020-02-06 05:11:59 UTC (rev 255903)
@@ -59,9 +59,6 @@
copy->m_shouldCaptureDisplayInUIProcess = this->m_shouldCaptureDisplayInUIProcess;
copy->m_shouldConfigureJSCForTesting = this->m_shouldConfigureJSCForTesting;
copy->m_isJITEnabled = this->m_isJITEnabled;
-#if PLATFORM(IOS_FAMILY)
- copy->m_ctDataConnectionServiceType = this->m_ctDataConnectionServiceType;
-#endif
copy->m_presentingApplicationPID = this->m_presentingApplicationPID;
copy->m_processSwapsOnNavigationFromClient = this->m_processSwapsOnNavigationFromClient;
copy->m_processSwapsOnNavigationFromExperimentalFeatures = this->m_processSwapsOnNavigationFromExperimentalFeatures;
@@ -70,9 +67,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: branches/safari-609-branch/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2020-02-06 05:11:59 UTC (rev 255903)
@@ -121,11 +121,6 @@
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; }
@@ -145,11 +140,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;
Vector<WTF::String> m_customClassesForParameterCoder;
@@ -179,13 +169,6 @@
bool m_shouldConfigureJSCForTesting { false };
bool m_isJITEnabled { true };
bool m_usesSingleWebProcess { false };
-
-#if PLATFORM(IOS_FAMILY)
- WTF::String m_ctDataConnectionServiceType;
-#endif
-#if PLATFORM(COCOA)
- bool m_suppressesConnectionTerminationOnSystemChange { false };
-#endif
};
} // namespace API
Modified: branches/safari-609-branch/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2020-02-06 05:11:59 UTC (rev 255903)
@@ -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(10.15), ios(13.0));
Modified: branches/safari-609-branch/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2020-02-06 05:11:59 UTC (rev 255903)
@@ -331,16 +331,6 @@
_processPoolConfiguration->setUsesSingleWebProcess(enabled);
}
-- (BOOL)suppressesConnectionTerminationOnSystemChange
-{
- return _processPoolConfiguration->suppressesConnectionTerminationOnSystemChange();
-}
-
-- (void)setSuppressesConnectionTerminationOnSystemChange:(BOOL)suppressesConnectionTerminationOnSystemChange
-{
- _processPoolConfiguration->setSuppressesConnectionTerminationOnSystemChange(suppressesConnectionTerminationOnSystemChange);
-}
-
- (BOOL)isJITEnabled
{
return _processPoolConfiguration->isJITEnabled();
@@ -366,16 +356,6 @@
}
#if PLATFORM(IOS_FAMILY)
-- (NSString *)CTDataConnectionServiceType
-{
- return _processPoolConfiguration->ctDataConnectionServiceType();
-}
-
-- (void)setCTDataConnectionServiceType:(NSString *)ctDataConnectionServiceType
-{
- _processPoolConfiguration->setCTDataConnectionServiceType(ctDataConnectionServiceType);
-}
-
- (BOOL)alwaysRunsAtBackgroundPriority
{
return _processPoolConfiguration->alwaysRunsAtBackgroundPriority();
Modified: branches/safari-609-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-02-06 05:11:59 UTC (rev 255903)
@@ -370,10 +370,6 @@
parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
-#if PLATFORM(IOS_FAMILY)
- parameters.ctDataConnectionServiceType = m_configuration->ctDataConnectionServiceType();
-#endif
-
parameters.shouldSuppressMemoryPressureHandler = [defaults boolForKey:WebKitSuppressMemoryPressureHandlerDefaultsKey];
#if PLATFORM(MAC)
@@ -383,7 +379,6 @@
#endif
parameters.storageAccessAPIEnabled = storageAccessAPIEnabled();
- parameters.suppressesConnectionTerminationOnSystemChange = m_configuration->suppressesConnectionTerminationOnSystemChange();
parameters.shouldEnableITPDatabase = [defaults boolForKey:[NSString stringWithFormat:@"InternalDebug%@", WebPreferencesKey::isITPDatabaseEnabledKey().createCFString().get()]];
Modified: branches/safari-609-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm (255902 => 255903)
--- branches/safari-609-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-02-06 05:11:53 UTC (rev 255902)
+++ branches/safari-609-branch/Source/WebKit/UIProcess/ios/WebPageProxyIOS.mm 2020-02-06 05:11:59 UTC (rev 255903)
@@ -1298,8 +1298,6 @@
const String& WebPageProxy::paymentCoordinatorCTDataConnectionServiceType(const WebPaymentCoordinatorProxy&)
{
- if (!process().processPool().configuration().ctDataConnectionServiceType().isNull())
- return process().processPool().configuration().ctDataConnectionServiceType();
return websiteDataStore().configuration().dataConnectionServiceType();
}
