Changeset 247585 in webkit
- Timestamp:
- Jul 18, 2019 1:23:27 PM (5 years ago)
- Location:
- branches/safari-608-branch/Source
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/safari-608-branch/Source/WTF/ChangeLog
r247584 r247585 1 2019-07-17 Kocsen Chung <kocsen_chung@apple.com> 2 3 Cherry-pick r247465. rdar://problem/53229731 4 5 New York font erroneously gets synthetic bold 6 https://bugs.webkit.org/show_bug.cgi?id=199653 7 8 Unreviewed watchOS build fix. 9 10 Source/WebCore: 11 12 * page/ProcessWarming.cpp: 13 (WebCore::ProcessWarming::prewarmGlobally): 14 * page/cocoa/MemoryReleaseCocoa.mm: 15 (WebCore::platformReleaseMemory): 16 * platform/graphics/FontCascadeDescription.cpp: 17 * platform/graphics/FontDescription.h: 18 * platform/graphics/cocoa/FontCacheCoreText.cpp: 19 (WebCore::invalidateFontCache): 20 (WebCore::lookupFallbackFont): 21 * platform/graphics/cocoa/FontDescriptionCocoa.cpp: 22 (WebCore::FontCascadeDescription::effectiveFamilyAt const): 23 * platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp: 24 (WebCore::FontFamilySpecificationCoreText::fontRanges const): 25 * platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp: 26 27 Source/WTF: 28 29 * wtf/Platform.h: 30 31 git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247465 268f45cc-cd09-0410-ab3c-d52691b4dbfc 32 33 2019-07-15 Myles C. Maxfield <mmaxfield@apple.com> 34 35 New York font erroneously gets synthetic bold 36 https://bugs.webkit.org/show_bug.cgi?id=199653 37 38 Unreviewed watchOS build fix. 39 40 * wtf/Platform.h: 41 1 42 2019-07-17 Kocsen Chung <kocsen_chung@apple.com> 2 43 -
branches/safari-608-branch/Source/WTF/wtf/Platform.h
r247574 r247585 1599 1599 #endif 1600 1600 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 1601 1605 #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) 1602 1606 #define HAVE_DESIGN_SYSTEM_UI_FONTS 1 -
branches/safari-608-branch/Source/WebCore/ChangeLog
r247582 r247585 1 2019-07-17 Kocsen Chung <kocsen_chung@apple.com> 2 3 Cherry-pick r247465. rdar://problem/53229731 4 5 New York font erroneously gets synthetic bold 6 https://bugs.webkit.org/show_bug.cgi?id=199653 7 8 Unreviewed watchOS build fix. 9 10 Source/WebCore: 11 12 * page/ProcessWarming.cpp: 13 (WebCore::ProcessWarming::prewarmGlobally): 14 * page/cocoa/MemoryReleaseCocoa.mm: 15 (WebCore::platformReleaseMemory): 16 * platform/graphics/FontCascadeDescription.cpp: 17 * platform/graphics/FontDescription.h: 18 * platform/graphics/cocoa/FontCacheCoreText.cpp: 19 (WebCore::invalidateFontCache): 20 (WebCore::lookupFallbackFont): 21 * platform/graphics/cocoa/FontDescriptionCocoa.cpp: 22 (WebCore::FontCascadeDescription::effectiveFamilyAt const): 23 * platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp: 24 (WebCore::FontFamilySpecificationCoreText::fontRanges const): 25 * platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp: 26 27 Source/WTF: 28 29 * wtf/Platform.h: 30 31 git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247465 268f45cc-cd09-0410-ab3c-d52691b4dbfc 32 33 2019-07-15 Myles C. Maxfield <mmaxfield@apple.com> 34 35 New York font erroneously gets synthetic bold 36 https://bugs.webkit.org/show_bug.cgi?id=199653 37 38 Unreviewed watchOS build fix. 39 40 * page/ProcessWarming.cpp: 41 (WebCore::ProcessWarming::prewarmGlobally): 42 * page/cocoa/MemoryReleaseCocoa.mm: 43 (WebCore::platformReleaseMemory): 44 * platform/graphics/FontCascadeDescription.cpp: 45 * platform/graphics/FontDescription.h: 46 * platform/graphics/cocoa/FontCacheCoreText.cpp: 47 (WebCore::invalidateFontCache): 48 (WebCore::lookupFallbackFont): 49 * platform/graphics/cocoa/FontDescriptionCocoa.cpp: 50 (WebCore::FontCascadeDescription::effectiveFamilyAt const): 51 * platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp: 52 (WebCore::FontFamilySpecificationCoreText::fontRanges const): 53 * platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp: 54 1 55 2019-07-17 Kocsen Chung <kocsen_chung@apple.com> 2 56 -
branches/safari-608-branch/Source/WebCore/page/ProcessWarming.cpp
r246490 r247585 73 73 commonVM(); 74 74 75 #if USE _PLATFORM_SYSTEM_FALLBACK_LIST75 #if USE(PLATFORM_SYSTEM_FALLBACK_LIST) 76 76 // Cache system UI font fallbacks. Almost every web process needs these. 77 77 // Initializing one size is sufficient to warm CoreText caches. -
branches/safari-608-branch/Source/WebCore/page/cocoa/MemoryReleaseCocoa.mm
r246892 r247585 45 45 void platformReleaseMemory(Critical) 46 46 { 47 #if USE _PLATFORM_SYSTEM_FALLBACK_LIST47 #if USE(PLATFORM_SYSTEM_FALLBACK_LIST) 48 48 SystemFontDatabaseCoreText::singleton().clear(); 49 49 #endif -
branches/safari-608-branch/Source/WebCore/platform/graphics/FontCascadeDescription.cpp
r246490 r247585 63 63 } 64 64 65 #if !USE _PLATFORM_SYSTEM_FALLBACK_LIST65 #if !USE(PLATFORM_SYSTEM_FALLBACK_LIST) 66 66 67 67 unsigned FontCascadeDescription::effectiveFamilyCount() const -
branches/safari-608-branch/Source/WebCore/platform/graphics/FontDescription.h
r247574 r247585 31 31 #include <unicode/uscript.h> 32 32 #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))35 33 36 34 namespace WebCore { -
branches/safari-608-branch/Source/WebCore/platform/graphics/cocoa/FontCacheCoreText.cpp
r247575 r247585 1237 1237 } 1238 1238 1239 #if USE _PLATFORM_SYSTEM_FALLBACK_LIST1239 #if USE(PLATFORM_SYSTEM_FALLBACK_LIST) 1240 1240 SystemFontDatabaseCoreText::singleton().clear(); 1241 1241 #endif … … 1393 1393 CFIndex coveredLength = 0; 1394 1394 RetainPtr<CTFontRef> result; 1395 #if !USE _PLATFORM_SYSTEM_FALLBACK_LIST&& (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && TARGET_OS_IOS))1395 #if !USE(PLATFORM_SYSTEM_FALLBACK_LIST) && (PLATFORM(MAC) || (PLATFORM(IOS_FAMILY) && TARGET_OS_IOS)) 1396 1396 result = adoptCF(CTFontCreatePhysicalFontForCharactersWithLanguage(font, characters, length, localeString.get(), &coveredLength)); 1397 1397 #else -
branches/safari-608-branch/Source/WebCore/platform/graphics/cocoa/FontDescriptionCocoa.cpp
r247574 r247585 33 33 namespace WebCore { 34 34 35 #if USE _PLATFORM_SYSTEM_FALLBACK_LIST35 #if USE(PLATFORM_SYSTEM_FALLBACK_LIST) 36 36 37 37 #if PLATFORM(IOS_FAMILY) … … 122 122 { 123 123 // 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_LISTis 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, 125 125 // and the code in FontDescriptionCocoa.cpp is used when src:local(special-cased-name) is specified inside an 126 126 // @font-face block. … … 145 145 } 146 146 147 #endif // USE _PLATFORM_SYSTEM_FALLBACK_LIST147 #endif // USE(PLATFORM_SYSTEM_FALLBACK_LIST) 148 148 149 149 static String computeSpecializedChineseLocale() -
branches/safari-608-branch/Source/WebCore/platform/graphics/cocoa/FontFamilySpecificationCoreText.cpp
r247102 r247585 104 104 105 105 auto fontForSynthesisComputation = font; 106 #if USE _PLATFORM_SYSTEM_FALLBACK_LIST106 #if USE(PLATFORM_SYSTEM_FALLBACK_LIST) 107 107 if (auto physicalFont = adoptCF(CTFontCopyPhysicalFont(font.get()))) 108 108 fontForSynthesisComputation = physicalFont; -
branches/safari-608-branch/Source/WebCore/platform/graphics/cocoa/SystemFontDatabaseCoreText.cpp
r247574 r247585 46 46 } 47 47 48 #if USE _PLATFORM_SYSTEM_FALLBACK_LIST48 #if USE(PLATFORM_SYSTEM_FALLBACK_LIST) 49 49 50 50 RetainPtr<CTFontRef> SystemFontDatabaseCoreText::createSystemUIFont(const CascadeListParameters& parameters, CFStringRef locale) … … 239 239 } 240 240 241 #endif // USE _PLATFORM_SYSTEM_FALLBACK_LIST241 #endif // USE(PLATFORM_SYSTEM_FALLBACK_LIST) 242 242 243 243 static String genericFamily(const String& locale, HashMap<String, String>& map, CFStringRef ctKey)
Note: See TracChangeset
for help on using the changeset viewer.