| 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 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 161 m_document = nullptr; | 161 m_document = nullptr; |
| 162 m_fontFaceCache.clearAll(); | 162 m_fontFaceCache.clearAll(); |
| 163 } | 163 } |
| 164 #endif | 164 #endif |
| 165 | 165 |
| 166 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) | 166 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) |
| 167 { | 167 { |
| 168 if (!document.settings()) | 168 if (!document.settings()) |
| 169 return; | 169 return; |
| 170 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); | 170 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); |
| 171 // Need to increment FontFaceCache version to update LayoutStyles. | 171 // Need to increment FontFaceCache version to update ComputedStyles. |
| 172 m_fontFaceCache.incrementVersion(); | 172 m_fontFaceCache.incrementVersion(); |
| 173 } | 173 } |
| 174 | 174 |
| 175 DEFINE_TRACE(CSSFontSelector) | 175 DEFINE_TRACE(CSSFontSelector) |
| 176 { | 176 { |
| 177 #if ENABLE(OILPAN) | 177 #if ENABLE(OILPAN) |
| 178 visitor->trace(m_document); | 178 visitor->trace(m_document); |
| 179 visitor->trace(m_fontFaceCache); | 179 visitor->trace(m_fontFaceCache); |
| 180 visitor->trace(m_clients); | 180 visitor->trace(m_clients); |
| 181 visitor->trace(m_fontLoader); | 181 visitor->trace(m_fontLoader); |
| 182 #endif | 182 #endif |
| 183 FontSelector::trace(visitor); | 183 FontSelector::trace(visitor); |
| 184 } | 184 } |
| 185 | 185 |
| 186 } | 186 } |
| OLD | NEW |