| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. | 2 * Copyright (c) 2006, 2007, 2008, 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #if !OS(WIN) && !OS(ANDROID) | 33 #if !OS(WIN) && !OS(ANDROID) |
| 34 #include "SkFontConfigInterface.h" | 34 #include "SkFontConfigInterface.h" |
| 35 #endif | 35 #endif |
| 36 #include "SkFontMgr.h" | 36 #include "SkFontMgr.h" |
| 37 #include "SkStream.h" | 37 #include "SkStream.h" |
| 38 #include "SkTypeface.h" | 38 #include "SkTypeface.h" |
| 39 #include "platform/NotImplemented.h" | |
| 40 #include "platform/fonts/AlternateFontFamily.h" | 39 #include "platform/fonts/AlternateFontFamily.h" |
| 41 #include "platform/fonts/FontCache.h" | 40 #include "platform/fonts/FontCache.h" |
| 42 #include "platform/fonts/FontDescription.h" | 41 #include "platform/fonts/FontDescription.h" |
| 43 #include "platform/fonts/FontFaceCreationParams.h" | 42 #include "platform/fonts/FontFaceCreationParams.h" |
| 44 #include "platform/fonts/SimpleFontData.h" | 43 #include "platform/fonts/SimpleFontData.h" |
| 45 #include "public/platform/Platform.h" | 44 #include "public/platform/Platform.h" |
| 46 #include "public/platform/linux/WebSandboxSupport.h" | 45 #include "public/platform/linux/WebSandboxSupport.h" |
| 47 #include "wtf/Assertions.h" | 46 #include "wtf/Assertions.h" |
| 48 #include "wtf/text/AtomicString.h" | 47 #include "wtf/text/AtomicString.h" |
| 49 #include "wtf/text/CString.h" | 48 #include "wtf/text/CString.h" |
| (...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 252 fontSize, | 251 fontSize, |
| 253 (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDesc
ription.isSyntheticBold(), | 252 (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDesc
ription.isSyntheticBold(), |
| 254 (fontDescription.style() && !tf->isItalic()) || fontDescription.isSynthe
ticItalic(), | 253 (fontDescription.style() && !tf->isItalic()) || fontDescription.isSynthe
ticItalic(), |
| 255 fontDescription.orientation(), | 254 fontDescription.orientation(), |
| 256 fontDescription.useSubpixelPositioning()); | 255 fontDescription.useSubpixelPositioning()); |
| 257 return result; | 256 return result; |
| 258 } | 257 } |
| 259 #endif // !OS(WIN) | 258 #endif // !OS(WIN) |
| 260 | 259 |
| 261 } // namespace blink | 260 } // namespace blink |
| OLD | NEW |