| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2006, 2010 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
| 5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
| 6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
| 7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
| 8 * | 8 * |
| 9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
| 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 GlyphPages& m_pages; | 59 GlyphPages& m_pages; |
| 60 GlyphPageTreeNodeBase* m_pageZero; | 60 GlyphPageTreeNodeBase* m_pageZero; |
| 61 }; | 61 }; |
| 62 | 62 |
| 63 static PassRefPtr<FontFallbackList> create() { return adoptRef(new FontFallb
ackList()); } | 63 static PassRefPtr<FontFallbackList> create() { return adoptRef(new FontFallb
ackList()); } |
| 64 | 64 |
| 65 ~FontFallbackList() { releaseFontData(); } | 65 ~FontFallbackList() { releaseFontData(); } |
| 66 bool isValid() const; | 66 bool isValid() const; |
| 67 void invalidate(PassRefPtrWillBeRawPtr<FontSelector>); | 67 void invalidate(PassRefPtrWillBeRawPtr<FontSelector>); |
| 68 | 68 |
| 69 bool hasCustomFont() const { return m_hasCustomFont; } |
| 69 bool loadingCustomFonts() const; | 70 bool loadingCustomFonts() const; |
| 70 bool shouldSkipDrawing() const; | 71 bool shouldSkipDrawing() const; |
| 71 | 72 |
| 72 FontSelector* fontSelector() const { return m_fontSelector.get(); } | 73 FontSelector* fontSelector() const { return m_fontSelector.get(); } |
| 73 // FIXME: It should be possible to combine fontSelectorVersion and generatio
n. | 74 // FIXME: It should be possible to combine fontSelectorVersion and generatio
n. |
| 74 unsigned fontSelectorVersion() const { return m_fontSelectorVersion; } | 75 unsigned fontSelectorVersion() const { return m_fontSelectorVersion; } |
| 75 unsigned generation() const { return m_generation; } | 76 unsigned generation() const { return m_generation; } |
| 76 | 77 |
| 77 CachingWordShaper& cachingWordShaper() const { return m_cachingWordShaper; } | 78 CachingWordShaper& cachingWordShaper() const { return m_cachingWordShaper; } |
| 78 | 79 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 mutable Vector<RefPtr<FontData>, 1> m_fontList; | 113 mutable Vector<RefPtr<FontData>, 1> m_fontList; |
| 113 GlyphPages m_pages; | 114 GlyphPages m_pages; |
| 114 GlyphPageTreeNodeBase* m_pageZero; | 115 GlyphPageTreeNodeBase* m_pageZero; |
| 115 mutable const SimpleFontData* m_cachedPrimarySimpleFontData; | 116 mutable const SimpleFontData* m_cachedPrimarySimpleFontData; |
| 116 RefPtrWillBePersistent<FontSelector> m_fontSelector; | 117 RefPtrWillBePersistent<FontSelector> m_fontSelector; |
| 117 mutable CachingWordShaper m_cachingWordShaper; | 118 mutable CachingWordShaper m_cachingWordShaper; |
| 118 unsigned m_fontSelectorVersion; | 119 unsigned m_fontSelectorVersion; |
| 119 mutable int m_familyIndex; | 120 mutable int m_familyIndex; |
| 120 unsigned short m_generation; | 121 unsigned short m_generation; |
| 121 mutable bool m_hasLoadingFallback : 1; | 122 mutable bool m_hasLoadingFallback : 1; |
| 123 mutable bool m_hasCustomFont : 1; |
| 122 }; | 124 }; |
| 123 | 125 |
| 124 } // namespace blink | 126 } // namespace blink |
| 125 | 127 |
| 126 #endif | 128 #endif |
| OLD | NEW |