| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of the internal font implementation. | 2 * This file is part of the internal font implementation. |
| 3 * | 3 * |
| 4 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved. | 4 * Copyright (C) 2006, 2008, 2010 Apple Inc. All rights reserved. |
| 5 * Copyright (C) 2007-2008 Torch Mobile, Inc. | 5 * Copyright (C) 2007-2008 Torch Mobile, Inc. |
| 6 * | 6 * |
| 7 * This library is free software; you can redistribute it and/or | 7 * This library is free software; you can redistribute it and/or |
| 8 * modify it under the terms of the GNU Library General Public | 8 * modify it under the terms of the GNU Library General Public |
| 9 * License as published by the Free Software Foundation; either | 9 * License as published by the Free Software Foundation; either |
| 10 * version 2 of the License, or (at your option) any later version. | 10 * version 2 of the License, or (at your option) any later version. |
| (...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 | 224 |
| 225 ALWAYS_INLINE float SimpleFontData::widthForGlyph(Glyph glyph) const | 225 ALWAYS_INLINE float SimpleFontData::widthForGlyph(Glyph glyph) const |
| 226 { | 226 { |
| 227 if (isZeroWidthSpaceGlyph(glyph)) | 227 if (isZeroWidthSpaceGlyph(glyph)) |
| 228 return 0; | 228 return 0; |
| 229 | 229 |
| 230 float width = m_glyphToWidthMap.metricsForGlyph(glyph); | 230 float width = m_glyphToWidthMap.metricsForGlyph(glyph); |
| 231 if (width != cGlyphSizeUnknown) | 231 if (width != cGlyphSizeUnknown) |
| 232 return width; | 232 return width; |
| 233 | 233 |
| 234 width = platformWidthForGlyph(glyph); | 234 if (m_verticalData) |
| 235 width = m_verticalData->advanceHeight(this, glyph); |
| 236 else |
| 237 width = platformWidthForGlyph(glyph); |
| 235 | 238 |
| 236 m_glyphToWidthMap.setMetricsForGlyph(glyph, width); | 239 m_glyphToWidthMap.setMetricsForGlyph(glyph, width); |
| 237 return width; | 240 return width; |
| 238 } | 241 } |
| 239 | 242 |
| 240 DEFINE_FONT_DATA_TYPE_CASTS(SimpleFontData, false); | 243 DEFINE_FONT_DATA_TYPE_CASTS(SimpleFontData, false); |
| 241 | 244 |
| 242 } // namespace blink | 245 } // namespace blink |
| 243 #endif // SimpleFontData_h | 246 #endif // SimpleFontData_h |
| OLD | NEW |