diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-06-13 16:26:07 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-06-13 16:45:03 +0200 |
| commit | ba4102c575d338cdccba9937a116701c26509abb (patch) | |
| tree | a6b6181d061c7cce539bb7bde5d5e70674bc9714 | |
| parent | f7d9266939d0895d9b6fdd8b72c236702652c597 (diff) | |
| download | qtwebkit-ba4102c575d338cdccba9937a116701c26509abb.tar.gz | |
Fix letter-spacing in SVG
Qt incorrectly included letter-spacing when WebCore asked us to ignore
it which broke SVG rendering of letter-spaced text in the complex
font path.
Task-number: QTBUG-39601
Change-Id: Ia951e12ac5503955eb0e34e214219f9136c71465
Reviewed-by: Julien Brianceau <jbriance@cisco.com>
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
| -rw-r--r-- | Source/WebCore/platform/graphics/qt/FontQt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/qt/FontQt.cpp b/Source/WebCore/platform/graphics/qt/FontQt.cpp index 5f0d5ee4f..324fdf05f 100644 --- a/Source/WebCore/platform/graphics/qt/FontQt.cpp +++ b/Source/WebCore/platform/graphics/qt/FontQt.cpp @@ -248,9 +248,9 @@ void Font::initFormatForTextLayout(QTextLayout* layout, const TextRun& run) cons for (range.start = 0; range.start < length && treatAsSpace(run[range.start]); ++range.start) { } range.length = length - range.start; - if (m_wordSpacing) + if (m_wordSpacing && !run.spacingDisabled()) range.format.setFontWordSpacing(m_wordSpacing); - if (m_letterSpacing) + if (m_letterSpacing && !run.spacingDisabled()) range.format.setFontLetterSpacing(m_letterSpacing); if (typesettingFeatures() & Kerning) range.format.setFontKerning(true); |