Merge pull request #14 from movableink/always-complex-text

mnutt · web-flow · commit 3cfcdcf38a52 · 2023-08-11T15:03:40.000-04:00
Always use complex text code path
diff --git a/Source/WebCore/platform/graphics/FontCascade.h b/Source/WebCore/platform/graphics/FontCascade.h
@@ -307,17 +307,7 @@ class FontCascade : public CanMakeWeakPtr<FontCascade> {
 
     bool advancedTextRenderingMode() const
     {
-#if PLATFORM(QT)
-        auto textRenderingMode = m_fontDescription.textRenderingMode();
-        if (textRenderingMode == TextRenderingMode::GeometricPrecision || textRenderingMode == TextRenderingMode::OptimizeLegibility)
-            return true;
-        if (textRenderingMode == TextRenderingMode::OptimizeSpeed)
-            return false;
-
-        return false;
-#else
         return m_fontDescription.textRenderingMode() != TextRenderingMode::OptimizeSpeed;
-#endif
     }
 
     bool computeEnableKerning() const
diff --git a/Source/WebCore/platform/graphics/FontCascadeFonts.cpp b/Source/WebCore/platform/graphics/FontCascadeFonts.cpp
@@ -495,6 +495,9 @@ GlyphData FontCascadeFonts::glyphDataForCharacter(UChar32 c, const FontCascadeDe
     ASSERT(m_thread ? m_thread->ptr() == &Thread::current() : isMainThread());
     ASSERT(variant != AutoVariant);
 
+    if (c == 10) // newline
+        c = space;
+
     if (variant != NormalVariant)
         return glyphDataForVariant(c, description, variant);
 
diff --git a/Source/WebCore/platform/graphics/qt/FontCascadeQt.cpp b/Source/WebCore/platform/graphics/qt/FontCascadeQt.cpp
@@ -312,8 +312,12 @@ void FontCascade::drawGlyphs(GraphicsContext& context, const Font& font, const G
     for (int i = 0; i < numGlyphs; ++i) {
         Glyph glyph = glyphs[i];
         float advance = advances[i].x();
-        if (!glyph)
+
+        if (!glyph) {
+            width += advance;
             continue;
+        }
+
         glyphIndexes.append(glyph);
         positions.append(QPointF(width, 0));
         width += advance;
