Title: [255630] branches/safari-610.1.1-branch/Source/WebKit
- Revision
- 255630
- Author
- alanc...@apple.com
- Date
- 2020-02-03 19:08:36 -0800 (Mon, 03 Feb 2020)
Log Message
Cherry-pick r255376. rdar://problem/58440111
Unreviewed, fix Catalyst build after r255366
* Shared/WebPreferencesDefaultValues.cpp:
(WebKit::defaultDisallowSyncXHRDuringPageDismissalEnabled):
* Shared/WebPreferencesDefaultValues.h:
* Shared/ios/WebPreferencesDefaultValuesIOS.mm:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255376 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.1-branch/Source/WebKit/ChangeLog (255629 => 255630)
--- branches/safari-610.1.1-branch/Source/WebKit/ChangeLog 2020-02-04 03:08:34 UTC (rev 255629)
+++ branches/safari-610.1.1-branch/Source/WebKit/ChangeLog 2020-02-04 03:08:36 UTC (rev 255630)
@@ -1,5 +1,27 @@
2020-02-03 Russell Epstein <repst...@apple.com>
+ Cherry-pick r255376. rdar://problem/58440111
+
+ Unreviewed, fix Catalyst build after r255366
+
+ * Shared/WebPreferencesDefaultValues.cpp:
+ (WebKit::defaultDisallowSyncXHRDuringPageDismissalEnabled):
+ * Shared/WebPreferencesDefaultValues.h:
+ * Shared/ios/WebPreferencesDefaultValuesIOS.mm:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@255376 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-01-29 Chris Dumez <cdu...@apple.com>
+
+ Unreviewed, fix Catalyst build after r255366
+
+ * Shared/WebPreferencesDefaultValues.cpp:
+ (WebKit::defaultDisallowSyncXHRDuringPageDismissalEnabled):
+ * Shared/WebPreferencesDefaultValues.h:
+ * Shared/ios/WebPreferencesDefaultValuesIOS.mm:
+
+2020-02-03 Russell Epstein <repst...@apple.com>
+
Cherry-pick r255375. rdar://problem/58791603
Crash under com.apple.WebKit.Networking at WebKit: WebKit::WebIDBServer::suspend
Modified: branches/safari-610.1.1-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp (255629 => 255630)
--- branches/safari-610.1.1-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2020-02-04 03:08:34 UTC (rev 255629)
+++ branches/safari-610.1.1-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.cpp 2020-02-04 03:08:36 UTC (rev 255630)
@@ -66,12 +66,12 @@
bool defaultDisallowSyncXHRDuringPageDismissalEnabled()
{
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(MACCATALYST)
if (CFPreferencesGetAppBooleanValue(CFSTR("allowDeprecatedSynchronousXMLHttpRequestDuringUnload"), CFSTR("com.apple.WebKit"), nullptr)) {
WTFLogAlways("Allowing synchronous XHR during page unload due to managed preference");
return false;
}
-#elif PLATFORM(IOS_FAMILY)
+#elif PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
if (allowsDeprecatedSynchronousXMLHttpRequestDuringUnload()) {
WTFLogAlways("Allowing synchronous XHR during page unload due to managed preference");
return false;
Modified: branches/safari-610.1.1-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.h (255629 => 255630)
--- branches/safari-610.1.1-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2020-02-04 03:08:34 UTC (rev 255629)
+++ branches/safari-610.1.1-branch/Source/WebKit/Shared/WebPreferencesDefaultValues.h 2020-02-04 03:08:36 UTC (rev 255630)
@@ -315,7 +315,7 @@
#if ENABLE(TEXT_AUTOSIZING)
bool defaultTextAutosizingUsesIdempotentMode();
#endif
-#if PLATFORM(IOS_FAMILY)
+#if PLATFORM(IOS_FAMILY) && !PLATFORM(MACCATALYST)
bool allowsDeprecatedSynchronousXMLHttpRequestDuringUnload();
#endif
Modified: branches/safari-610.1.1-branch/Source/WebKit/Shared/ios/WebPreferencesDefaultValuesIOS.mm (255629 => 255630)
--- branches/safari-610.1.1-branch/Source/WebKit/Shared/ios/WebPreferencesDefaultValuesIOS.mm 2020-02-04 03:08:34 UTC (rev 255629)
+++ branches/safari-610.1.1-branch/Source/WebKit/Shared/ios/WebPreferencesDefaultValuesIOS.mm 2020-02-04 03:08:36 UTC (rev 255630)
@@ -43,10 +43,12 @@
#endif
+#if !PLATFORM(MACCATALYST)
bool allowsDeprecatedSynchronousXMLHttpRequestDuringUnload()
{
return [[PAL::getMCProfileConnectionClass() sharedConnection] effectiveBoolValueForSetting:@"allowDeprecatedWebKitSynchronousXHRLoads"] == MCRestrictedBoolExplicitYes;
}
+#endif
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
