Title: [262391] trunk/Source/WebKit
- Revision
- 262391
- Author
- commit-qu...@webkit.org
- Date
- 2020-06-01 13:05:15 -0700 (Mon, 01 Jun 2020)
Log Message
Revert r250312
https://bugs.webkit.org/show_bug.cgi?id=212604
<rdar://problem/63779241>
Patch by Alex Christensen <achristen...@webkit.org> on 2020-06-01
Reviewed by Tim Horton.
r250312 was a step towards a network process singleton.
We aren't there yet, so revert it until we are. There was something trying to keep HSTS storages separate, so let them keep trying.
* UIProcess/API/APIProcessPoolConfiguration.cpp:
(API::ProcessPoolConfiguration::copy):
* UIProcess/API/APIProcessPoolConfiguration.h:
* UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
(-[_WKProcessPoolConfiguration setHSTSStorageDirectory:]):
(-[_WKProcessPoolConfiguration hstsStorageDirectory]):
* UIProcess/LegacyGlobalSettings.h:
(WebKit::LegacyGlobalSettings::setHSTSStorageDirectory): Deleted.
(WebKit::LegacyGlobalSettings::hstsStorageDirectory const): Deleted.
* UIProcess/WebProcessPool.cpp:
(WebKit::WebProcessPool::ensureNetworkProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (262390 => 262391)
--- trunk/Source/WebKit/ChangeLog 2020-06-01 19:38:37 UTC (rev 262390)
+++ trunk/Source/WebKit/ChangeLog 2020-06-01 20:05:15 UTC (rev 262391)
@@ -1,3 +1,26 @@
+2020-06-01 Alex Christensen <achristen...@webkit.org>
+
+ Revert r250312
+ https://bugs.webkit.org/show_bug.cgi?id=212604
+ <rdar://problem/63779241>
+
+ Reviewed by Tim Horton.
+
+ r250312 was a step towards a network process singleton.
+ We aren't there yet, so revert it until we are. There was something trying to keep HSTS storages separate, so let them keep trying.
+
+ * UIProcess/API/APIProcessPoolConfiguration.cpp:
+ (API::ProcessPoolConfiguration::copy):
+ * UIProcess/API/APIProcessPoolConfiguration.h:
+ * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
+ (-[_WKProcessPoolConfiguration setHSTSStorageDirectory:]):
+ (-[_WKProcessPoolConfiguration hstsStorageDirectory]):
+ * UIProcess/LegacyGlobalSettings.h:
+ (WebKit::LegacyGlobalSettings::setHSTSStorageDirectory): Deleted.
+ (WebKit::LegacyGlobalSettings::hstsStorageDirectory const): Deleted.
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::ensureNetworkProcess):
+
2020-06-01 Chris Dumez <cdu...@apple.com>
ASSERTION FAILURE (r220931): !m_function in ~CompletionHandler() after switch tabs
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp (262390 => 262391)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2020-06-01 19:38:37 UTC (rev 262390)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp 2020-06-01 20:05:15 UTC (rev 262391)
@@ -68,6 +68,7 @@
copy->m_usesBackForwardCache = this->m_usesBackForwardCache;
copy->m_customWebContentServiceBundleIdentifier = this->m_customWebContentServiceBundleIdentifier;
copy->m_usesSingleWebProcess = m_usesSingleWebProcess;
+ copy->m_hstsStorageDirectory = m_hstsStorageDirectory;
#if PLATFORM(GTK) && !USE(GTK4)
copy->m_useSystemAppearanceForScrollbars = m_useSystemAppearanceForScrollbars;
#endif
Modified: trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h (262390 => 262391)
--- trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2020-06-01 19:38:37 UTC (rev 262390)
+++ trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h 2020-06-01 20:05:15 UTC (rev 262391)
@@ -131,6 +131,9 @@
const WTF::String& customWebContentServiceBundleIdentifier() const { return m_customWebContentServiceBundleIdentifier; }
void setCustomWebContentServiceBundleIdentifier(const WTF::String& customWebContentServiceBundleIdentifier) { m_customWebContentServiceBundleIdentifier = customWebContentServiceBundleIdentifier; }
+ const WTF::String& hstsStorageDirectory() const { return m_hstsStorageDirectory; }
+ void setHSTSStorageDirectory(WTF::String&& directory) { m_hstsStorageDirectory = WTFMove(directory); }
+
#if PLATFORM(GTK) && !USE(GTK4)
bool useSystemAppearanceForScrollbars() const { return m_useSystemAppearanceForScrollbars; }
void setUseSystemAppearanceForScrollbars(bool useSystemAppearanceForScrollbars) { m_useSystemAppearanceForScrollbars = useSystemAppearanceForScrollbars; }
@@ -173,6 +176,7 @@
bool m_shouldConfigureJSCForTesting { false };
bool m_isJITEnabled { true };
bool m_usesSingleWebProcess { false };
+ WTF::String m_hstsStorageDirectory;
#if PLATFORM(GTK) && !USE(GTK4)
bool m_useSystemAppearanceForScrollbars { false };
#endif
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm (262390 => 262391)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2020-06-01 19:38:37 UTC (rev 262390)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm 2020-06-01 20:05:15 UTC (rev 262391)
@@ -307,12 +307,12 @@
[NSException raise:NSInvalidArgumentException format:@"%@ is not a file URL", directory];
// FIXME: Move this to _WKWebsiteDataStoreConfiguration once rdar://problem/50109631 is fixed.
- WebKit::LegacyGlobalSettings::singleton().setHSTSStorageDirectory(directory.path);
+ _processPoolConfiguration->setHSTSStorageDirectory(directory.path);
}
- (NSURL *)hstsStorageDirectory
{
- return [NSURL fileURLWithPath:WebKit::LegacyGlobalSettings::singleton().hstsStorageDirectory() isDirectory:YES];
+ return [NSURL fileURLWithPath:_processPoolConfiguration->hstsStorageDirectory() isDirectory:YES];
}
#if PLATFORM(IOS_FAMILY)
Modified: trunk/Source/WebKit/UIProcess/LegacyGlobalSettings.h (262390 => 262391)
--- trunk/Source/WebKit/UIProcess/LegacyGlobalSettings.h 2020-06-01 19:38:37 UTC (rev 262390)
+++ trunk/Source/WebKit/UIProcess/LegacyGlobalSettings.h 2020-06-01 20:05:15 UTC (rev 262391)
@@ -40,9 +40,6 @@
void setCacheModel(CacheModel);
CacheModel cacheModel() const { return m_cacheModel; }
- void setHSTSStorageDirectory(String&& directory) { m_hstsStorageDirectory = WTFMove(directory); }
- const String& hstsStorageDirectory() const { return m_hstsStorageDirectory; }
-
const HashSet<String>& schemesToRegisterAsSecure() { return m_schemesToRegisterAsSecure; }
void registerURLSchemeAsSecure(const String& scheme) { m_schemesToRegisterAsSecure.add(scheme); }
@@ -60,7 +57,6 @@
LegacyGlobalSettings();
CacheModel m_cacheModel { CacheModel::PrimaryWebBrowser };
- String m_hstsStorageDirectory;
HashSet<String> m_schemesToRegisterAsSecure;
HashSet<String> m_schemesToRegisterAsBypassingContentSecurityPolicy;
HashSet<String> m_schemesToRegisterAsLocal;
Modified: trunk/Source/WebKit/UIProcess/WebProcessPool.cpp (262390 => 262391)
--- trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2020-06-01 19:38:37 UTC (rev 262390)
+++ trunk/Source/WebKit/UIProcess/WebProcessPool.cpp 2020-06-01 20:05:15 UTC (rev 262391)
@@ -543,7 +543,7 @@
#endif
#endif
- parameters.hstsStorageDirectory = LegacyGlobalSettings::singleton().hstsStorageDirectory();
+ parameters.hstsStorageDirectory = m_configuration->hstsStorageDirectory();
if (!parameters.hstsStorageDirectory.isNull())
SandboxExtension::createHandleForReadWriteDirectory(parameters.hstsStorageDirectory, parameters.hstsStorageDirectoryExtensionHandle);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes