Changeset 181052 in webkit


Ignore:
Timestamp:
Mar 4, 2015 4:51:44 PM (9 years ago)
Author:
ap@apple.com
Message:

[Mac] Set SystemUIFontSelect in DRT and WKTR
https://bugs.webkit.org/show_bug.cgi?id=142303

Reviewed by Myles C. Maxfield.

  • DumpRenderTree/mac/DumpRenderTree.mm:

(setDefaultsToConsistentValuesForTesting):

  • WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:

(WTR::InjectedBundle::platformInitialize):

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r181050 r181052  
     12015-03-04  Alexey Proskuryakov  <ap@apple.com>
     2
     3        [Mac] Set SystemUIFontSelect in DRT and WKTR
     4        https://bugs.webkit.org/show_bug.cgi?id=142303
     5
     6        Reviewed by Myles C. Maxfield.
     7
     8        * DumpRenderTree/mac/DumpRenderTree.mm:
     9        (setDefaultsToConsistentValuesForTesting):
     10        * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
     11        (WTR::InjectedBundle::platformInitialize):
     12
    1132015-03-04  Chris Dumez  <cdumez@apple.com>
    214
  • trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

    r180570 r181052  
    936936        @"AppleShowScrollBars": @"Always",
    937937        @"NSButtonAnimationsEnabled": @NO, // Ideally, we should find a way to test animations, but for now, make sure that the dumped snapshot matches actual state.
     938#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
     939        @"SystemUIFontSelect": @"Neue",
     940#endif
    938941    };
    939942
    940943    [[NSUserDefaults standardUserDefaults] setValuesForKeysWithDictionary:dict];
     944
     945#if PLATFORM(MAC)
     946    // Make NSFont use the new defaults.
     947    [NSFont initialize];
     948#endif
    941949
    942950    NSDictionary *processInstanceDefaults = @{
  • trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm

    r171902 r181052  
    4646        @"AppleAntiAliasingThreshold": @4,
    4747        // FIXME: Setting AppleFontSmoothing is likely unnecessary and ineffective. WebKit2 has its own preference for font smoothing, which is
    48         // applied to each context via CGContextSetShouldSmoothFonts, presumably overriding the default. And it's too late to do this here,
    49         // see <https://bugs.webkit.org/show_bug.cgi?id=123488>
     48        // applied to each context via CGContextSetShouldSmoothFonts, presumably overriding the default.
    5049        @"AppleFontSmoothing": @(NoFontSmoothing),
    5150        @"AppleAquaColorVariant": @(BlueTintedAppearance),
     
    6261        @"NSTestCorrectionDictionary": @{
    6362            @"notationl": @"notational"
    64         }
     63        },
     64#if __MAC_OS_X_VERSION_MIN_REQUIRED > 101000
     65        @"SystemUIFontSelect": @"Neue",
     66#endif
    6567    };
    6668
    6769    [[NSUserDefaults standardUserDefaults] setVolatileDomain:dict forName:NSArgumentDomain];
     70
     71    // Make NSFont use the new defaults.
     72    [NSFont initialize];
    6873
    6974    // Underlying frameworks have already read AppleAntiAliasingThreshold default before we changed it.
Note: See TracChangeset for help on using the changeset viewer.