| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 #if !OS(WIN) && !OS(ANDROID) | 52 #if !OS(WIN) && !OS(ANDROID) |
| 53 static SkStream* streamForFontconfigInterfaceId(int fontconfigInterfaceId) | 53 static SkStream* streamForFontconfigInterfaceId(int fontconfigInterfaceId) |
| 54 { | 54 { |
| 55 SkAutoTUnref<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal()); | 55 SkAutoTUnref<SkFontConfigInterface> fci(SkFontConfigInterface::RefGlobal()); |
| 56 SkFontConfigInterface::FontIdentity fontIdentity; | 56 SkFontConfigInterface::FontIdentity fontIdentity; |
| 57 fontIdentity.fID = fontconfigInterfaceId; | 57 fontIdentity.fID = fontconfigInterfaceId; |
| 58 return fci->openStream(fontIdentity); | 58 return fci->openStream(fontIdentity); |
| 59 } | 59 } |
| 60 #endif | 60 #endif |
| 61 | 61 |
| 62 namespace WebCore { | 62 namespace blink { |
| 63 | 63 |
| 64 void FontCache::platformInit() | 64 void FontCache::platformInit() |
| 65 { | 65 { |
| 66 } | 66 } |
| 67 | 67 |
| 68 PassRefPtr<SimpleFontData> FontCache::fallbackOnStandardFontStyle( | 68 PassRefPtr<SimpleFontData> FontCache::fallbackOnStandardFontStyle( |
| 69 const FontDescription& fontDescription, UChar32 character) | 69 const FontDescription& fontDescription, UChar32 character) |
| 70 { | 70 { |
| 71 FontDescription substituteDescription(fontDescription); | 71 FontDescription substituteDescription(fontDescription); |
| 72 substituteDescription.setStyle(FontStyleNormal); | 72 substituteDescription.setStyle(FontStyleNormal); |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 name.data(), | 224 name.data(), |
| 225 fontSize, | 225 fontSize, |
| 226 (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDesc
ription.isSyntheticBold(), | 226 (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDesc
ription.isSyntheticBold(), |
| 227 (fontDescription.style() && !tf->isItalic()) || fontDescription.isSynthe
ticItalic(), | 227 (fontDescription.style() && !tf->isItalic()) || fontDescription.isSynthe
ticItalic(), |
| 228 fontDescription.orientation(), | 228 fontDescription.orientation(), |
| 229 fontDescription.useSubpixelPositioning()); | 229 fontDescription.useSubpixelPositioning()); |
| 230 return result; | 230 return result; |
| 231 } | 231 } |
| 232 #endif // !OS(WIN) | 232 #endif // !OS(WIN) |
| 233 | 233 |
| 234 } // namespace WebCore | 234 } // namespace blink |
| OLD | NEW |