| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2006 Apple Computer, 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 ASSERT(FontCache::fontCache()->generation() == m_generation); | 189 ASSERT(FontCache::fontCache()->generation() == m_generation); |
| 190 RefPtr<FontData> result = getFontData(fontDescription, m_familyIndex); | 190 RefPtr<FontData> result = getFontData(fontDescription, m_familyIndex); |
| 191 if (result) { | 191 if (result) { |
| 192 m_fontList.append(result); | 192 m_fontList.append(result); |
| 193 if (result->isLoading()) | 193 if (result->isLoading()) |
| 194 m_loadingCustomFonts = true; | 194 m_loadingCustomFonts = true; |
| 195 } | 195 } |
| 196 return result.get(); | 196 return result.get(); |
| 197 } | 197 } |
| 198 | 198 |
| 199 void FontFallbackList::setPlatformFont(const FontPlatformData& platformData) | |
| 200 { | |
| 201 m_familyIndex = cAllFamiliesScanned; | |
| 202 RefPtr<FontData> fontData = FontCache::fontCache()->fontDataFromFontPlatform
Data(&platformData); | |
| 203 m_fontList.append(fontData); | |
| 204 } | 199 } |
| 205 | |
| 206 } | |
| OLD | NEW |