diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/rendering/svg/SVGTextLayoutEngineBaseline.cpp')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/rendering/svg/SVGTextLayoutEngineBaseline.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/third_party/WebKit/Source/core/rendering/svg/SVGTextLayoutEngineBaseline.cpp b/chromium/third_party/WebKit/Source/core/rendering/svg/SVGTextLayoutEngineBaseline.cpp index 3825b4b1220..95c3beb137c 100644 --- a/chromium/third_party/WebKit/Source/core/rendering/svg/SVGTextLayoutEngineBaseline.cpp +++ b/chromium/third_party/WebKit/Source/core/rendering/svg/SVGTextLayoutEngineBaseline.cpp @@ -38,12 +38,12 @@ SVGTextLayoutEngineBaseline::SVGTextLayoutEngineBaseline(const Font& font) float SVGTextLayoutEngineBaseline::calculateBaselineShift(const SVGRenderStyle* style, SVGElement* contextElement) const { if (style->baselineShift() == BS_LENGTH) { - SVGLength baselineShiftValueLength = style->baselineShiftValue(); - if (baselineShiftValueLength.unitType() == LengthTypePercentage) - return baselineShiftValueLength.valueAsPercentage() * m_font.pixelSize(); + RefPtr<SVGLength> baselineShiftValueLength = style->baselineShiftValue(); + if (baselineShiftValueLength->unitType() == LengthTypePercentage) + return baselineShiftValueLength->valueAsPercentage() * m_font.fontDescription().computedPixelSize(); SVGLengthContext lengthContext(contextElement); - return baselineShiftValueLength.value(lengthContext); + return baselineShiftValueLength->value(lengthContext); } switch (style->baselineShift()) { @@ -160,7 +160,7 @@ float SVGTextLayoutEngineBaseline::calculateGlyphOrientationAngle(bool isVertica case GO_AUTO: { // Spec: Fullwidth ideographic and fullwidth Latin text will be set with a glyph-orientation of 0-degrees. // Text which is not fullwidth will be set with a glyph-orientation of 90-degrees. - unsigned int unicodeRange = findCharUnicodeRange(character); + unsigned unicodeRange = findCharUnicodeRange(character); if (unicodeRange == cRangeSetLatin || unicodeRange == cRangeArabic) return 90; |