| 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 10 matching lines...) Expand all Loading... |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #ifndef CSSFontSelector_h | 26 #ifndef CSSFontSelector_h |
| 27 #define CSSFontSelector_h | 27 #define CSSFontSelector_h |
| 28 | 28 |
| 29 #include "core/css/FontFaceCache.h" | 29 #include "core/css/FontFaceCache.h" |
| 30 #include "core/fetch/ResourcePtr.h" | 30 #include "core/fetch/ResourcePtr.h" |
| 31 #include "heap/Handle.h" |
| 31 #include "platform/Timer.h" | 32 #include "platform/Timer.h" |
| 32 #include "platform/fonts/FontSelector.h" | 33 #include "platform/fonts/FontSelector.h" |
| 33 #include "platform/fonts/GenericFontFamilySettings.h" | 34 #include "platform/fonts/GenericFontFamilySettings.h" |
| 34 #include "wtf/Forward.h" | 35 #include "wtf/Forward.h" |
| 35 #include "wtf/HashMap.h" | 36 #include "wtf/HashMap.h" |
| 36 #include "wtf/HashSet.h" | 37 #include "wtf/HashSet.h" |
| 37 | 38 |
| 38 namespace WebCore { | 39 namespace WebCore { |
| 39 | 40 |
| 40 class CSSFontFace; | 41 class CSSFontFace; |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 void loadPendingFonts(); | 97 void loadPendingFonts(); |
| 97 | 98 |
| 98 private: | 99 private: |
| 99 explicit CSSFontSelector(Document*); | 100 explicit CSSFontSelector(Document*); |
| 100 | 101 |
| 101 void dispatchInvalidationCallbacks(); | 102 void dispatchInvalidationCallbacks(); |
| 102 | 103 |
| 103 Document* m_document; | 104 Document* m_document; |
| 104 // FIXME: Move to Document or StyleEngine. | 105 // FIXME: Move to Document or StyleEngine. |
| 105 FontFaceCache m_fontFaceCache; | 106 FontFaceCache m_fontFaceCache; |
| 106 HashSet<CSSFontSelectorClient*> m_clients; | 107 WillBePersistentHeapHashSet<RawPtrWillBeWeakMember<CSSFontSelectorClient> >
m_clients; |
| 107 | 108 |
| 108 FontLoader m_fontLoader; | 109 FontLoader m_fontLoader; |
| 109 GenericFontFamilySettings m_genericFontFamilySettings; | 110 GenericFontFamilySettings m_genericFontFamilySettings; |
| 110 }; | 111 }; |
| 111 | 112 |
| 112 } // namespace WebCore | 113 } // namespace WebCore |
| 113 | 114 |
| 114 #endif // CSSFontSelector_h | 115 #endif // CSSFontSelector_h |
| OLD | NEW |