OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007, 2008, 2011 Apple Inc. All rights reserved. |
3 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 3 * (C) 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
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 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
181 } | 181 } |
182 | 182 |
183 PassRefPtr<FontData> CSSFontSelector::getFontData(const FontDescription& fontDes
cription, const AtomicString& familyName) | 183 PassRefPtr<FontData> CSSFontSelector::getFontData(const FontDescription& fontDes
cription, const AtomicString& familyName) |
184 { | 184 { |
185 if (CSSSegmentedFontFace* face = m_fontFaceCache.get(fontDescription, family
Name)) | 185 if (CSSSegmentedFontFace* face = m_fontFaceCache.get(fontDescription, family
Name)) |
186 return face->getFontData(fontDescription); | 186 return face->getFontData(fontDescription); |
187 | 187 |
188 // Try to return the correct font based off our settings, in case we were ha
nded the generic font family name. | 188 // Try to return the correct font based off our settings, in case we were ha
nded the generic font family name. |
189 AtomicString settingsFamilyName = familyNameFromSettings(m_genericFontFamily
Settings, fontDescription, familyName); | 189 AtomicString settingsFamilyName = familyNameFromSettings(m_genericFontFamily
Settings, fontDescription, familyName); |
190 if (settingsFamilyName.isEmpty()) | 190 if (settingsFamilyName.isEmpty()) |
191 return 0; | 191 return nullptr; |
192 | 192 |
193 return FontCache::fontCache()->getFontData(fontDescription, settingsFamilyNa
me); | 193 return FontCache::fontCache()->getFontData(fontDescription, settingsFamilyNa
me); |
194 } | 194 } |
195 | 195 |
196 void CSSFontSelector::willUseFontData(const FontDescription& fontDescription, co
nst AtomicString& family) | 196 void CSSFontSelector::willUseFontData(const FontDescription& fontDescription, co
nst AtomicString& family) |
197 { | 197 { |
198 CSSSegmentedFontFace* face = m_fontFaceCache.get(fontDescription, family); | 198 CSSSegmentedFontFace* face = m_fontFaceCache.get(fontDescription, family); |
199 if (face) | 199 if (face) |
200 face->willUseFontData(fontDescription); | 200 face->willUseFontData(fontDescription); |
201 } | 201 } |
(...skipping 14 matching lines...) Expand all Loading... |
216 m_fontLoader.loadPendingFonts(); | 216 m_fontLoader.loadPendingFonts(); |
217 } | 217 } |
218 | 218 |
219 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) | 219 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) |
220 { | 220 { |
221 ASSERT(document.settings()); | 221 ASSERT(document.settings()); |
222 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); | 222 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); |
223 } | 223 } |
224 | 224 |
225 } | 225 } |
OLD | NEW |