Changeset 158652 in webkit

Timestamp:

Nov 4, 2013 11:05:59 PM (10 years ago)

Author:

ap@apple.com

Message:

DumpRenderTree should reset its preferences file on launch
​https://bugs.webkit.org/show_bug.cgi?id=29751

Reviewed by Dan Bernstein.

Source/WebKit/mac:

• WebView/WebView.mm:

(-[WebView _retrieveKeyboardUIModeFromPreferences:]):
Further fix reading of AppleKeyboardUIMode - reading it from kCFPreferencesAnyApplication
domain meant that current application's domain was explcitly ignored, and the only
way to override the setting in DRT was through argument domain.

Source/WebKit2:

• UIProcess/mac/WKFullKeyboardAccessWatcher.mm:

(-[WKFullKeyboardAccessWatcher retrieveKeyboardUIModeFromPreferences:]):
Further fix reading of AppleKeyboardUIMode - reading it from kCFPreferencesAnyApplication
domain meant that current application's domain was explcitly ignored, and the only
way to override the setting in WTR was through argument domain.

Tools:

Using NSArgumentDomain was not a good idea. While it works with NSUserDefaults
and CFPreferencesCopyAppValue family of functions, it doesn't work with
CFPreferencesCopyValue(..., kCFPreferencesCurrentApplication, ...).

So, now we'll just set defaults in the current application.

• DumpRenderTree/mac/DumpRenderTree.mm: (setDefaultsToConsistentValuesForTesting):
• Delete the defaults.
• Removed CFPreferencesSetAppValue calls, as -setValuesForKeysWithDictionary: does the same.
• The comment about [NSUserDefaults standardUserDefaults] indirectly initializing NSApplication was incorrect.

• WebKitTestRunner/mac/main.mm: (setDefaultsToConsistentValuesForTesting):

Switched to -setValuesForKeysWithDictionary for consistency.

Location:

trunk

Files:

• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/WebView/WebView.mm (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/mac/WKFullKeyboardAccessWatcher.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (2 diffs)
• Tools/WebKitTestRunner/mac/main.mm (modified) (1 diff)

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2013-11-04  Alexey Proskuryakov  <ap@apple.com>
+
+        DumpRenderTree should reset its preferences file on launch
+        https://bugs.webkit.org/show_bug.cgi?id=29751
+
+        Reviewed by Dan Bernstein.
+
+        * WebView/WebView.mm:
+        (-[WebView _retrieveKeyboardUIModeFromPreferences:]):
+        Further fix reading of AppleKeyboardUIMode - reading it from kCFPreferencesAnyApplication
+        domain meant that current application's domain was explcitly ignored, and the only
+        way to override the setting in DRT was through argument domain.
+
 2013-11-01  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -6524 +6524 @@
 - (void)_retrieveKeyboardUIModeFromPreferences:(NSNotification *)notification
 {
-    CFPreferencesAppSynchronize(kCFPreferencesAnyApplication);
+    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
 
     Boolean keyExistsAndHasValidFormat;
-    int mode = CFPreferencesGetAppIntegerValue(AppleKeyboardUIMode, kCFPreferencesAnyApplication, &keyExistsAndHasValidFormat);
+    int mode = CFPreferencesGetAppIntegerValue(AppleKeyboardUIMode, kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat);
 
     // The keyboard access mode has two bits:

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-11-04  Alexey Proskuryakov  <ap@apple.com>
+
+        DumpRenderTree should reset its preferences file on launch
+        https://bugs.webkit.org/show_bug.cgi?id=29751
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/mac/WKFullKeyboardAccessWatcher.mm:
+        (-[WKFullKeyboardAccessWatcher retrieveKeyboardUIModeFromPreferences:]):
+        Further fix reading of AppleKeyboardUIMode - reading it from kCFPreferencesAnyApplication
+        domain meant that current application's domain was explcitly ignored, and the only
+        way to override the setting in WTR was through argument domain.
+
 2013-11-04  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/mac/WKFullKeyboardAccessWatcher.mm

@@ -47 +47 @@
     BOOL oldValue = fullKeyboardAccessEnabled;
 
-    CFPreferencesAppSynchronize(kCFPreferencesAnyApplication);
+    CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
 
     Boolean keyExistsAndHasValidFormat;
-    int mode = CFPreferencesGetAppIntegerValue(AppleKeyboardUIMode, kCFPreferencesAnyApplication, &keyExistsAndHasValidFormat);
+    int mode = CFPreferencesGetAppIntegerValue(AppleKeyboardUIMode, kCFPreferencesCurrentApplication, &keyExistsAndHasValidFormat);
     if (keyExistsAndHasValidFormat) {
         // The keyboard access mode has two bits:

trunk/Tools/ChangeLog

@@ +1 @@
+2013-11-04  Alexey Proskuryakov  <ap@apple.com>
+
+        DumpRenderTree should reset its preferences file on launch
+        https://bugs.webkit.org/show_bug.cgi?id=29751
+
+        Reviewed by Dan Bernstein.
+
+        Using NSArgumentDomain was not a good idea. While it works with NSUserDefaults
+        and CFPreferencesCopyAppValue family of functions, it doesn't work with
+        CFPreferencesCopyValue(..., kCFPreferencesCurrentApplication, ...).
+
+        So, now we'll just set defaults in the current application.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm: (setDefaultsToConsistentValuesForTesting):
+        - Delete the defaults.
+        - Removed CFPreferencesSetAppValue calls, as -setValuesForKeysWithDictionary: does the same.
+        - The comment about [NSUserDefaults standardUserDefaults] indirectly initializing NSApplication was incorrect.
+
+        * WebKitTestRunner/mac/main.mm: (setDefaultsToConsistentValuesForTesting):
+        Switched to -setValuesForKeysWithDictionary for consistency.
+
 2013-11-04  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -680 +680 @@
     static const int BlueTintedAppearance = 1;
 
-    // These defaults are read at NSApplication initialization time, and there is no way to fully reset them afterwards.
-    // We have to use CFPreferences, because [NSUserDefaults standardUserDefaults] indirectly initializes NSApplication.
-    CFPreferencesSetAppValue(CFSTR("AppleFontSmoothing"), (CFNumberRef)@(NoFontSmoothing), kCFPreferencesCurrentApplication);
-    CFPreferencesSetAppValue(CFSTR("AppleAntiAliasingThreshold"), (CFNumberRef)@4, kCFPreferencesCurrentApplication);
-    CFPreferencesSetAppValue(CFSTR("AppleLanguages"), (CFArrayRef)@[ @"en" ], kCFPreferencesCurrentApplication);
+    [[NSUserDefaults standardUserDefaults] removePersistentDomainForName:@"DumpRenderTree"];
 
     NSString *libraryPath = libraryPathForDumpRenderTree();
@@ -717 +713 @@
     };
 
-    [[NSUserDefaults standardUserDefaults] setVolatileDomain:dict forName:NSArgumentDomain];
+    [[NSUserDefaults standardUserDefaults] setValuesForKeysWithDictionary:dict];
 }
 

trunk/Tools/WebKitTestRunner/mac/main.mm

@@ -41 +41 @@
     };
 
-    [[NSUserDefaults standardUserDefaults] setVolatileDomain:dict forName:NSArgumentDomain];
+    [[NSUserDefaults standardUserDefaults] setValuesForKeysWithDictionary:dict];
 }