| 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 17 matching lines...) Expand all Loading... |
| 28 | 28 |
| 29 #include "platform/fonts/FontFallbackList.h" | 29 #include "platform/fonts/FontFallbackList.h" |
| 30 | 30 |
| 31 #include "platform/FontFamilyNames.h" | 31 #include "platform/FontFamilyNames.h" |
| 32 #include "platform/fonts/AlternateFontFamily.h" | 32 #include "platform/fonts/AlternateFontFamily.h" |
| 33 #include "platform/fonts/FontCache.h" | 33 #include "platform/fonts/FontCache.h" |
| 34 #include "platform/fonts/FontCacheKey.h" | 34 #include "platform/fonts/FontCacheKey.h" |
| 35 #include "platform/fonts/FontDescription.h" | 35 #include "platform/fonts/FontDescription.h" |
| 36 #include "platform/fonts/FontFamily.h" | 36 #include "platform/fonts/FontFamily.h" |
| 37 #include "platform/fonts/SegmentedFontData.h" | 37 #include "platform/fonts/SegmentedFontData.h" |
| 38 #include "wtf/text/CharacterNames.h" | 38 #include "platform/wtf/text/CharacterNames.h" |
| 39 | 39 |
| 40 namespace blink { | 40 namespace blink { |
| 41 | 41 |
| 42 FontFallbackList::FontFallbackList() | 42 FontFallbackList::FontFallbackList() |
| 43 : m_cachedPrimarySimpleFontData(0), | 43 : m_cachedPrimarySimpleFontData(0), |
| 44 m_fontSelector(nullptr), | 44 m_fontSelector(nullptr), |
| 45 m_fontSelectorVersion(0), | 45 m_fontSelectorVersion(0), |
| 46 m_familyIndex(0), | 46 m_familyIndex(0), |
| 47 m_generation(FontCache::fontCache()->generation()), | 47 m_generation(FontCache::fontCache()->generation()), |
| 48 m_hasLoadingFallback(false) {} | 48 m_hasLoadingFallback(false) {} |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 241 } | 241 } |
| 242 | 242 |
| 243 bool FontFallbackList::isValid() const { | 243 bool FontFallbackList::isValid() const { |
| 244 if (!m_fontSelector) | 244 if (!m_fontSelector) |
| 245 return m_fontSelectorVersion == 0; | 245 return m_fontSelectorVersion == 0; |
| 246 | 246 |
| 247 return m_fontSelector->version() == m_fontSelectorVersion; | 247 return m_fontSelector->version() == m_fontSelectorVersion; |
| 248 } | 248 } |
| 249 | 249 |
| 250 } // namespace blink | 250 } // namespace blink |
| OLD | NEW |