Title: [193805] trunk/Source/WebCore
- Revision
- 193805
- Author
- [email protected]
- Date
- 2015-12-08 19:57:08 -0800 (Tue, 08 Dec 2015)
Log Message
Remove Mavericks-specific code from FontCacheMac
https://bugs.webkit.org/show_bug.cgi?id=152030
Reviewed by Simon Fraser.
Mavericks is no longer a supported platform.
No new tests because there is no behavior change.
* platform/graphics/mac/FontCacheMac.mm:
(WebCore::platformLookupFallbackFont):
(WebCore::platformFontWithFamilySpecialCase): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (193804 => 193805)
--- trunk/Source/WebCore/ChangeLog 2015-12-09 02:30:39 UTC (rev 193804)
+++ trunk/Source/WebCore/ChangeLog 2015-12-09 03:57:08 UTC (rev 193805)
@@ -1,3 +1,18 @@
+2015-12-08 Myles C. Maxfield <[email protected]>
+
+ Remove Mavericks-specific code from FontCacheMac
+ https://bugs.webkit.org/show_bug.cgi?id=152030
+
+ Reviewed by Simon Fraser.
+
+ Mavericks is no longer a supported platform.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/mac/FontCacheMac.mm:
+ (WebCore::platformLookupFallbackFont):
+ (WebCore::platformFontWithFamilySpecialCase): Deleted.
+
2015-12-08 Brady Eidson <[email protected]>
Modern IDB: storage/indexeddb/objectstore-cursor.html fails.
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (193804 => 193805)
--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-09 02:30:39 UTC (rev 193804)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-12-09 03:57:08 UTC (rev 193805)
@@ -190,7 +190,6 @@
#endif // PLATFORM_FONT_LOOKUP
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
static CGFloat toNSFontWeight(FontWeight fontWeight)
{
static const CGFloat nsFontWeights[] = {
@@ -207,18 +206,13 @@
ASSERT(fontWeight >= 0 && fontWeight <= 8);
return nsFontWeights[fontWeight];
}
-#endif
RetainPtr<CTFontRef> platformFontWithFamilySpecialCase(const AtomicString& family, FontWeight weight, CTFontSymbolicTraits desiredTraits, float size)
{
if (equalIgnoringASCIICase(family, "-webkit-system-font")
|| equalIgnoringASCIICase(family, "-apple-system")
|| equalIgnoringASCIICase(family, "-apple-system-font")) {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
RetainPtr<CTFontRef> result = toCTFont([NSFont systemFontOfSize:size weight:toNSFontWeight(weight)]);
-#else
- RetainPtr<CTFontRef> result = toCTFont((weight >= FontWeight600) ? [NSFont boldSystemFontOfSize:size] : [NSFont systemFontOfSize:size]);
-#endif
if (desiredTraits & kCTFontItalicTrait) {
if (auto italicizedFont = adoptCF(CTFontCreateCopyWithSymbolicTraits(result.get(), size, nullptr, desiredTraits, desiredTraits)))
result = italicizedFont;
@@ -388,23 +382,7 @@
RetainPtr<CTFontRef> platformLookupFallbackFont(CTFontRef font, FontWeight, const AtomicString& locale, const UChar* characters, unsigned length)
{
RetainPtr<CFStringRef> localeString;
-#if __MAC_OS_X_VERSION_MIN_REQUIRED == 1090
- UNUSED_PARAM(locale);
- if (!font) {
- font = toCTFont([NSFont userFontOfSize:CTFontGetSize(font)]);
- bool acceptable = true;
-
- RetainPtr<CFCharacterSetRef> characterSet = adoptCF(CTFontCopyCharacterSet(font));
- for (auto character : StringView(characters, length).codePoints()) {
- if (!CFCharacterSetIsLongCharacterMember(characterSet.get(), character)) {
- acceptable = false;
- break;
- }
- }
- if (acceptable)
- return font;
- }
-#elif __MAC_OS_X_VERSION_MIN_REQUIRED > 101100
+#if __MAC_OS_X_VERSION_MIN_REQUIRED > 101100
if (!locale.isNull())
localeString = locale.string().createCFString();
#else
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
