| 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 23 matching lines...) Expand all Loading... |
| 34 #include "platform/RuntimeEnabledFeatures.h" | 34 #include "platform/RuntimeEnabledFeatures.h" |
| 35 #include "platform/fonts/FontDescription.h" | 35 #include "platform/fonts/FontDescription.h" |
| 36 #include "platform/fonts/FontFaceCreationParams.h" | 36 #include "platform/fonts/FontFaceCreationParams.h" |
| 37 #include "platform/fonts/FontPlatformData.h" | 37 #include "platform/fonts/FontPlatformData.h" |
| 38 #include "platform/fonts/SimpleFontData.h" | 38 #include "platform/fonts/SimpleFontData.h" |
| 39 #include "platform/fonts/mac/FontFamilyMatcherMac.h" | 39 #include "platform/fonts/mac/FontFamilyMatcherMac.h" |
| 40 #include "public/platform/Platform.h" | 40 #include "public/platform/Platform.h" |
| 41 #include "public/platform/WebTaskRunner.h" | 41 #include "public/platform/WebTaskRunner.h" |
| 42 #include "public/platform/WebTraceLocation.h" | 42 #include "public/platform/WebTraceLocation.h" |
| 43 #include "wtf/Functional.h" | 43 #include "wtf/Functional.h" |
| 44 #include "wtf/MainThread.h" | |
| 45 #include "wtf/StdLibExtras.h" | 44 #include "wtf/StdLibExtras.h" |
| 46 | 45 |
| 47 // Forward declare Mac SPIs. | 46 // Forward declare Mac SPIs. |
| 48 // Request for public API: rdar://13803570 | 47 // Request for public API: rdar://13803570 |
| 49 @interface NSFont (WebKitSPI) | 48 @interface NSFont (WebKitSPI) |
| 50 + (NSFont*)findFontLike:(NSFont*)font forString:(NSString*)string withRange:(NSR
ange)range inLanguage:(id)useNil; | 49 + (NSFont*)findFontLike:(NSFont*)font forString:(NSString*)string withRange:(NSR
ange)range inLanguage:(id)useNil; |
| 51 + (NSFont*)findFontLike:(NSFont*)font forCharacter:(UniChar)uc inLanguage:(id)us
eNil; | 50 + (NSFont*)findFontLike:(NSFont*)font forCharacter:(UniChar)uc inLanguage:(id)us
eNil; |
| 52 @end | 51 @end |
| 53 | 52 |
| 54 namespace blink { | 53 namespace blink { |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 234 // When loading fails, we do not want to use the returned FontPlatformData s
ince it will not have | 233 // When loading fails, we do not want to use the returned FontPlatformData s
ince it will not have |
| 235 // a valid SkTypeface. | 234 // a valid SkTypeface. |
| 236 OwnPtr<FontPlatformData> platformData = adoptPtr(new FontPlatformData(platfo
rmFont, size, syntheticBold, syntheticItalic, fontDescription.orientation())); | 235 OwnPtr<FontPlatformData> platformData = adoptPtr(new FontPlatformData(platfo
rmFont, size, syntheticBold, syntheticItalic, fontDescription.orientation())); |
| 237 if (!platformData->typeface()) { | 236 if (!platformData->typeface()) { |
| 238 return nullptr; | 237 return nullptr; |
| 239 } | 238 } |
| 240 return platformData.release(); | 239 return platformData.release(); |
| 241 } | 240 } |
| 242 | 241 |
| 243 } // namespace blink | 242 } // namespace blink |
| OLD | NEW |