| 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 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 | 23 |
| 24 #include "core/platform/graphics/Font.h" | 24 #include "core/platform/graphics/Font.h" |
| 25 #include "core/rendering/style/SVGRenderStyle.h" | 25 #include "core/rendering/style/SVGRenderStyle.h" |
| 26 #include "core/svg/SVGLengthContext.h" | 26 #include "core/svg/SVGLengthContext.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 { |
| 37 | 37 |
| 38 SVGTextLayoutEngineSpacing::SVGTextLayoutEngineSpacing(const Font& font) | 38 SVGTextLayoutEngineSpacing::SVGTextLayoutEngineSpacing(const Font& font) |
| 39 : m_font(font) | 39 : m_font(font) |
| 40 , m_lastCharacter(0) | 40 , m_lastCharacter(0) |
| 41 { | 41 { |
| 42 } | 42 } |
| 43 | 43 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 float spacing = m_font.letterSpacing() + kerning; | 102 float spacing = m_font.letterSpacing() + kerning; |
| 103 if (currentCharacter && lastCharacter && m_font.wordSpacing()) { | 103 if (currentCharacter && lastCharacter && m_font.wordSpacing()) { |
| 104 if (Font::treatAsSpace(currentCharacter) && !Font::treatAsSpace(lastChar
acter)) | 104 if (Font::treatAsSpace(currentCharacter) && !Font::treatAsSpace(lastChar
acter)) |
| 105 spacing += m_font.wordSpacing(); | 105 spacing += m_font.wordSpacing(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 return spacing; | 108 return spacing; |
| 109 } | 109 } |
| 110 | 110 |
| 111 } | 111 } |
| OLD | NEW |