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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
66 void CSSFontSelector::unregisterForInvalidationCallbacks( | 66 void CSSFontSelector::unregisterForInvalidationCallbacks( |
67 CSSFontSelectorClient* client) { | 67 CSSFontSelectorClient* client) { |
68 m_clients.erase(client); | 68 m_clients.erase(client); |
69 } | 69 } |
70 | 70 |
71 void CSSFontSelector::dispatchInvalidationCallbacks() { | 71 void CSSFontSelector::dispatchInvalidationCallbacks() { |
72 m_fontFaceCache.incrementVersion(); | 72 m_fontFaceCache.incrementVersion(); |
73 | 73 |
74 HeapVector<Member<CSSFontSelectorClient>> clients; | 74 HeapVector<Member<CSSFontSelectorClient>> clients; |
75 copyToVector(m_clients, clients); | 75 copyToVector(m_clients, clients); |
76 for (auto& client : clients) { | 76 for (auto& client : clients) |
77 // This should not be nullptr, but to see if checking nullptr can suppress | 77 client->fontsNeedUpdate(this); |
78 // crashes. crbug.com/581698 | |
79 if (client) | |
80 client->fontsNeedUpdate(this); | |
81 } | |
82 } | 78 } |
83 | 79 |
84 void CSSFontSelector::fontFaceInvalidated() { | 80 void CSSFontSelector::fontFaceInvalidated() { |
85 dispatchInvalidationCallbacks(); | 81 dispatchInvalidationCallbacks(); |
86 } | 82 } |
87 | 83 |
88 void CSSFontSelector::fontCacheInvalidated() { | 84 void CSSFontSelector::fontCacheInvalidated() { |
89 dispatchInvalidationCallbacks(); | 85 dispatchInvalidationCallbacks(); |
90 } | 86 } |
91 | 87 |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
177 } | 173 } |
178 | 174 |
179 DEFINE_TRACE(CSSFontSelector) { | 175 DEFINE_TRACE(CSSFontSelector) { |
180 visitor->trace(m_document); | 176 visitor->trace(m_document); |
181 visitor->trace(m_fontFaceCache); | 177 visitor->trace(m_fontFaceCache); |
182 visitor->trace(m_clients); | 178 visitor->trace(m_clients); |
183 FontSelector::trace(visitor); | 179 FontSelector::trace(visitor); |
184 } | 180 } |
185 | 181 |
186 } // namespace blink | 182 } // namespace blink |
OLD | NEW |