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 |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
12 * Library General Public License for more details. | 12 * Library General Public License for more details. |
13 * | 13 * |
14 * You should have received a copy of the GNU Library General Public License | 14 * You should have received a copy of the GNU Library General Public License |
15 * along with this library; see the file COPYING.LIB. If not, write to | 15 * along with this library; see the file COPYING.LIB. If not, write to |
16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 16 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
17 * Boston, MA 02110-1301, USA. | 17 * Boston, MA 02110-1301, USA. |
18 */ | 18 */ |
19 | 19 |
20 #ifndef FontMetrics_h | 20 #ifndef FontMetrics_h |
21 #define FontMetrics_h | 21 #define FontMetrics_h |
22 | 22 |
23 #include "platform/fonts/FontBaseline.h" | 23 #include "platform/fonts/FontBaseline.h" |
24 #include "wtf/MathExtras.h" | 24 #include "wtf/MathExtras.h" |
25 | 25 |
26 namespace WebCore { | 26 namespace WebCore { |
27 | 27 |
28 const unsigned gDefaultUnitsPerEm = 1000; | 28 const unsigned gDefaultUnitsPerEm = 1000; |
29 | 29 |
30 class FontMetrics { | 30 class PLATFORM_EXPORT FontMetrics { |
abarth-chromium
2013/10/29 05:26:35
This class looks entirely inline. There's no reas
rwlbuis
2013/10/29 18:38:00
Fixed.
| |
31 public: | 31 public: |
32 FontMetrics() | 32 FontMetrics() |
33 : m_unitsPerEm(gDefaultUnitsPerEm) | 33 : m_unitsPerEm(gDefaultUnitsPerEm) |
34 , m_ascent(0) | 34 , m_ascent(0) |
35 , m_descent(0) | 35 , m_descent(0) |
36 , m_lineGap(0) | 36 , m_lineGap(0) |
37 , m_lineSpacing(0) | 37 , m_lineSpacing(0) |
38 , m_xHeight(0) | 38 , m_xHeight(0) |
39 , m_zeroWidth(0) | 39 , m_zeroWidth(0) |
40 , m_hasXHeight(false) | 40 , m_hasXHeight(false) |
(...skipping 99 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 PLATFORM_EXPORT inline float scaleEmToUnits(float x, unsigned unitsPerEm) |
abarth-chromium
2013/10/29 05:26:35
This function is inline. It's nonsense to try to
rwlbuis
2013/10/29 18:38:00
Fixed.
| |
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 |