OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2005, 2008 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2005, 2008 Apple Computer, Inc. All rights reserved. |
3 * Copyright (C) 2006 Alexey Proskuryakov | 3 * Copyright (C) 2006 Alexey Proskuryakov |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * | 8 * |
9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 LOG_ERROR("Font maps SPACE and ZERO WIDTH SPACE to the same glyph. G
lyph width not overridden."); | 124 LOG_ERROR("Font maps SPACE and ZERO WIDTH SPACE to the same glyph. G
lyph width not overridden."); |
125 } | 125 } |
126 | 126 |
127 m_missingGlyphData.fontData = this; | 127 m_missingGlyphData.fontData = this; |
128 m_missingGlyphData.glyph = 0; | 128 m_missingGlyphData.glyph = 0; |
129 } | 129 } |
130 #endif | 130 #endif |
131 | 131 |
132 SimpleFontData::~SimpleFontData() | 132 SimpleFontData::~SimpleFontData() |
133 { | 133 { |
| 134 #if ENABLE(SVG_FONTS) |
| 135 if (!m_svgFontData || !m_svgFontData->svgFontFaceElement()) |
| 136 #endif |
| 137 platformDestroy(); |
| 138 |
134 if (!isCustomFont()) { | 139 if (!isCustomFont()) { |
135 if (m_smallCapsFontData) | 140 if (m_smallCapsFontData) |
136 fontCache()->releaseFontData(m_smallCapsFontData); | 141 fontCache()->releaseFontData(m_smallCapsFontData); |
137 GlyphPageTreeNode::pruneTreeFontData(this); | 142 GlyphPageTreeNode::pruneTreeFontData(this); |
138 } | 143 } |
139 | |
140 #if ENABLE(SVG_FONTS) | |
141 if (!m_svgFontData || !m_svgFontData->svgFontFaceElement()) | |
142 #endif | |
143 platformDestroy(); | |
144 } | 144 } |
145 | 145 |
146 const SimpleFontData* SimpleFontData::fontDataForCharacter(UChar32) const | 146 const SimpleFontData* SimpleFontData::fontDataForCharacter(UChar32) const |
147 { | 147 { |
148 return this; | 148 return this; |
149 } | 149 } |
150 | 150 |
151 bool SimpleFontData::isSegmented() const | 151 bool SimpleFontData::isSegmented() const |
152 { | 152 { |
153 return false; | 153 return false; |
154 } | 154 } |
155 | 155 |
156 } // namespace WebCore | 156 } // namespace WebCore |
OLD | NEW |