| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. | 2 * Copyright (C) Research In Motion Limited 2010-2011. 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 float m_ascent; | 140 float m_ascent; |
| 141 float m_descent; | 141 float m_descent; |
| 142 float m_lineGap; | 142 float m_lineGap; |
| 143 float m_lineSpacing; | 143 float m_lineSpacing; |
| 144 float m_xHeight; | 144 float m_xHeight; |
| 145 float m_zeroWidth; | 145 float m_zeroWidth; |
| 146 bool m_hasXHeight; | 146 bool m_hasXHeight; |
| 147 bool m_hasZeroWidth; | 147 bool m_hasZeroWidth; |
| 148 }; | 148 }; |
| 149 | 149 |
| 150 static inline float scaleEmToUnits(float x, unsigned unitsPerEm) | 150 inline float scaleEmToUnits(float x, unsigned unitsPerEm) |
| 151 { | 151 { |
| 152 return unitsPerEm ? x / unitsPerEm : x; | 152 return unitsPerEm ? x / unitsPerEm : x; |
| 153 } | 153 } |
| 154 | 154 |
| 155 } // namespace WebCore | 155 } // namespace WebCore |
| 156 | 156 |
| 157 #endif // FontMetrics_h | 157 #endif // FontMetrics_h |
| OLD | NEW |