Chromium Code Reviews| 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 void CSSFontSelector::unregisterForInvalidationCallbacks(CSSFontSelectorClient* client) | 132 void CSSFontSelector::unregisterForInvalidationCallbacks(CSSFontSelectorClient* client) |
|
haraken
2014/03/25 13:19:30
I'd add #if !ENABLE_OILPAN to this method to make
wibling-chromium
2014/03/25 13:27:17
Done.
| |
| 133 { | 133 { |
| 134 m_clients.remove(client); | 134 m_clients.remove(client); |
| 135 } | 135 } |
| 136 | 136 |
| 137 void CSSFontSelector::dispatchInvalidationCallbacks() | 137 void CSSFontSelector::dispatchInvalidationCallbacks() |
| 138 { | 138 { |
| 139 Vector<CSSFontSelectorClient*> clients; | 139 WillBeHeapVector<RawPtrWillBeMember<CSSFontSelectorClient> > clients; |
| 140 copyToVector(m_clients, clients); | 140 copyToVector(m_clients, clients); |
| 141 for (size_t i = 0; i < clients.size(); ++i) | 141 for (size_t i = 0; i < clients.size(); ++i) |
| 142 clients[i]->fontsNeedUpdate(this); | 142 clients[i]->fontsNeedUpdate(this); |
| 143 } | 143 } |
| 144 | 144 |
| 145 void CSSFontSelector::fontLoaded() | 145 void CSSFontSelector::fontLoaded() |
| 146 { | 146 { |
| 147 dispatchInvalidationCallbacks(); | 147 dispatchInvalidationCallbacks(); |
| 148 } | 148 } |
| 149 | 149 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 219 m_fontLoader.loadPendingFonts(); | 219 m_fontLoader.loadPendingFonts(); |
| 220 } | 220 } |
| 221 | 221 |
| 222 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) | 222 void CSSFontSelector::updateGenericFontFamilySettings(Document& document) |
| 223 { | 223 { |
| 224 ASSERT(document.settings()); | 224 ASSERT(document.settings()); |
| 225 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings (); | 225 m_genericFontFamilySettings = document.settings()->genericFontFamilySettings (); |
| 226 } | 226 } |
| 227 | 227 |
| 228 } | 228 } |
| OLD | NEW |