Diff
Modified: trunk/LayoutTests/ChangeLog (216277 => 216278)
--- trunk/LayoutTests/ChangeLog 2017-05-05 22:23:51 UTC (rev 216277)
+++ trunk/LayoutTests/ChangeLog 2017-05-05 22:30:03 UTC (rev 216278)
@@ -1,3 +1,16 @@
+2017-05-05 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r216275.
+
+ This change broke internal builds.
+
+ Reverted changeset:
+
+ "[Cocoa] CTFontDescriptorCreateMatchingFontDescriptor() is not
+ case insensitive"
+ https://bugs.webkit.org/show_bug.cgi?id=171636
+ http://trac.webkit.org/changeset/216275
+
2017-05-05 Myles C. Maxfield <[email protected]>
[Cocoa] CTFontDescriptorCreateMatchingFontDescriptor() is not case insensitive
Deleted: trunk/LayoutTests/fast/text/lastResort-expected.html (216277 => 216278)
--- trunk/LayoutTests/fast/text/lastResort-expected.html 2017-05-05 22:23:51 UTC (rev 216277)
+++ trunk/LayoutTests/fast/text/lastResort-expected.html 2017-05-05 22:30:03 UTC (rev 216278)
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
-This test makes sure that Last Resort is always looked up correctly.
-<div style="font-family: LastResort;">hi</div>
-</body>
-</html>
Deleted: trunk/LayoutTests/fast/text/lastResort.html (216277 => 216278)
--- trunk/LayoutTests/fast/text/lastResort.html 2017-05-05 22:23:51 UTC (rev 216277)
+++ trunk/LayoutTests/fast/text/lastResort.html 2017-05-05 22:30:03 UTC (rev 216278)
@@ -1,9 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-</head>
-<body>
-This test makes sure that Last Resort is always looked up correctly.
-<div style="font-family: lastresort;">hi</div>
-</body>
-</html>
Modified: trunk/Source/WebCore/ChangeLog (216277 => 216278)
--- trunk/Source/WebCore/ChangeLog 2017-05-05 22:23:51 UTC (rev 216277)
+++ trunk/Source/WebCore/ChangeLog 2017-05-05 22:30:03 UTC (rev 216278)
@@ -1,3 +1,16 @@
+2017-05-05 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r216275.
+
+ This change broke internal builds.
+
+ Reverted changeset:
+
+ "[Cocoa] CTFontDescriptorCreateMatchingFontDescriptor() is not
+ case insensitive"
+ https://bugs.webkit.org/show_bug.cgi?id=171636
+ http://trac.webkit.org/changeset/216275
+
2017-05-05 Myles C. Maxfield <[email protected]>
[Cocoa] CTFontDescriptorCreateMatchingFontDescriptor() is not case insensitive
Modified: trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm (216277 => 216278)
--- trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2017-05-05 22:23:51 UTC (rev 216277)
+++ trunk/Source/WebCore/platform/graphics/ios/FontCacheIOS.mm 2017-05-05 22:30:03 UTC (rev 216278)
@@ -164,17 +164,6 @@
return adoptCF(CTFontCreateWithFontDescriptor(monospaceFontDescriptor.get(), size, nullptr));
}
- if (equalLettersIgnoringASCIICase(family, "lastresort")) {
-#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
- static NeverDestroyed<RetainPtr<CTFontDescriptorRef>> lastResort = adoptCF(CTFontDescriptorCreateLastResort());
- return adoptCF(CTFontCreateWithFontDescriptor(lastResort.get().get(), size, nullptr));
-#else
- // LastResort is special, so it's important to look this exact string up, and not some case-folded version.
- // We handle this here so any caching and case folding we do in our general text codepath is bypassed.
- return adoptCF(CTFontCreateWithName(CFSTR("LastResort"), size, nullptr));
-#endif
- }
-
return nullptr;
}
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (216277 => 216278)
--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2017-05-05 22:23:51 UTC (rev 216277)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2017-05-05 22:30:03 UTC (rev 216278)
@@ -111,17 +111,6 @@
if (equalLettersIgnoringASCIICase(family, "-apple-status-bar"))
return toCTFont([NSFont labelFontOfSize:size]);
- if (equalLettersIgnoringASCIICase(family, "lastresort")) {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300
- static NeverDestroyed<RetainPtr<CTFontDescriptorRef>> lastResort = adoptCF(CTFontDescriptorCreateLastResort());
- return adoptCF(CTFontCreateWithFontDescriptor(lastResort.get().get(), size, nullptr));
-#else
- // LastResort is special, so it's important to look this exact string up, and not some case-folded version.
- // We handle this here so any caching and case folding we do in our general text codepath is bypassed.
- return adoptCF(CTFontCreateWithName(CFSTR("LastResort"), size, nullptr));
-#endif
- }
-
return nullptr;
}
Modified: trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h (216277 => 216278)
--- trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2017-05-05 22:23:51 UTC (rev 216277)
+++ trunk/Source/WebCore/platform/spi/cocoa/CoreTextSPI.h 2017-05-05 22:30:03 UTC (rev 216278)
@@ -83,7 +83,6 @@
CFBitVectorRef CTFontCopyGlyphCoverageForFeature(CTFontRef, CFDictionaryRef feature);
CTFontDescriptorRef CTFontDescriptorCreateWithAttributesAndOptions(CFDictionaryRef attributes, CTFontDescriptorOptions);
-CTFontDescriptorRef CTFontDescriptorCreateLastResort();
extern const CFStringRef kCTFontCSSWeightAttribute;
extern const CFStringRef kCTFontCSSWidthAttribute;