OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 2 * Copyright (C) Research In Motion Limited 2010. 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 #include "config.h" | 20 #include "config.h" |
21 | 21 |
22 #include "core/rendering/svg/SVGTextLayoutEngineSpacing.h" | 22 #include "core/rendering/svg/SVGTextLayoutEngineSpacing.h" |
23 | 23 |
24 #include "core/platform/graphics/Font.h" | |
25 #include "core/rendering/style/SVGRenderStyle.h" | 24 #include "core/rendering/style/SVGRenderStyle.h" |
26 #include "core/svg/SVGLengthContext.h" | 25 #include "core/svg/SVGLengthContext.h" |
| 26 #include "platform/fonts/Font.h" |
27 | 27 |
28 #if ENABLE(SVG_FONTS) | 28 #if ENABLE(SVG_FONTS) |
29 #include "core/svg/SVGFontData.h" | 29 #include "core/svg/SVGFontData.h" |
30 #include "core/svg/SVGFontElement.h" | 30 #include "core/svg/SVGFontElement.h" |
31 #include "core/svg/SVGFontFaceElement.h" | 31 #include "core/svg/SVGFontFaceElement.h" |
32 #else | 32 #else |
33 #include "wtf/UnusedParam.h" | 33 #include "wtf/UnusedParam.h" |
34 #endif | 34 #endif |
35 | 35 |
36 namespace WebCore { | 36 namespace WebCore { |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 float spacing = m_font.letterSpacing() + kerning; | 103 float spacing = m_font.letterSpacing() + kerning; |
104 if (currentCharacter && lastCharacter && m_font.wordSpacing()) { | 104 if (currentCharacter && lastCharacter && m_font.wordSpacing()) { |
105 if (Font::treatAsSpace(currentCharacter) && !Font::treatAsSpace(lastChar
acter)) | 105 if (Font::treatAsSpace(currentCharacter) && !Font::treatAsSpace(lastChar
acter)) |
106 spacing += m_font.wordSpacing(); | 106 spacing += m_font.wordSpacing(); |
107 } | 107 } |
108 | 108 |
109 return spacing; | 109 return spacing; |
110 } | 110 } |
111 | 111 |
112 } | 112 } |
OLD | NEW |