| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. |
| 3 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> | 3 * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com> |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #import "config.h" | 30 #import "config.h" |
| 31 #import "platform/mac/WebFontCache.h" | 31 #import "platform/mac/WebFontCache.h" |
| 32 | 32 |
| 33 #import <AppKit/AppKit.h> | 33 #import <AppKit/AppKit.h> |
| 34 #import <Foundation/Foundation.h> | 34 #import <Foundation/Foundation.h> |
| 35 #import <math.h> | 35 #import <math.h> |
| 36 #import <wtf/UnusedParam.h> | |
| 37 | |
| 38 | 36 |
| 39 #define SYNTHESIZED_FONT_TRAITS (NSBoldFontMask | NSItalicFontMask) | 37 #define SYNTHESIZED_FONT_TRAITS (NSBoldFontMask | NSItalicFontMask) |
| 40 | 38 |
| 41 #define IMPORTANT_FONT_TRAITS (0 \ | 39 #define IMPORTANT_FONT_TRAITS (0 \ |
| 42 | NSCompressedFontMask \ | 40 | NSCompressedFontMask \ |
| 43 | NSCondensedFontMask \ | 41 | NSCondensedFontMask \ |
| 44 | NSExpandedFontMask \ | 42 | NSExpandedFontMask \ |
| 45 | NSItalicFontMask \ | 43 | NSItalicFontMask \ |
| 46 | NSNarrowFontMask \ | 44 | NSNarrowFontMask \ |
| 47 | NSPosterFontMask \ | 45 | NSPosterFontMask \ |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 228 return [self internalFontWithFamily:desiredFamily traits:desiredTraits weigh
t:desiredWeight size:size]; | 226 return [self internalFontWithFamily:desiredFamily traits:desiredTraits weigh
t:desiredWeight size:size]; |
| 229 } | 227 } |
| 230 | 228 |
| 231 + (NSFont *)fontWithFamily:(NSString *)desiredFamily traits:(NSFontTraitMask)des
iredTraits size:(float)size | 229 + (NSFont *)fontWithFamily:(NSString *)desiredFamily traits:(NSFontTraitMask)des
iredTraits size:(float)size |
| 232 { | 230 { |
| 233 int desiredWeight = (desiredTraits & NSBoldFontMask) ? 9 : 5; | 231 int desiredWeight = (desiredTraits & NSBoldFontMask) ? 9 : 5; |
| 234 return [self fontWithFamily:desiredFamily traits:desiredTraits weight:desire
dWeight size:size]; | 232 return [self fontWithFamily:desiredFamily traits:desiredTraits weight:desire
dWeight size:size]; |
| 235 } | 233 } |
| 236 | 234 |
| 237 @end | 235 @end |
| OLD | NEW |