#include "core/rendering/svg/SVGTextLayoutEngineSpacing.h"
-#include "core/platform/graphics/Font.h"
-#include "core/rendering/style/SVGRenderStyle.h"
#include "core/svg/SVGLengthContext.h"
+#include "platform/fonts/Character.h"
+#include "platform/fonts/Font.h"
#if ENABLE(SVG_FONTS)
#include "core/svg/SVGFontData.h"
#include "core/svg/SVGFontElement.h"
#include "core/svg/SVGFontFaceElement.h"
-#else
-#include "wtf/UnusedParam.h"
#endif
namespace WebCore {
SVGTextLayoutEngineSpacing::SVGTextLayoutEngineSpacing(const Font& font)
: m_font(font)
, m_lastCharacter(0)
+#if ENABLE(SVG_FONTS)
+ , m_lastGlyph(0)
+#endif
{
}
-float SVGTextLayoutEngineSpacing::calculateSVGKerning(bool isVerticalText, const SVGTextMetrics::Glyph& currentGlyph)
+float SVGTextLayoutEngineSpacing::calculateSVGKerning(bool isVerticalText, Glyph currentGlyph)
{
#if ENABLE(SVG_FONTS)
const SimpleFontData* fontData = m_font.primaryFont();
if (!fontData->isSVGFont()) {
- m_lastGlyph.isValid = false;
+ m_lastGlyph = 0;
return 0;
}
ASSERT(fontData->isCustomFont());
ASSERT(fontData->isSVGFont());
- const SVGFontData* svgFontData = static_cast<const SVGFontData*>(fontData->fontData());
+ RefPtr<CustomFontData> customFontData = fontData->customFontData();
+ const SVGFontData* svgFontData = static_cast<const SVGFontData*>(customFontData.get());
SVGFontFaceElement* svgFontFace = svgFontData->svgFontFaceElement();
ASSERT(svgFontFace);
SVGFontElement* svgFont = svgFontFace->associatedFontElement();
if (!svgFont) {
- m_lastGlyph.isValid = false;
+ m_lastGlyph = 0;
return 0;
}
float kerning = 0;
- if (m_lastGlyph.isValid) {
+ if (m_lastGlyph) {
if (isVerticalText)
- kerning = svgFont->verticalKerningForPairOfStringsAndGlyphs(m_lastGlyph.unicodeString, m_lastGlyph.name, currentGlyph.unicodeString, currentGlyph.name);
+ kerning = svgFont->verticalKerningForPairOfGlyphs(m_lastGlyph, currentGlyph);
else
- kerning = svgFont->horizontalKerningForPairOfStringsAndGlyphs(m_lastGlyph.unicodeString, m_lastGlyph.name, currentGlyph.unicodeString, currentGlyph.name);
+ kerning = svgFont->horizontalKerningForPairOfGlyphs(m_lastGlyph, currentGlyph);
+
+ kerning *= m_font.fontDescription().computedSize() / m_font.fontMetrics().unitsPerEm();
}
m_lastGlyph = currentGlyph;
- m_lastGlyph.isValid = true;
- kerning *= m_font.size() / m_font.fontMetrics().unitsPerEm();
return kerning;
#else
- UNUSED_PARAM(isVerticalText);
- UNUSED_PARAM(currentGlyph);
- return false;
+ return 0;
#endif
}
-float SVGTextLayoutEngineSpacing::calculateCSSKerningAndSpacing(const SVGRenderStyle* style, SVGElement* contextElement, UChar currentCharacter)
+float SVGTextLayoutEngineSpacing::calculateCSSSpacing(UChar currentCharacter)
{
- float kerning = 0;
- SVGLength kerningLength = style->kerning();
- if (kerningLength.unitType() == LengthTypePercentage)
- kerning = kerningLength.valueAsPercentage() * m_font.pixelSize();
- else {
- SVGLengthContext lengthContext(contextElement);
- kerning = kerningLength.value(lengthContext);
- }
-
UChar lastCharacter = m_lastCharacter;
m_lastCharacter = currentCharacter;
- if (!kerning && !m_font.letterSpacing() && !m_font.wordSpacing())
+ if (!m_font.fontDescription().letterSpacing() && !m_font.fontDescription().wordSpacing())
return 0;
- float spacing = m_font.letterSpacing() + kerning;
- if (currentCharacter && lastCharacter && m_font.wordSpacing()) {
- if (Font::treatAsSpace(currentCharacter) && !Font::treatAsSpace(lastCharacter))
- spacing += m_font.wordSpacing();
+ float spacing = m_font.fontDescription().letterSpacing();
+ if (currentCharacter && lastCharacter && m_font.fontDescription().wordSpacing()) {
+ if (Character::treatAsSpace(currentCharacter) && !Character::treatAsSpace(lastCharacter))
+ spacing += m_font.fontDescription().wordSpacing();
}
return spacing;