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 "core/platform/mac/WebFontCache.h" | 31 #import "core/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 "core/platform/graphics/FontTraitsMask.h" | 36 #import "platform/fonts/FontTraitsMask.h" |
37 #import <wtf/UnusedParam.h> | 37 #import <wtf/UnusedParam.h> |
38 | 38 |
39 using namespace WebCore; | 39 using namespace WebCore; |
40 | 40 |
41 | 41 |
42 #define SYNTHESIZED_FONT_TRAITS (NSBoldFontMask | NSItalicFontMask) | 42 #define SYNTHESIZED_FONT_TRAITS (NSBoldFontMask | NSItalicFontMask) |
43 | 43 |
44 #define IMPORTANT_FONT_TRAITS (0 \ | 44 #define IMPORTANT_FONT_TRAITS (0 \ |
45 | NSCompressedFontMask \ | 45 | NSCompressedFontMask \ |
46 | NSCondensedFontMask \ | 46 | NSCondensedFontMask \ |
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 return [self internalFontWithFamily:desiredFamily traits:desiredTraits weigh
t:desiredWeight size:size]; | 285 return [self internalFontWithFamily:desiredFamily traits:desiredTraits weigh
t:desiredWeight size:size]; |
286 } | 286 } |
287 | 287 |
288 + (NSFont *)fontWithFamily:(NSString *)desiredFamily traits:(NSFontTraitMask)des
iredTraits size:(float)size | 288 + (NSFont *)fontWithFamily:(NSString *)desiredFamily traits:(NSFontTraitMask)des
iredTraits size:(float)size |
289 { | 289 { |
290 int desiredWeight = (desiredTraits & NSBoldFontMask) ? 9 : 5; | 290 int desiredWeight = (desiredTraits & NSBoldFontMask) ? 9 : 5; |
291 return [self fontWithFamily:desiredFamily traits:desiredTraits weight:desire
dWeight size:size]; | 291 return [self fontWithFamily:desiredFamily traits:desiredTraits weight:desire
dWeight size:size]; |
292 } | 292 } |
293 | 293 |
294 @end | 294 @end |
OLD | NEW |