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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
210 } | 210 } |
211 | 211 |
212 int style = SkTypeface::kNormal; | 212 int style = SkTypeface::kNormal; |
213 if (fontDescription.weight() >= FontWeight600) | 213 if (fontDescription.weight() >= FontWeight600) |
214 style |= SkTypeface::kBold; | 214 style |= SkTypeface::kBold; |
215 if (fontDescription.style()) | 215 if (fontDescription.style()) |
216 style |= SkTypeface::kItalic; | 216 style |= SkTypeface::kItalic; |
217 | 217 |
218 #if OS(WIN) | 218 #if OS(WIN) |
219 if (s_sideloadedFonts) { | 219 if (s_sideloadedFonts) { |
220 HashMap<String, RefPtr<SkTypeface> >::iterator sideloadedFont = | 220 HashMap<String, RefPtr<SkTypeface>>::iterator sideloadedFont = |
221 s_sideloadedFonts->find(name.data()); | 221 s_sideloadedFonts->find(name.data()); |
222 if (sideloadedFont != s_sideloadedFonts->end()) | 222 if (sideloadedFont != s_sideloadedFonts->end()) |
223 return sideloadedFont->value; | 223 return sideloadedFont->value; |
224 } | 224 } |
225 | 225 |
226 if (m_fontManager) { | 226 if (m_fontManager) { |
227 return adoptRef(useDirectWrite() | 227 return adoptRef(useDirectWrite() |
228 ? m_fontManager->matchFamilyStyle(name.data(), fontStyle(fontDescrip
tion)) | 228 ? m_fontManager->matchFamilyStyle(name.data(), fontStyle(fontDescrip
tion)) |
229 : m_fontManager->legacyCreateTypeface(name.data(), style) | 229 : m_fontManager->legacyCreateTypeface(name.data(), style) |
230 ); | 230 ); |
(...skipping 18 matching lines...) Expand all Loading... |
249 fontSize, | 249 fontSize, |
250 (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDesc
ription.isSyntheticBold(), | 250 (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDesc
ription.isSyntheticBold(), |
251 (fontDescription.style() && !tf->isItalic()) || fontDescription.isSynthe
ticItalic(), | 251 (fontDescription.style() && !tf->isItalic()) || fontDescription.isSynthe
ticItalic(), |
252 fontDescription.orientation(), | 252 fontDescription.orientation(), |
253 fontDescription.useSubpixelPositioning()); | 253 fontDescription.useSubpixelPositioning()); |
254 return result; | 254 return result; |
255 } | 255 } |
256 #endif // !OS(WIN) | 256 #endif // !OS(WIN) |
257 | 257 |
258 } // namespace blink | 258 } // namespace blink |
OLD | NEW |