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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 { | 122 { |
123 clearDocument(); | 123 clearDocument(); |
124 FontCache::fontCache()->removeClient(this); | 124 FontCache::fontCache()->removeClient(this); |
125 } | 125 } |
126 | 126 |
127 void CSSFontSelector::registerForInvalidationCallbacks(CSSFontSelectorClient* cl
ient) | 127 void CSSFontSelector::registerForInvalidationCallbacks(CSSFontSelectorClient* cl
ient) |
128 { | 128 { |
129 m_clients.add(client); | 129 m_clients.add(client); |
130 } | 130 } |
131 | 131 |
| 132 #if !ENABLE(OILPAN) |
132 void CSSFontSelector::unregisterForInvalidationCallbacks(CSSFontSelectorClient*
client) | 133 void CSSFontSelector::unregisterForInvalidationCallbacks(CSSFontSelectorClient*
client) |
133 { | 134 { |
134 m_clients.remove(client); | 135 m_clients.remove(client); |
135 } | 136 } |
| 137 #endif |
136 | 138 |
137 void CSSFontSelector::dispatchInvalidationCallbacks() | 139 void CSSFontSelector::dispatchInvalidationCallbacks() |
138 { | 140 { |
139 Vector<CSSFontSelectorClient*> clients; | 141 WillBeHeapVector<RawPtrWillBeMember<CSSFontSelectorClient> > clients; |
140 copyToVector(m_clients, clients); | 142 copyToVector(m_clients, clients); |
141 for (size_t i = 0; i < clients.size(); ++i) | 143 for (size_t i = 0; i < clients.size(); ++i) |
142 clients[i]->fontsNeedUpdate(this); | 144 clients[i]->fontsNeedUpdate(this); |
143 } | 145 } |
144 | 146 |
145 void CSSFontSelector::fontLoaded() | 147 void CSSFontSelector::fontLoaded() |
146 { | 148 { |
147 dispatchInvalidationCallbacks(); | 149 dispatchInvalidationCallbacks(); |
148 } | 150 } |
149 | 151 |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 m_fontLoader.loadPendingFonts(); | 221 m_fontLoader.loadPendingFonts(); |
220 } | 222 } |
221 | 223 |
222 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) | 224 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) |
223 { | 225 { |
224 ASSERT(document.settings()); | 226 ASSERT(document.settings()); |
225 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); | 227 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings
(); |
226 } | 228 } |
227 | 229 |
228 } | 230 } |
OLD | NEW |