Changeset 247465 in webkit


Ignore:
Timestamp:
Jul 15, 2019 5:53:54 PM (5 years ago)
Author:
mmaxfield@apple.com
Message:

New York font erroneously gets synthetic bold
https://bugs.webkit.org/show_bug.cgi?id=199653

Unreviewed watchOS build fix.

Source/WebCore:

  • page/ProcessWarming.cpp:

(WebCore::ProcessWarming::prewarmGlobally):

  • page/cocoa/MemoryReleaseCocoa.mm:

(WebCore::platformReleaseMemory):

  • platform/graphics/FontCascadeDescription.cpp:
  • platform/graphics/FontDescription.h:
  • platform/graphics/cocoa/FontCacheCoreText.cpp:

(WebCore::invalidateFontCache):
(WebCore::lookupFallbackFont):

  • platform/graphics/cocoa/FontDescriptionCocoa.cpp:

(WebCore::FontCascadeDescription::effectiveFamilyAt const):

  • platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp:

(WebCore::FontFamilySpecificationCoreText::fontRanges const):

  • platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp:

Source/WTF:

  • wtf/Platform.h:
Location:
trunk/Source
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WTF/ChangeLog

    r247464 r247465  
     12019-07-15  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        New York font erroneously gets synthetic bold
     4        https://bugs.webkit.org/show_bug.cgi?id=199653
     5
     6        Unreviewed watchOS build fix.
     7
     8        * wtf/Platform.h:
     9
    1102019-07-15  Commit Queue  <commit-queue@webkit.org>
    211
  • trunk/Source/WTF/wtf/Platform.h

    r247464 r247465  
    15991599#endif
    16001600
     1601#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 40000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 110000)
     1602#define USE_PLATFORM_SYSTEM_FALLBACK_LIST 1
     1603#endif
     1604
    16011605#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 60000) || (PLATFORM(APPLETV) && __TV_OS_VERSION_MIN_REQUIRED >= 130000)
    16021606#define HAVE_DESIGN_SYSTEM_UI_FONTS 1
  • trunk/Source/WebCore/ChangeLog

    r247464 r247465  
     12019-07-15  Myles C. Maxfield  <mmaxfield@apple.com>
     2
     3        New York font erroneously gets synthetic bold
     4        https://bugs.webkit.org/show_bug.cgi?id=199653
     5
     6        Unreviewed watchOS build fix.
     7
     8        * page/ProcessWarming.cpp:
     9        (WebCore::ProcessWarming::prewarmGlobally):
     10        * page/cocoa/MemoryReleaseCocoa.mm:
     11        (WebCore::platformReleaseMemory):
     12        * platform/graphics/FontCascadeDescription.cpp:
     13        * platform/graphics/FontDescription.h:
     14        * platform/graphics/cocoa/FontCacheCoreText.cpp:
     15        (WebCore::invalidateFontCache):
     16        (WebCore::lookupFallbackFont):
     17        * platform/graphics/cocoa/FontDescriptionCocoa.cpp:
     18        (WebCore::FontCascadeDescription::effectiveFamilyAt const):
     19        * platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp:
     20        (WebCore::FontFamilySpecificationCoreText::fontRanges const):
     21        * platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp:
     22
    1232019-07-15  Commit Queue  <commit-queue@webkit.org>
    224
  • trunk/Source/WebCore/page/ProcessWarming.cpp

    r247464 r247465  
    7373    commonVM();
    7474
    75 #if USE_PLATFORM_SYSTEM_FALLBACK_LIST
     75#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
    7676    // Cache system UI font fallbacks. Almost every web process needs these.
    7777    // Initializing one size is sufficient to warm CoreText caches.
  • trunk/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm

    r247464 r247465  
    4545void platformReleaseMemory(Critical)
    4646{
    47 #if USE_PLATFORM_SYSTEM_FALLBACK_LIST
     47#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
    4848    SystemFontDatabaseCoreText::singleton().clear();
    4949#endif
  • trunk/Source/WebCore/platform/graphics/FontCascadeDescription.cpp

    r247464 r247465  
    6363}
    6464
    65 #if !USE_PLATFORM_SYSTEM_FALLBACK_LIST
     65#if !USE(PLATFORM_SYSTEM_FALLBACK_LIST)
    6666
    6767unsigned FontCascadeDescription::effectiveFamilyCount() const
  • trunk/Source/WebCore/platform/graphics/FontDescription.h

    r247464 r247465  
    3131#include <unicode/uscript.h>
    3232#include <wtf/MathExtras.h>
    33 
    34 #define USE_PLATFORM_SYSTEM_FALLBACK_LIST ((PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300))
    3533
    3634namespace WebCore {
  • trunk/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp

    r247464 r247465  
    12381238    }
    12391239
    1240 #if USE_PLATFORM_SYSTEM_FALLBACK_LIST
     1240#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
    12411241    SystemFontDatabaseCoreText::singleton().clear();
    12421242#endif
     
    13941394    CFIndex coveredLength = 0;
    13951395    RetainPtr<CTFontRef> result;
    1396 #if !USE_PLATFORM_SYSTEM_FALLBACK_LIST && (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && TARGET_OS_IOS))
     1396#if !USE(PLATFORM_SYSTEM_FALLBACK_LIST) && (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && TARGET_OS_IOS))
    13971397    result = adoptCF(CTFontCreatePhysicalFontForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength));
    13981398#else
  • trunk/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp

    r247464 r247465  
    3333namespace WebCore {
    3434
    35 #if USE_PLATFORM_SYSTEM_FALLBACK_LIST
     35#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
    3636
    3737#if PLATFORM(IOS_FAMILY)
     
    122122{
    123123    // The special cases in this function need to match the behavior in FontCacheIOS.mm and FontCacheMac.mm. On systems
    124     // where USE_PLATFORM_SYSTEM_FALLBACK_LIST is set to true, this code is used for regular (element style) lookups,
     124    // where USE(PLATFORM_SYSTEM_FALLBACK_LIST) is set to true, this code is used for regular (element style) lookups,
    125125    // and the code in FontDescriptionCocoa.cpp is used when src:local(special-cased-name) is specified inside an
    126126    // @font-face block.
     
    145145}
    146146
    147 #endif // USE_PLATFORM_SYSTEM_FALLBACK_LIST
     147#endif // USE(PLATFORM_SYSTEM_FALLBACK_LIST)
    148148
    149149static String computeSpecializedChineseLocale()
  • trunk/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp

    r247464 r247465  
    104104
    105105        auto fontForSynthesisComputation = font;
    106 #if USE_PLATFORM_SYSTEM_FALLBACK_LIST
     106#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
    107107        if (auto physicalFont = adoptCF(CTFontCopyPhysicalFont(font.get())))
    108108            fontForSynthesisComputation = physicalFont;
  • trunk/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp

    r247464 r247465  
    4646}
    4747
    48 #if USE_PLATFORM_SYSTEM_FALLBACK_LIST
     48#if USE(PLATFORM_SYSTEM_FALLBACK_LIST)
    4949
    5050RetainPtr<CTFontRef> SystemFontDatabaseCoreText::createSystemUIFont(const CascadeListParameters& parameters, CFStringRef locale)
     
    239239}
    240240
    241 #endif // USE_PLATFORM_SYSTEM_FALLBACK_LIST
     241#endif // USE(PLATFORM_SYSTEM_FALLBACK_LIST)
    242242
    243243static String genericFamily(const String& locale, HashMap<String, String>& map, CFStringRef ctKey)
Note: See TracChangeset for help on using the changeset viewer.