| 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 14 matching lines...) Expand all Loading... |
| 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 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 "platform/fonts/mac/FontFamilyMatcherMac.h" | 30 #import "platform/fonts/mac/FontFamilyMatcherMac.h" |
| 31 | 31 |
| 32 #import <AppKit/AppKit.h> | 32 #import <AppKit/AppKit.h> |
| 33 #import <Foundation/Foundation.h> | 33 #import <Foundation/Foundation.h> |
| 34 #import <math.h> | 34 #import <math.h> |
| 35 #include "platform/LayoutTestSupport.h" |
| 35 #include "platform/fonts/FontCache.h" | 36 #include "platform/fonts/FontCache.h" |
| 36 #include "platform/fonts/FontTraits.h" | 37 #include "platform/fonts/FontTraits.h" |
| 37 #include "platform/LayoutTestSupport.h" | |
| 38 #include "platform/mac/VersionUtilMac.h" | 38 #include "platform/mac/VersionUtilMac.h" |
| 39 #import "wtf/HashSet.h" | 39 #import "wtf/HashSet.h" |
| 40 #import "wtf/text/AtomicStringHash.h" | 40 #import "wtf/text/AtomicStringHash.h" |
| 41 | 41 |
| 42 @interface NSFont (YosemiteAdditions) | 42 @interface NSFont (YosemiteAdditions) |
| 43 + (NSFont*)systemFontOfSize:(CGFloat)size weight:(CGFloat)weight; | 43 + (NSFont*)systemFontOfSize:(CGFloat)size weight:(CGFloat)weight; |
| 44 @end | 44 @end |
| 45 | 45 |
| 46 namespace { | 46 namespace { |
| 47 | 47 |
| (...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 305 6, // FontWeight500 | 305 6, // FontWeight500 |
| 306 8, // FontWeight600 | 306 8, // FontWeight600 |
| 307 9, // FontWeight700 | 307 9, // FontWeight700 |
| 308 10, // FontWeight800 | 308 10, // FontWeight800 |
| 309 12, // FontWeight900 | 309 12, // FontWeight900 |
| 310 }; | 310 }; |
| 311 return appKitFontWeights[fontWeight]; | 311 return appKitFontWeights[fontWeight]; |
| 312 } | 312 } |
| 313 | 313 |
| 314 } // namespace blink | 314 } // namespace blink |
| OLD | NEW |