| 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 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 FontLoader* fontLoader() { return m_fontLoader.get(); } | 75 FontLoader* fontLoader() { return m_fontLoader.get(); } |
| 76 | 76 |
| 77 const GenericFontFamilySettings& genericFontFamilySettings() const { return
m_genericFontFamilySettings; } | 77 const GenericFontFamilySettings& genericFontFamilySettings() const { return
m_genericFontFamilySettings; } |
| 78 void updateGenericFontFamilySettings(Document&); | 78 void updateGenericFontFamilySettings(Document&); |
| 79 | 79 |
| 80 DECLARE_VIRTUAL_TRACE(); | 80 DECLARE_VIRTUAL_TRACE(); |
| 81 | 81 |
| 82 protected: | 82 protected: |
| 83 explicit CSSFontSelector(Document*); | 83 explicit CSSFontSelector(Document*); |
| 84 | 84 |
| 85 private: | |
| 86 | |
| 87 void dispatchInvalidationCallbacks(); | 85 void dispatchInvalidationCallbacks(); |
| 88 | 86 |
| 87 private: |
| 89 // FIXME: Oilpan: Ideally this should just be a traced Member but that will | 88 // FIXME: Oilpan: Ideally this should just be a traced Member but that will |
| 90 // currently leak because ComputedStyle and its data are not on the heap. | 89 // currently leak because ComputedStyle and its data are not on the heap. |
| 91 // See crbug.com/383860 for details. | 90 // See crbug.com/383860 for details. |
| 92 RawPtrWillBeWeakMember<Document> m_document; | 91 RawPtrWillBeWeakMember<Document> m_document; |
| 93 // FIXME: Move to Document or StyleEngine. | 92 // FIXME: Move to Document or StyleEngine. |
| 94 FontFaceCache m_fontFaceCache; | 93 FontFaceCache m_fontFaceCache; |
| 95 WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient>> m_clients; | 94 WillBeHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient>> m_clients; |
| 96 | 95 |
| 97 RefPtrWillBeMember<FontLoader> m_fontLoader; | 96 RefPtrWillBeMember<FontLoader> m_fontLoader; |
| 98 GenericFontFamilySettings m_genericFontFamilySettings; | 97 GenericFontFamilySettings m_genericFontFamilySettings; |
| 99 }; | 98 }; |
| 100 | 99 |
| 101 } // namespace blink | 100 } // namespace blink |
| 102 | 101 |
| 103 #endif // CSSFontSelector_h | 102 #endif // CSSFontSelector_h |
| OLD | NEW |