| 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/CSSSegmentedFontFaceCache.h" | 29 #include "core/css/CSSSegmentedFontFaceCache.h" |
| 30 #include "core/fetch/ResourcePtr.h" | 30 #include "core/fetch/ResourcePtr.h" |
| 31 #include "core/platform/graphics/FontSelector.h" | |
| 32 #include "platform/Timer.h" | 31 #include "platform/Timer.h" |
| 32 #include "platform/fonts/FontSelector.h" |
| 33 #include "wtf/Forward.h" | 33 #include "wtf/Forward.h" |
| 34 #include "wtf/HashMap.h" | 34 #include "wtf/HashMap.h" |
| 35 #include "wtf/HashSet.h" | 35 #include "wtf/HashSet.h" |
| 36 | 36 |
| 37 namespace WebCore { | 37 namespace WebCore { |
| 38 | 38 |
| 39 class CSSFontFace; | 39 class CSSFontFace; |
| 40 class CSSFontFaceRule; | 40 class CSSFontFaceRule; |
| 41 class CSSSegmentedFontFace; | 41 class CSSSegmentedFontFace; |
| 42 class FontResource; | 42 class FontResource; |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 // FIXME: Move to Document or StyleEngine. | 97 // FIXME: Move to Document or StyleEngine. |
| 98 CSSSegmentedFontFaceCache m_cssSegmentedFontFaceCache; | 98 CSSSegmentedFontFaceCache m_cssSegmentedFontFaceCache; |
| 99 HashSet<FontSelectorClient*> m_clients; | 99 HashSet<FontSelectorClient*> m_clients; |
| 100 | 100 |
| 101 FontLoader m_fontLoader; | 101 FontLoader m_fontLoader; |
| 102 }; | 102 }; |
| 103 | 103 |
| 104 } // namespace WebCore | 104 } // namespace WebCore |
| 105 | 105 |
| 106 #endif // CSSFontSelector_h | 106 #endif // CSSFontSelector_h |
| OLD | NEW |