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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
114 | 114 |
115 ASSERT(m_document); | 115 ASSERT(m_document); |
116 ASSERT(m_document->frame()); | 116 ASSERT(m_document->frame()); |
117 FontCache::fontCache()->addClient(this); | 117 FontCache::fontCache()->addClient(this); |
118 FontFaceSet::from(*document)->addFontFacesToFontFaceCache(&m_fontFaceCache,
this); | 118 FontFaceSet::from(*document)->addFontFacesToFontFaceCache(&m_fontFaceCache,
this); |
119 } | 119 } |
120 | 120 |
121 CSSFontSelector::~CSSFontSelector() | 121 CSSFontSelector::~CSSFontSelector() |
122 { | 122 { |
123 clearDocument(); | 123 clearDocument(); |
| 124 #if !ENABLE(OILPAN) |
124 FontCache::fontCache()->removeClient(this); | 125 FontCache::fontCache()->removeClient(this); |
| 126 #endif |
125 } | 127 } |
126 | 128 |
127 void CSSFontSelector::registerForInvalidationCallbacks(CSSFontSelectorClient* cl
ient) | 129 void CSSFontSelector::registerForInvalidationCallbacks(CSSFontSelectorClient* cl
ient) |
128 { | 130 { |
129 m_clients.add(client); | 131 m_clients.add(client); |
130 } | 132 } |
131 | 133 |
132 #if !ENABLE(OILPAN) | 134 #if !ENABLE(OILPAN) |
133 void CSSFontSelector::unregisterForInvalidationCallbacks(CSSFontSelectorClient*
client) | 135 void CSSFontSelector::unregisterForInvalidationCallbacks(CSSFontSelectorClient*
client) |
134 { | 136 { |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
220 { | 222 { |
221 m_fontLoader.loadPendingFonts(); | 223 m_fontLoader.loadPendingFonts(); |
222 } | 224 } |
223 | 225 |
224 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) | 226 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) |
225 { | 227 { |
226 ASSERT(document.settings()); | 228 ASSERT(document.settings()); |
227 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); | 229 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); |
228 } | 230 } |
229 | 231 |
| 232 void CSSFontSelector::trace(Visitor* visitor) |
| 233 { |
| 234 visitor->trace(m_fontFaceCache); |
| 235 visitor->trace(m_clients); |
| 236 visitor->trace(m_fontLoader); |
230 } | 237 } |
| 238 |
| 239 } |
OLD | NEW |