Modified: trunk/LayoutTests/platform/mac/fast/text/systemFont-expected.txt (183982 => 183983)
--- trunk/LayoutTests/platform/mac/fast/text/systemFont-expected.txt 2015-05-08 06:30:23 UTC (rev 183982)
+++ trunk/LayoutTests/platform/mac/fast/text/systemFont-expected.txt 2015-05-08 06:32:26 UTC (rev 183983)
@@ -1,8 +1,8 @@
-layer at (0,0) size 785x2198
+layer at (0,0) size 785x2036
RenderView at (0,0) size 785x600
-layer at (0,0) size 785x2198
- RenderBlock {HTML} at (0,0) size 785x2198
- RenderBody {BODY} at (8,8) size 769x2182
+layer at (0,0) size 785x2036
+ RenderBlock {HTML} at (0,0) size 785x2036
+ RenderBody {BODY} at (8,8) size 769x2020
RenderBlock {DIV} at (0,0) size 769x897
RenderBlock {DIV} at (0,0) size 769x28
RenderText {#text} at (0,0) size 438x28
@@ -78,35 +78,7 @@
RenderText {#text} at (0,0) size 756x170
text run at (0,0) width 756: "This is a test for -apple-"
text run at (0,85) width 373: "system font"
- RenderBlock {DIV} at (0,1738) size 769x162
- RenderBlock {DIV} at (0,0) size 769x18
- RenderText {#text} at (0,0) size 302x18
- text run at (0,0) width 302: "This is a font weight test for -apple-system font"
- RenderBlock {DIV} at (0,18) size 769x18
- RenderText {#text} at (0,0) size 316x18
- text run at (0,0) width 316: "This is a font weight test for -apple-system font"
- RenderBlock {DIV} at (0,36) size 769x18
- RenderText {#text} at (0,0) size 335x18
- text run at (0,0) width 335: "This is a font weight test for -apple-system font"
- RenderBlock {DIV} at (0,54) size 769x18
- RenderText {#text} at (0,0) size 350x18
- text run at (0,0) width 350: "This is a font weight test for -apple-system font"
- RenderBlock {DIV} at (0,72) size 769x18
- RenderText {#text} at (0,0) size 362x18
- text run at (0,0) width 362: "This is a font weight test for -apple-system font"
- RenderBlock {DIV} at (0,90) size 769x18
- RenderText {#text} at (0,0) size 374x18
- text run at (0,0) width 374: "This is a font weight test for -apple-system font"
- RenderBlock {DIV} at (0,108) size 769x18
- RenderText {#text} at (0,0) size 374x18
- text run at (0,0) width 374: "This is a font weight test for -apple-system font"
- RenderBlock {DIV} at (0,126) size 769x18
- RenderText {#text} at (0,0) size 396x18
- text run at (0,0) width 396: "This is a font weight test for -apple-system font"
- RenderBlock {DIV} at (0,144) size 769x18
- RenderText {#text} at (0,0) size 396x18
- text run at (0,0) width 396: "This is a font weight test for -apple-system font"
- RenderBlock {DIV} at (0,1900) size 769x282
+ RenderBlock {DIV} at (0,1738) size 769x282
RenderBlock {DIV} at (0,0) size 769x56
RenderText {#text} at (0,0) size 644x56
text run at (0,0) width 644: "This is a test for -apple-system-monospaced-numbers font -"
Modified: trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm (183982 => 183983)
--- trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-05-08 06:30:23 UTC (rev 183982)
+++ trunk/Source/WebCore/platform/graphics/mac/FontCacheMac.mm 2015-05-08 06:32:26 UTC (rev 183983)
@@ -203,24 +203,6 @@
return appKitFontWeights[fontWeight];
}
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-static CGFloat toNSFontWeight(FontWeight fontWeight)
-{
- static CGFloat nsFontWeights[] = {
- NSFontWeightUltraLight, // Values between ultra-light and thin are swapped.
- NSFontWeightThin,
- NSFontWeightLight,
- NSFontWeightRegular,
- NSFontWeightMedium,
- NSFontWeightSemibold,
- NSFontWeightBold,
- NSFontWeightHeavy,
- NSFontWeightBlack
- };
- return nsFontWeights[fontWeight];
-}
-#endif
-
// Family name is somewhat of a misnomer here. We first attempt to find an exact match
// comparing the desiredFamily to the PostScript name of the installed fonts. If that fails
// we then do a search based on the family names of the installed fonts.
@@ -228,11 +210,7 @@
{
if (equalIgnoringASCIICase(family.string(), String(@"-webkit-system-font")) || equalIgnoringASCIICase(family.string(), String(@"-apple-system")) || equalIgnoringASCIICase(family.string(), String(@"-apple-system-font"))) {
// We ignore italic for system font.
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
- return [NSFont systemFontOfSize:size weight:toNSFontWeight(weight)];
-#else
return (weight >= FontWeight600) ? [NSFont boldSystemFontOfSize:size] : [NSFont systemFontOfSize:size];
-#endif
}
if (equalIgnoringASCIICase(family.string(), String(@"-apple-system-monospaced-numbers"))) {
Modified: trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h (183982 => 183983)
--- trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h 2015-05-08 06:30:23 UTC (rev 183982)
+++ trunk/Source/WebCore/platform/spi/mac/NSFontSPI.h 2015-05-08 06:32:26 UTC (rev 183983)
@@ -25,7 +25,6 @@
#if USE(APPLE_INTERNAL_SDK)
-#import <AppKit/NSFontDescriptor_Private.h>
#import <AppKit/NSFont_Private.h>
#else
@@ -33,20 +32,6 @@
@interface NSFont (Private)
+ (NSFont *)findFontLike:(NSFont *)aFont forCharacter:(UInt32)c inLanguage:(id) language;
+ (NSFont *)findFontLike:(NSFont *)aFont forString:(NSString *)string withRange:(NSRange)range inLanguage:(id) language;
-
-+ (NSFont *)systemFontOfSize:(CGFloat)size weight:(CGFloat)weight;
@end
-#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
-extern const CGFloat NSFontWeightUltraLight;
-extern const CGFloat NSFontWeightThin;
-extern const CGFloat NSFontWeightLight;
-extern const CGFloat NSFontWeightRegular;
-extern const CGFloat NSFontWeightMedium;
-extern const CGFloat NSFontWeightSemibold;
-extern const CGFloat NSFontWeightBold;
-extern const CGFloat NSFontWeightHeavy;
-extern const CGFloat NSFontWeightBlack;
#endif
-
-#endif
