| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 | 71 |
| 72 bool isFixedPitch(const FontDescription& fontDescription) const | 72 bool isFixedPitch(const FontDescription& fontDescription) const |
| 73 { | 73 { |
| 74 if (m_pitch == UnknownPitch) | 74 if (m_pitch == UnknownPitch) |
| 75 determinePitch(fontDescription); | 75 determinePitch(fontDescription); |
| 76 return m_pitch == FixedPitch; | 76 return m_pitch == FixedPitch; |
| 77 } | 77 } |
| 78 void determinePitch(const FontDescription&) const; | 78 void determinePitch(const FontDescription&) const; |
| 79 | 79 |
| 80 bool loadingCustomFonts() const; | 80 bool loadingCustomFonts() const; |
| 81 bool shouldSkipDrawing() const; |
| 81 | 82 |
| 82 FontSelector* fontSelector() const { return m_fontSelector.get(); } | 83 FontSelector* fontSelector() const { return m_fontSelector.get(); } |
| 83 // FIXME: It should be possible to combine fontSelectorVersion and generatio
n. | 84 // FIXME: It should be possible to combine fontSelectorVersion and generatio
n. |
| 84 unsigned fontSelectorVersion() const { return m_fontSelectorVersion; } | 85 unsigned fontSelectorVersion() const { return m_fontSelectorVersion; } |
| 85 unsigned generation() const { return m_generation; } | 86 unsigned generation() const { return m_generation; } |
| 86 | 87 |
| 87 WidthCache& widthCache() const { return m_widthCache; } | 88 WidthCache& widthCache() const { return m_widthCache; } |
| 88 | 89 |
| 89 private: | 90 private: |
| 90 FontFallbackList(); | 91 FontFallbackList(); |
| (...skipping 16 matching lines...) Expand all Loading... |
| 107 mutable Vector<RefPtr<FontData>, 1> m_fontList; | 108 mutable Vector<RefPtr<FontData>, 1> m_fontList; |
| 108 mutable GlyphPages m_pages; | 109 mutable GlyphPages m_pages; |
| 109 mutable GlyphPageTreeNode* m_pageZero; | 110 mutable GlyphPageTreeNode* m_pageZero; |
| 110 mutable const SimpleFontData* m_cachedPrimarySimpleFontData; | 111 mutable const SimpleFontData* m_cachedPrimarySimpleFontData; |
| 111 RefPtr<FontSelector> m_fontSelector; | 112 RefPtr<FontSelector> m_fontSelector; |
| 112 mutable WidthCache m_widthCache; | 113 mutable WidthCache m_widthCache; |
| 113 unsigned m_fontSelectorVersion; | 114 unsigned m_fontSelectorVersion; |
| 114 mutable int m_familyIndex; | 115 mutable int m_familyIndex; |
| 115 unsigned short m_generation; | 116 unsigned short m_generation; |
| 116 mutable unsigned m_pitch : 3; // Pitch | 117 mutable unsigned m_pitch : 3; // Pitch |
| 117 mutable bool m_loadingCustomFonts : 1; | 118 mutable bool m_hasLoadingFallback : 1; |
| 118 | 119 |
| 119 friend class Font; | 120 friend class Font; |
| 120 }; | 121 }; |
| 121 | 122 |
| 122 } | 123 } |
| 123 | 124 |
| 124 #endif | 125 #endif |
| OLD | NEW |