| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 | 51 |
| 52 void FontFallbackList::invalidate(PassRefPtrWillBeRawPtr<FontSelector> fontSelec
tor) | 52 void FontFallbackList::invalidate(PassRefPtrWillBeRawPtr<FontSelector> fontSelec
tor) |
| 53 { | 53 { |
| 54 releaseFontData(); | 54 releaseFontData(); |
| 55 m_fontList.clear(); | 55 m_fontList.clear(); |
| 56 m_pageZero = 0; | 56 m_pageZero = 0; |
| 57 m_pages.clear(); | 57 m_pages.clear(); |
| 58 m_cachedPrimarySimpleFontData = 0; | 58 m_cachedPrimarySimpleFontData = 0; |
| 59 m_familyIndex = 0; | 59 m_familyIndex = 0; |
| 60 m_hasLoadingFallback = false; | 60 m_hasLoadingFallback = false; |
| 61 m_fontSelector = fontSelector; | 61 if (m_fontSelector != fontSelector) |
| 62 m_fontSelector = fontSelector; |
| 62 m_fontSelectorVersion = m_fontSelector ? m_fontSelector->version() : 0; | 63 m_fontSelectorVersion = m_fontSelector ? m_fontSelector->version() : 0; |
| 63 m_generation = FontCache::fontCache()->generation(); | 64 m_generation = FontCache::fontCache()->generation(); |
| 64 m_cachingWordShaper.clear(); | 65 m_cachingWordShaper.clear(); |
| 65 } | 66 } |
| 66 | 67 |
| 67 void FontFallbackList::releaseFontData() | 68 void FontFallbackList::releaseFontData() |
| 68 { | 69 { |
| 69 unsigned numFonts = m_fontList.size(); | 70 unsigned numFonts = m_fontList.size(); |
| 70 for (unsigned i = 0; i < numFonts; ++i) { | 71 for (unsigned i = 0; i < numFonts; ++i) { |
| 71 if (!m_fontList[i]->isCustomFont()) { | 72 if (!m_fontList[i]->isCustomFont()) { |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 | 217 |
| 217 bool FontFallbackList::isValid() const | 218 bool FontFallbackList::isValid() const |
| 218 { | 219 { |
| 219 if (!m_fontSelector) | 220 if (!m_fontSelector) |
| 220 return m_fontSelectorVersion == 0; | 221 return m_fontSelectorVersion == 0; |
| 221 | 222 |
| 222 return m_fontSelector->version() == m_fontSelectorVersion; | 223 return m_fontSelector->version() == m_fontSelectorVersion; |
| 223 } | 224 } |
| 224 | 225 |
| 225 } // namespace blink | 226 } // namespace blink |
| OLD | NEW |