diff options
| -rw-r--r-- | Source/WebCore/dom/Attribute.h | 7 | ||||
| -rw-r--r-- | Source/WebCore/platform/graphics/qt/FontQt.cpp | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Source/WebCore/dom/Attribute.h b/Source/WebCore/dom/Attribute.h index c590f9a03..a7d29f1ec 100644 --- a/Source/WebCore/dom/Attribute.h +++ b/Source/WebCore/dom/Attribute.h @@ -62,9 +62,12 @@ public: void parserSetName(const QualifiedName& name) { m_name = name; } #if COMPILER(MSVC) || COMPILER(CLANG) - // NOTE: This constructor is not actually implemented, it's just defined so MSVC (or clang) + // NOTE: This constructor is not actually used, it's just defined so MSVC (or clang) // will let us use a zero-length array of Attributes. - Attribute(); + Attribute() : m_name(WTF::HashTableDeletedValue) + { + ASSERT_NOT_REACHED(); + } #endif private: 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); |