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 22 matching lines...) Expand all Loading... |
33 #include "platform/fonts/FontCache.h" | 33 #include "platform/fonts/FontCache.h" |
34 #include "platform/fonts/FontDescription.h" | 34 #include "platform/fonts/FontDescription.h" |
35 #include "platform/fonts/FontFamily.h" | 35 #include "platform/fonts/FontFamily.h" |
36 #include "platform/fonts/SegmentedFontData.h" | 36 #include "platform/fonts/SegmentedFontData.h" |
37 | 37 |
38 namespace WebCore { | 38 namespace WebCore { |
39 | 39 |
40 FontFallbackList::FontFallbackList() | 40 FontFallbackList::FontFallbackList() |
41 : m_pageZero(0) | 41 : m_pageZero(0) |
42 , m_cachedPrimarySimpleFontData(0) | 42 , m_cachedPrimarySimpleFontData(0) |
43 , m_fontSelector(0) | 43 , m_fontSelector(nullptr) |
44 , m_fontSelectorVersion(0) | 44 , m_fontSelectorVersion(0) |
45 , m_familyIndex(0) | 45 , m_familyIndex(0) |
46 , m_generation(FontCache::fontCache()->generation()) | 46 , m_generation(FontCache::fontCache()->generation()) |
47 , m_pitch(UnknownPitch) | 47 , m_pitch(UnknownPitch) |
48 , m_loadingCustomFonts(false) | 48 , m_loadingCustomFonts(false) |
49 { | 49 { |
50 } | 50 } |
51 | 51 |
52 void FontFallbackList::invalidate(PassRefPtr<FontSelector> fontSelector) | 52 void FontFallbackList::invalidate(PassRefPtr<FontSelector> fontSelector) |
53 { | 53 { |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 RefPtr<FontData> result = getFontData(fontDescription, m_familyIndex); | 196 RefPtr<FontData> result = getFontData(fontDescription, m_familyIndex); |
197 if (result) { | 197 if (result) { |
198 m_fontList.append(result); | 198 m_fontList.append(result); |
199 if (result->isLoading()) | 199 if (result->isLoading()) |
200 m_loadingCustomFonts = true; | 200 m_loadingCustomFonts = true; |
201 } | 201 } |
202 return result.get(); | 202 return result.get(); |
203 } | 203 } |
204 | 204 |
205 } | 205 } |
OLD | NEW |