| 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 19 matching lines...) Expand all Loading... |
| 30 , m_effectiveZoom(effectiveZoom) | 30 , m_effectiveZoom(effectiveZoom) |
| 31 { | 31 { |
| 32 ASSERT(m_effectiveZoom); | 32 ASSERT(m_effectiveZoom); |
| 33 } | 33 } |
| 34 | 34 |
| 35 float SVGTextLayoutEngineSpacing::calculateCSSSpacing(UChar currentCharacter) | 35 float SVGTextLayoutEngineSpacing::calculateCSSSpacing(UChar currentCharacter) |
| 36 { | 36 { |
| 37 UChar lastCharacter = m_lastCharacter; | 37 UChar lastCharacter = m_lastCharacter; |
| 38 m_lastCharacter = currentCharacter; | 38 m_lastCharacter = currentCharacter; |
| 39 | 39 |
| 40 if (!m_font.fontDescription().letterSpacing() && !m_font.fontDescription().w
ordSpacing()) | 40 if (!m_font.getFontDescription().letterSpacing() && !m_font.getFontDescripti
on().wordSpacing()) |
| 41 return 0; | 41 return 0; |
| 42 | 42 |
| 43 float spacing = m_font.fontDescription().letterSpacing(); | 43 float spacing = m_font.getFontDescription().letterSpacing(); |
| 44 if (currentCharacter && lastCharacter && m_font.fontDescription().wordSpacin
g()) { | 44 if (currentCharacter && lastCharacter && m_font.getFontDescription().wordSpa
cing()) { |
| 45 if (Character::treatAsSpace(currentCharacter) && !Character::treatAsSpac
e(lastCharacter)) | 45 if (Character::treatAsSpace(currentCharacter) && !Character::treatAsSpac
e(lastCharacter)) |
| 46 spacing += m_font.fontDescription().wordSpacing(); | 46 spacing += m_font.getFontDescription().wordSpacing(); |
| 47 } | 47 } |
| 48 | 48 |
| 49 if (m_effectiveZoom != 1) | 49 if (m_effectiveZoom != 1) |
| 50 spacing = spacing / m_effectiveZoom; | 50 spacing = spacing / m_effectiveZoom; |
| 51 | 51 |
| 52 return spacing; | 52 return spacing; |
| 53 } | 53 } |
| 54 | 54 |
| 55 } // namespace blink | 55 } // namespace blink |
| OLD | NEW |