| 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 if (!m_cachedPrimarySimpleFontData) | 95 if (!m_cachedPrimarySimpleFontData) |
| 96 m_cachedPrimarySimpleFontData = primaryFontData(fontDescription)->fo
ntDataForCharacter(' '); | 96 m_cachedPrimarySimpleFontData = primaryFontData(fontDescription)->fo
ntDataForCharacter(' '); |
| 97 return m_cachedPrimarySimpleFontData; | 97 return m_cachedPrimarySimpleFontData; |
| 98 } | 98 } |
| 99 | 99 |
| 100 PassRefPtr<FontData> getFontData(const FontDescription&, int& familyIndex) c
onst; | 100 PassRefPtr<FontData> getFontData(const FontDescription&, int& familyIndex) c
onst; |
| 101 | 101 |
| 102 const FontData* primaryFontData(const FontDescription&) const; | 102 const FontData* primaryFontData(const FontDescription&) const; |
| 103 const FontData* fontDataAt(const FontDescription&, unsigned index) const; | 103 const FontData* fontDataAt(const FontDescription&, unsigned index) const; |
| 104 | 104 |
| 105 void setPlatformFont(const FontPlatformData&); | |
| 106 | |
| 107 void releaseFontData(); | 105 void releaseFontData(); |
| 108 | 106 |
| 109 mutable Vector<RefPtr<FontData>, 1> m_fontList; | 107 mutable Vector<RefPtr<FontData>, 1> m_fontList; |
| 110 mutable GlyphPages m_pages; | 108 mutable GlyphPages m_pages; |
| 111 mutable GlyphPageTreeNode* m_pageZero; | 109 mutable GlyphPageTreeNode* m_pageZero; |
| 112 mutable const SimpleFontData* m_cachedPrimarySimpleFontData; | 110 mutable const SimpleFontData* m_cachedPrimarySimpleFontData; |
| 113 RefPtr<FontSelector> m_fontSelector; | 111 RefPtr<FontSelector> m_fontSelector; |
| 114 mutable WidthCache m_widthCache; | 112 mutable WidthCache m_widthCache; |
| 115 unsigned m_fontSelectorVersion; | 113 unsigned m_fontSelectorVersion; |
| 116 mutable int m_familyIndex; | 114 mutable int m_familyIndex; |
| 117 unsigned short m_generation; | 115 unsigned short m_generation; |
| 118 mutable unsigned m_pitch : 3; // Pitch | 116 mutable unsigned m_pitch : 3; // Pitch |
| 119 mutable bool m_loadingCustomFonts : 1; | 117 mutable bool m_loadingCustomFonts : 1; |
| 120 | 118 |
| 121 friend class Font; | 119 friend class Font; |
| 122 }; | 120 }; |
| 123 | 121 |
| 124 } | 122 } |
| 125 | 123 |
| 126 #endif | 124 #endif |
| OLD | NEW |