Title: [290144] trunk/Source/WebKit
Revision
290144
Author
commit-qu...@webkit.org
Date
2022-02-18 10:54:31 -0800 (Fri, 18 Feb 2022)

Log Message

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

Patch by Gavin Phillips <gavi...@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:]):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (290143 => 290144)


--- trunk/Source/WebKit/ChangeLog	2022-02-18 18:52:06 UTC (rev 290143)
+++ trunk/Source/WebKit/ChangeLog	2022-02-18 18:54:31 UTC (rev 290144)
@@ -1,3 +1,17 @@
+2022-02-18  Gavin Phillips  <gavi...@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  <ape...@igalia.com>
 
         [CMake] Cannot find OpenGL when system provides opengl.pc instead of gl.pc

Modified: trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferences.mm (290143 => 290144)


--- trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferences.mm	2022-02-18 18:52:06 UTC (rev 290143)
+++ trunk/Source/WebKit/UIProcess/API/Cocoa/_WKSystemPreferences.mm	2022-02-18 18:54:31 UTC (rev 290144)
@@ -36,7 +36,7 @@
 + (BOOL)isCaptivePortalModeEnabled
 {
     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;
 }
 
@@ -43,7 +43,7 @@
 + (void)setCaptivePortalModeEnabled:(BOOL)enabled
 {
     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);
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to