Changeset 290144 in webkit

Timestamp:

Feb 18, 2022, 10:54:31 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Change domain used to hold whether CaptivePortalMode is active
​https://bugs.webkit.org/show_bug.cgi?id=236793

Patch by Gavin Phillips <​gavin.p@apple.com> on 2022-02-18
Reviewed by Per Arne Vollan.

We need to update the location specifying whether CaptivePortalMode is active
to fall within the users domain.

• UIProcess/API/Cocoa/_WKSystemPreferences.mm:

(+[_WKSystemPreferences isCaptivePortalModeEnabled]):
(+[_WKSystemPreferences setCaptivePortalModeEnabled:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/_WKSystemPreferences.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-02-18  Gavin Phillips  <gavin.p@apple.com>
+
+        Change domain used to hold whether CaptivePortalMode is active
+        https://bugs.webkit.org/show_bug.cgi?id=236793
+
+        Reviewed by Per Arne Vollan.
+
+        We need to update the location specifying whether CaptivePortalMode is active
+        to fall within the users domain.
+
+        * UIProcess/API/Cocoa/_WKSystemPreferences.mm:
+        (+[_WKSystemPreferences isCaptivePortalModeEnabled]):
+        (+[_WKSystemPreferences setCaptivePortalModeEnabled:]):
+
 2022-02-18  Adrian Perez de Castro  <aperez@igalia.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferences.mm

@@ -37 +37 @@
 {
     auto changedNotificationKey = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, WKCaptivePortalModeEnabledKey, kCFStringEncodingUTF8));
-    auto preferenceValue = adoptCF(CFPreferencesCopyValue(changedNotificationKey.get(), kCFPreferencesAnyApplication, kCFPreferencesAnyUser, kCFPreferencesCurrentHost));
+    auto preferenceValue = adoptCF(CFPreferencesCopyValue(changedNotificationKey.get(), kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost));
     return preferenceValue.get() == kCFBooleanTrue;
 }
@@ -44 +44 @@
 {
     auto changedNotificationKey = adoptCF(CFStringCreateWithCString(kCFAllocatorDefault, WKCaptivePortalModeEnabledKey, kCFStringEncodingUTF8));
-    CFPreferencesSetValue(changedNotificationKey.get(), enabled ? kCFBooleanTrue : kCFBooleanFalse, kCFPreferencesAnyApplication, kCFPreferencesAnyUser, kCFPreferencesCurrentHost);
+    CFPreferencesSetValue(changedNotificationKey.get(), enabled ? kCFBooleanTrue : kCFBooleanFalse, kCFPreferencesAnyApplication, kCFPreferencesCurrentUser, kCFPreferencesCurrentHost);
     CFPreferencesSynchronize(kCFPreferencesAnyApplication, kCFPreferencesAnyUser, kCFPreferencesAnyHost);
 }