| 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 m_document = nullptr; | 169 m_document = nullptr; |
| 170 m_fontFaceCache.clearAll(); | 170 m_fontFaceCache.clearAll(); |
| 171 } | 171 } |
| 172 #endif | 172 #endif |
| 173 | 173 |
| 174 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) | 174 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) |
| 175 { | 175 { |
| 176 if (!document.settings()) | 176 if (!document.settings()) |
| 177 return; | 177 return; |
| 178 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); | 178 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); |
| 179 // Need to increment FontFaceCache version to update ComputedStyles. | 179 fontCacheInvalidated(); |
| 180 m_fontFaceCache.incrementVersion(); | |
| 181 } | 180 } |
| 182 | 181 |
| 183 DEFINE_TRACE(CSSFontSelector) | 182 DEFINE_TRACE(CSSFontSelector) |
| 184 { | 183 { |
| 185 #if ENABLE(OILPAN) | 184 #if ENABLE(OILPAN) |
| 186 visitor->trace(m_document); | 185 visitor->trace(m_document); |
| 187 visitor->trace(m_fontFaceCache); | 186 visitor->trace(m_fontFaceCache); |
| 188 visitor->trace(m_clients); | 187 visitor->trace(m_clients); |
| 189 visitor->trace(m_fontLoader); | 188 visitor->trace(m_fontLoader); |
| 190 #endif | 189 #endif |
| 191 FontSelector::trace(visitor); | 190 FontSelector::trace(visitor); |
| 192 } | 191 } |
| 193 | 192 |
| 194 } // namespace blink | 193 } // namespace blink |
| OLD | NEW |