Changeset 186001 in webkit


Ignore:
Timestamp:
Jun 26, 2015 10:27:32 AM (9 years ago)
Author:
mmaxfield@apple.com
Message:

[Cocoa] Sans-serif generic font family should map to PingFang
​https://bugs.webkit.org/show_bug.cgi?id=146333
<rdar://problem/21521217>

Patch by Myles C. Maxfield <​mmaxfield@apple.com> on 2015-06-26
Reviewed by Alexey Proskuryakov.

Source/WebCore:

Also performs a little bit of cleanup.

Test: fast/text/han-generic-font-families.html

  • page/mac/SettingsMac.mm:

(WebCore::sansSerifTraditionalHanFontFamily):
(WebCore::sansSerifSimplifiedHanFontFamily):
(WebCore::Settings::initializeDefaultFontFamilies):

LayoutTests:

  • fast/text/han-generic-font-families.html: Added.
  • platform/efl/TestExpectations:
  • platform/gtk/TestExpectations:
  • platform/ios-simulator/fast/text/han-generic-font-families-expected.html: Added.
  • platform/mac-mavericks/fast/text/han-generic-font-families-expected.html: Added.
  • platform/mac-yosemite/fast/text/han-generic-font-families-expected.html: Added.
  • platform/mac/fast/text/han-generic-font-families-expected.html: Added.
  • platform/win/TestExpectations:
Location:
trunk
Files:
5 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r185990 r186001  
     12015-06-26  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        [Cocoa] Sans-serif generic font family should map to PingFang
     4        https://bugs.webkit.org/show_bug.cgi?id=146333
     5        <rdar://problem/21521217>
     6
     7        Reviewed by Alexey Proskuryakov.
     8
     9        * fast/text/han-generic-font-families.html: Added.
     10        * platform/efl/TestExpectations:
     11        * platform/gtk/TestExpectations:
     12        * platform/ios-simulator/fast/text/han-generic-font-families-expected.html: Added.
     13        * platform/mac-mavericks/fast/text/han-generic-font-families-expected.html: Added.
     14        * platform/mac-yosemite/fast/text/han-generic-font-families-expected.html: Added.
     15        * platform/mac/fast/text/han-generic-font-families-expected.html: Added.
     16        * platform/win/TestExpectations:
     17
    1182015-06-26  David Kilzer  <ddkilzer@apple.com>
    219

  • trunk/LayoutTests/platform/efl/TestExpectations

    r185895 r186001  
    22772277
    22782278webkit.org/b/146233 fast/forms/listbox-visible-size.html [ Failure ]
     2279
     2280# Test requires hardcoded font names, which I do not have for this port.
     2281fast/text/han-generic-font-families.html [ WontFix ]

  • trunk/LayoutTests/platform/gtk/TestExpectations

    r185895 r186001  
    24002400# This requires a specific font on Mac
    24012401fast/text/hidpi-text-selection-gap-between-words.html [ Skip ]
     2402
     2403# Test requires hardcoded font names, which I do not have for this port.
     2404fast/text/han-generic-font-families.html [ WontFix ]

  • trunk/LayoutTests/platform/win/TestExpectations

    r185976 r186001  
    31113111#Subpixel difference
    31123112fast/text/decorations-vertical-underline.html [ Skip ]
     3113
     3114# Test requires hardcoded font names, which I do not have for this port.
     3115fast/text/han-generic-font-families.html [ WontFix ]

  • trunk/Source/WebCore/ChangeLog

    r186000 r186001  
     12015-06-26  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        [Cocoa] Sans-serif generic font family should map to PingFang
     4        https://bugs.webkit.org/show_bug.cgi?id=146333
     5        <rdar://problem/21521217>
     6
     7        Reviewed by Alexey Proskuryakov.
     8
     9        Also performs a little bit of cleanup.
     10
     11        Test: fast/text/han-generic-font-families.html
     12
     13        * page/mac/SettingsMac.mm:
     14        (WebCore::sansSerifTraditionalHanFontFamily):
     15        (WebCore::sansSerifSimplifiedHanFontFamily):
     16        (WebCore::Settings::initializeDefaultFontFamilies):
     17
    1182015-06-26  Per Arne Vollan  <peavo@outlook.com>
    219

  • trunk/Source/WebCore/page/mac/SettingsMac.mm

    r179368 r186001  
    2929namespace WebCore {
    3030
     31static inline const char* sansSerifTraditionalHanFontFamily()
     32{
     33#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
     34    return "PingFang TC";
     35#else
     36    return "Heiti TC";
     37#endif
     38}
     39
     40static inline const char* sansSerifSimplifiedHanFontFamily()
     41{
     42#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000)
     43    return "PingFang SC";
     44#else
     45    return "Heiti SC";
     46#endif
     47}
     48
     49#if PLATFORM(MAC)
    3150void Settings::initializeDefaultFontFamilies()
    3251{
    33 #if !PLATFORM(IOS)
    3452    setStandardFontFamily("Songti TC", USCRIPT_TRADITIONAL_HAN);
    3553    setSerifFontFamily("Songti TC", USCRIPT_TRADITIONAL_HAN);
    36 #else
    37     // There is no serif Chinese font in default iOS installation.
    38     setStandardFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
    39     setSerifFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
    40 #endif
    41     setFixedFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
    42     setSansSerifFontFamily("Heiti TC", USCRIPT_TRADITIONAL_HAN);
     54    setFixedFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
     55    setSansSerifFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
    4356
    44 #if !PLATFORM(IOS)
    4557    setStandardFontFamily("Songti SC", USCRIPT_SIMPLIFIED_HAN);
    4658    setSerifFontFamily("Songti SC", USCRIPT_SIMPLIFIED_HAN);
    47 #else
    48     // There is no serif Chinese font in default iOS installation.
    49     setStandardFontFamily("Heiti SC", USCRIPT_SIMPLIFIED_HAN);
    50     setSerifFontFamily("Heiti SC", USCRIPT_SIMPLIFIED_HAN);
    51 #endif
    52     setFixedFontFamily("Heiti SC", USCRIPT_SIMPLIFIED_HAN);
    53     setSansSerifFontFamily("Heiti SC", USCRIPT_SIMPLIFIED_HAN);
     59    setFixedFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
     60    setSansSerifFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
    5461
    5562    setStandardFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
    56 #if !PLATFORM(IOS)
    5763    setFixedFontFamily("Osaka-Mono", USCRIPT_KATAKANA_OR_HIRAGANA);
    58 #else
    59     setFixedFontFamily("Hiragino Kaku Gothic ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
    60 #endif
    6164    setSerifFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
    6265    setSansSerifFontFamily("Hiragino Kaku Gothic ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
    6366
    64 #if !PLATFORM(IOS)
    6567    setStandardFontFamily("AppleMyungjo", USCRIPT_HANGUL);
    6668    setSerifFontFamily("AppleMyungjo", USCRIPT_HANGUL);
    67 #else
    68     // There is no serif Korean font in default iOS installation.
    69     setStandardFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
    70     setSerifFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
    71 #endif
    72 #if PLATFORM(COCOA)
    7369    setFixedFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
    7470    setSansSerifFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
    75 #else
    76     setFixedFontFamily("AppleGothic", USCRIPT_HANGUL);
    77     setSansSerifFontFamily("AppleGothic", USCRIPT_HANGUL);
    78 #endif
    7971
    8072    setStandardFontFamily("Times", USCRIPT_COMMON);
    … …  
    8476}
    8577
     78#else
     79
     80void Settings::initializeDefaultFontFamilies()
     81{
     82    // There is no serif Chinese font in default iOS installation.
     83    setStandardFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
     84    setSerifFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
     85    setFixedFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
     86    setSansSerifFontFamily(sansSerifTraditionalHanFontFamily(), USCRIPT_TRADITIONAL_HAN);
     87
     88    // There is no serif Chinese font in default iOS installation.
     89    setStandardFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
     90    setSerifFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
     91    setFixedFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
     92    setSansSerifFontFamily(sansSerifSimplifiedHanFontFamily(), USCRIPT_SIMPLIFIED_HAN);
     93
     94    setStandardFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
     95    setFixedFontFamily("Hiragino Kaku Gothic ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
     96    setSerifFontFamily("Hiragino Mincho ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
     97    setSansSerifFontFamily("Hiragino Kaku Gothic ProN", USCRIPT_KATAKANA_OR_HIRAGANA);
     98
     99    // There is no serif Korean font in default iOS installation.
     100    setStandardFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
     101    setSerifFontFamily("Apple SD Gothic Neo", USCRIPT_HANGUL);
     102    setFixedFontFamily("AppleGothic", USCRIPT_HANGUL);
     103    setSansSerifFontFamily("AppleGothic", USCRIPT_HANGUL);
     104
     105    setStandardFontFamily("Times", USCRIPT_COMMON);
     106    setFixedFontFamily("Courier", USCRIPT_COMMON);
     107    setSerifFontFamily("Times", USCRIPT_COMMON);
     108    setSansSerifFontFamily("Helvetica", USCRIPT_COMMON);
     109}
     110#endif
    86111
    87112} // namespace WebCore
Note: See TracChangeset for help on using the changeset viewer.