Title: [292972] trunk/Source/WebKit
- Revision
- 292972
- Author
- bfulg...@apple.com
- Date
- 2022-04-18 14:37:35 -0700 (Mon, 18 Apr 2022)
Log Message
Remove the deprecated CaptivePortal enablement key
https://bugs.webkit.org/show_bug.cgi?id=239456
Reviewed by Wenson Hsieh.
This is a minor code cleanup to remove an old default key
we used in the early experiments with this behavior.
* UIProcess/API/Cocoa/_WKSystemPreferences.mm:
(+[_WKSystemPreferences isCaptivePortalModeEnabled]):
* UIProcess/API/Cocoa/_WKSystemPreferencesInternal.h:
* UIProcess/Cocoa/WebProcessPoolCocoa.mm:
(WebKit::WebProcessPool::notifyPreferencesChanged):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (292971 => 292972)
--- trunk/Source/WebKit/ChangeLog 2022-04-18 21:35:47 UTC (rev 292971)
+++ trunk/Source/WebKit/ChangeLog 2022-04-18 21:37:35 UTC (rev 292972)
@@ -1,3 +1,19 @@
+2022-04-18 Brent Fulgham <bfulg...@apple.com>
+
+ Remove the deprecated CaptivePortal enablement key
+ https://bugs.webkit.org/show_bug.cgi?id=239456
+
+ Reviewed by Wenson Hsieh.
+
+ This is a minor code cleanup to remove an old default key
+ we used in the early experiments with this behavior.
+
+ * UIProcess/API/Cocoa/_WKSystemPreferences.mm:
+ (+[_WKSystemPreferences isCaptivePortalModeEnabled]):
+ * UIProcess/API/Cocoa/_WKSystemPreferencesInternal.h:
+ * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
+ (WebKit::WebProcessPool::notifyPreferencesChanged):
+
2022-04-18 Per Arne Vollan <pvol...@apple.com>
Fix incorrect syscall name in sandboxes
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferences.mm (292971 => 292972)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferences.mm 2022-04-18 21:35:47 UTC (rev 292971)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferences.mm 2022-04-18 21:37:35 UTC (rev 292972)
@@ -40,9 +40,6 @@
if (preferenceValue.get() == kCFBooleanTrue)
return true;
- if ([[NSUserDefaults standardUserDefaults] boolForKey:[NSString stringWithUTF8String:WebKitCaptivePortalModeChangedNotification_Legacy]])
- return true;
-
key = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, LDMEnabledKey, kCFStringEncodingUTF8));
preferenceValue = adoptCF(CFPreferencesCopyValue(key.get(), kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost));
return preferenceValue.get() == kCFBooleanTrue;
Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferencesInternal.h (292971 => 292972)
--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferencesInternal.h 2022-04-18 21:35:47 UTC (rev 292971)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferencesInternal.h 2022-04-18 21:37:35 UTC (rev 292972)
@@ -27,5 +27,4 @@
constexpr auto LDMEnabledKey = "LDMGlobalEnabled";
constexpr auto WKCaptivePortalModeEnabledKey = "WKCaptivePortalModeEnabled";
-constexpr auto WebKitCaptivePortalModeChangedNotification_Legacy = "WebKitCaptivePortalModeEnabled";
constexpr auto WKCaptivePortalModeContainerConfigurationChangedNotification = @"WKCaptivePortalModeContainerConfigurationChanged";
Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm (292971 => 292972)
--- trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2022-04-18 21:35:47 UTC (rev 292971)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm 2022-04-18 21:37:35 UTC (rev 292972)
@@ -1082,7 +1082,7 @@
networkProcess->send(Messages::NetworkProcess::NotifyPreferencesChanged(domain, key, encodedValue), 0);
});
- if (key == WKCaptivePortalModeEnabledKey || key == WebKitCaptivePortalModeChangedNotification_Legacy)
+ if (key == WKCaptivePortalModeEnabledKey)
captivePortalModeStateChanged();
}
#endif // ENABLE(CFPREFS_DIRECT_MODE)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
