Changeset 69117 in webkit

Timestamp:

Oct 5, 2010 9:58:53 AM (14 years ago)

Author:

Martin Robinson

Message:

2010-10-05 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GTK] Complex text rendering does not render custom fonts
​https://bugs.webkit.org/show_bug.cgi?id=41091

Added a layout test that verifies that custom fonts are rendered with
the correct font when hitting the complex text code path.

• platform/gtk/fonts/font-face-with-complex-text-expected.checksum: Added.
• platform/gtk/fonts/font-face-with-complex-text-expected.png: Added.
• platform/gtk/fonts/font-face-with-complex-text-expected.txt: Added.
• platform/gtk/fonts/font-face-with-complex-text.html: Added.
• platform/gtk/fonts/resources/Ahem.ttf: Copied from LayoutTests/fast/css/resources/Ahem.ttf.

2010-10-05 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Gustavo Noronha Silva.

[GTK] Complex text rendering does not render custom fonts
​https://bugs.webkit.org/show_bug.cgi?id=41091

For fonts that do not have a FontConfig pattern (including custom
fonts), fall back to the simple text rendering path. This is a work-
-around for not supporting Pango rendering with non-FontConfig fonts.

Test: platform/gtk/fonts/font-face-with-complex-text.html

• platform/graphics/gtk/FontGtk.cpp: (WebCore::Font::drawComplexText): Fall back to the simple path for custom fonts. (WebCore::Font::floatWidthForComplexText): Ditto. (WebCore::Font::offsetForPositionForComplexText): Ditto. (WebCore::Font::selectionRectForComplexText): Ditto.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/fonts/font-face-with-complex-text-expected.checksum (added)
• LayoutTests/platform/gtk/fonts/font-face-with-complex-text-expected.png (added)
• LayoutTests/platform/gtk/fonts/font-face-with-complex-text-expected.txt (added)
• LayoutTests/platform/gtk/fonts/font-face-with-complex-text.html (added)
• LayoutTests/platform/gtk/fonts/resources (added)
• LayoutTests/platform/gtk/fonts/resources/Ahem.ttf (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/gtk/FontGtk.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-10-05  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Complex text rendering does not render custom fonts
+        https://bugs.webkit.org/show_bug.cgi?id=41091
+
+        Added a layout test that verifies that custom fonts are rendered with
+        the correct font when hitting the complex text code path.
+
+        * platform/gtk/fonts/font-face-with-complex-text-expected.checksum: Added.
+        * platform/gtk/fonts/font-face-with-complex-text-expected.png: Added.
+        * platform/gtk/fonts/font-face-with-complex-text-expected.txt: Added.
+        * platform/gtk/fonts/font-face-with-complex-text.html: Added.
+        * platform/gtk/fonts/resources/Ahem.ttf: Copied from LayoutTests/fast/css/resources/Ahem.ttf.
+
 2010-10-05  Kent Tamura  <tkent@chromium.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-05  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] Complex text rendering does not render custom fonts
+        https://bugs.webkit.org/show_bug.cgi?id=41091
+
+        For fonts that do not have a FontConfig pattern (including custom
+        fonts), fall back to the simple text rendering path. This is a work-
+        -around for not supporting Pango rendering with non-FontConfig fonts.
+
+        Test: platform/gtk/fonts/font-face-with-complex-text.html
+
+        * platform/graphics/gtk/FontGtk.cpp:
+        (WebCore::Font::drawComplexText): Fall back to the simple path for custom fonts.
+        (WebCore::Font::floatWidthForComplexText): Ditto.
+        (WebCore::Font::offsetForPositionForComplexText): Ditto.
+        (WebCore::Font::selectionRectForComplexText): Ditto.
+
 2010-10-05  Kwang Yul Seo  <skyul@company100.net>
 

trunk/WebCore/platform/graphics/gtk/FontGtk.cpp

@@ -207 +207 @@
 void Font::drawComplexText(GraphicsContext* context, const TextRun& run, const FloatPoint& point, int from, int to) const
 {
+#if defined(USE_FREETYPE)
+    if (!primaryFont()->platformData().m_pattern) {
+        drawSimpleText(context, run, point, from, to);
+        return;
+    }
+#endif
+
     cairo_t* cr = context->platformContext();
     cairo_save(cr);
@@ -324 +331 @@
 }
 
-float Font::floatWidthForComplexText(const TextRun& run, HashSet<const SimpleFontData*>* /* fallbackFonts */, GlyphOverflow*) const
-{
+float Font::floatWidthForComplexText(const TextRun& run, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* overflow) const
+{
+#if defined(USE_FREETYPE)
+    if (!primaryFont()->platformData().m_pattern)
+        return floatWidthForSimpleText(run, 0, fallbackFonts, overflow);
+#endif
+
     if (run.length() == 0)
         return 0.0f;
@@ -346 +358 @@
 int Font::offsetForPositionForComplexText(const TextRun& run, float xFloat, bool includePartialGlyphs) const
 {
+#if defined(USE_FREETYPE)
+    if (!primaryFont()->platformData().m_pattern)
+        return offsetForPositionForSimpleText(run, xFloat, includePartialGlyphs);
+#endif
     // FIXME: This truncation is not a problem for HTML, but only affects SVG, which passes floating-point numbers
     // to Font::offsetForPosition(). Bug http://webkit.org/b/40673 tracks fixing this problem.
@@ -370 +386 @@
 FloatRect Font::selectionRectForComplexText(const TextRun& run, const FloatPoint& point, int h, int from, int to) const
 {
+#if defined(USE_FREETYPE)
+    if (!primaryFont()->platformData().m_pattern)
+        return selectionRectForSimpleText(run, point, h, from, to);
+#endif
+
     PangoLayout* layout = getDefaultPangoLayout(run);
     setPangoAttributes(this, run, layout);