Diff
Modified: trunk/Source/WebKit/ChangeLog (256844 => 256845)
--- trunk/Source/WebKit/ChangeLog 2020-02-18 19:42:31 UTC (rev 256844)
+++ trunk/Source/WebKit/ChangeLog 2020-02-18 19:55:39 UTC (rev 256845)
@@ -1,3 +1,19 @@
+2020-02-18 Alex Christensen <achristen...@webkit.org>
+
+ Unreviewed, rolling out r254873.
+ https://bugs.webkit.org/show_bug.cgi?id=205751
+
+ This is reverting r254081 which is effectively re-landing part of r254873 that was reverted
+ supposing that would be related to the fix for rdar://problem/59136037 but it was not.
+ Re-landing this is a step towards rdar://problem/56027111
+
+ Reverted changeset:
+
+ "Revert suppressesConnectionTerminationOnSystemChange part of
+ r254081"
+ https://bugs.webkit.org/show_bug.cgi?id=205751
+ https://trac.webkit.org/changeset/254873
+
2020-02-18 Per Arne Vollan <pvol...@apple.com>
Move [UIDevice currentDevice] calls to UI process
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (256844 => 256845)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2020-02-18 19:42:31 UTC (rev 256844)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2020-02-18 19:55:39 UTC (rev 256845)
@@ -186,7 +186,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)
@@ -537,7 +536,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 (256844 => 256845)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2020-02-18 19:42:31 UTC (rev 256844)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp 2020-02-18 19:55:39 UTC (rev 256845)
@@ -55,7 +55,6 @@
encoder << uiProcessSDKVersion;
IPC::encode(encoder, networkATSContext.get());
encoder << storageAccessAPIEnabled;
- encoder << suppressesConnectionTerminationOnSystemChange;
#endif
encoder << defaultDataStoreParameters;
#if USE(SOUP)
@@ -120,8 +119,6 @@
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 (256844 => 256845)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2020-02-18 19:42:31 UTC (rev 256844)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h 2020-02-18 19:55:39 UTC (rev 256845)
@@ -70,7 +70,6 @@
uint32_t uiProcessSDKVersion { 0 };
RetainPtr<CFDataRef> networkATSContext;
bool storageAccessAPIEnabled;
- bool suppressesConnectionTerminationOnSystemChange;
#endif
WebsiteDataStoreParameters defaultDataStoreParameters;
Modified: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm (256844 => 256845)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2020-02-18 19:42:31 UTC (rev 256844)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2020-02-18 19:55:39 UTC (rev 256845)
@@ -100,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: trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (256844 => 256845)
--- trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2020-02-18 19:42:31 UTC (rev 256844)
+++ trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm 2020-02-18 19:55:39 UTC (rev 256845)
@@ -1107,7 +1107,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/UIProcess/API/APIProcessPoolConfiguration.cpp (256844 => 256845)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2020-02-18 19:42:31 UTC (rev 256844)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2020-02-18 19:55:39 UTC (rev 256845)
@@ -67,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: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (256844 => 256845)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2020-02-18 19:42:31 UTC (rev 256844)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2020-02-18 19:55:39 UTC (rev 256845)
@@ -143,11 +143,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;
@@ -178,9 +173,6 @@
bool m_shouldConfigureJSCForTesting { false };
bool m_isJITEnabled { true };
bool m_usesSingleWebProcess { false };
-#if PLATFORM(COCOA)
- bool m_suppressesConnectionTerminationOnSystemChange { false };
-#endif
};
} // namespace API
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h (256844 => 256845)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2020-02-18 19:42:31 UTC (rev 256844)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h 2020-02-18 19:55:39 UTC (rev 256845)
@@ -67,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: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (256844 => 256845)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2020-02-18 19:42:31 UTC (rev 256844)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2020-02-18 19:55:39 UTC (rev 256845)
@@ -331,16 +331,6 @@
_processPoolConfiguration->setUsesSingleWebProcess(enabled);
}
-- (BOOL)suppressesConnectionTerminationOnSystemChange
-{
- return _processPoolConfiguration->suppressesConnectionTerminationOnSystemChange();
-}
-
-- (void)setSuppressesConnectionTerminationOnSystemChange:(BOOL)suppressesConnectionTerminationOnSystemChange
-{
- _processPoolConfiguration->setSuppressesConnectionTerminationOnSystemChange(suppressesConnectionTerminationOnSystemChange);
-}
-
- (BOOL)isJITEnabled
{
return _processPoolConfiguration->isJITEnabled();
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (256844 => 256845)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-02-18 19:42:31 UTC (rev 256844)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2020-02-18 19:55:39 UTC (rev 256845)
@@ -461,7 +461,6 @@
#endif
parameters.storageAccessAPIEnabled = storageAccessAPIEnabled();
- parameters.suppressesConnectionTerminationOnSystemChange = m_configuration->suppressesConnectionTerminationOnSystemChange();
NSNumber *databaseEnabledValue = [defaults objectForKey:[NSString stringWithFormat:@"InternalDebug%@", WebPreferencesKey::isITPDatabaseEnabledKey().createCFString().get()]];
if (databaseEnabledValue)
