Changeset 69137 in webkit

Timestamp:

Oct 5, 2010 1:09:25 PM (14 years ago)

Author:

Martin Robinson

Message:

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

Reviewed by Xan Lopez.

[GTK] Support FontPlatformData::isFixedPitch for custom fonts
​https://bugs.webkit.org/show_bug.cgi?id=47124

Instead of determining whether or not a font is a fixed-width font
lazily, do it up front. For fonts not backed by Fontconfig patterns,
fetch information about whether or not the font is fixed-width from
the FreeType face.

No new tests as this should not change functionality.

• platform/graphics/cairo/FontPlatformDataFreeType.cpp: (WebCore::FontPlatformData::FontPlatformData): Initialize the m_fixedWidth member from the Fontconfig pattern or the FreeType face. (WebCore::FontPlatformData::operator=): Copy over the m_fixedWidth member. (WebCore::FontPlatformData::isFixedPitch): Just return the value of the m_fixedWidth member.
• platform/graphics/cairo/FontPlatformDataFreeType.h: Added an m_fixedWidth member.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/FontPlatformDataFreeType.cpp (modified) (6 diffs)
• platform/graphics/cairo/FontPlatformDataFreeType.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-05  Martin Robinson  <mrobinson@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Support FontPlatformData::isFixedPitch for custom fonts
+        https://bugs.webkit.org/show_bug.cgi?id=47124
+
+        Instead of determining whether or not a font is a fixed-width font
+        lazily, do it up front. For fonts not backed by Fontconfig patterns,
+        fetch information about whether or not the font is fixed-width from
+        the FreeType face.
+
+        No new tests as this should not change functionality.
+
+        * platform/graphics/cairo/FontPlatformDataFreeType.cpp:
+        (WebCore::FontPlatformData::FontPlatformData): Initialize the m_fixedWidth member
+        from the Fontconfig pattern or the FreeType face.
+        (WebCore::FontPlatformData::operator=): Copy over the m_fixedWidth member.
+        (WebCore::FontPlatformData::isFixedPitch): Just return the value of the m_fixedWidth member.
+        * platform/graphics/cairo/FontPlatformDataFreeType.h: Added an m_fixedWidth member.
+
 2010-10-05  David Hyatt  <hyatt@apple.com>
 

trunk/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp

@@ -99 +99 @@
     , m_syntheticBold(false)
     , m_syntheticOblique(false)
+    , m_fixedWidth(false)
 {
     cairo_font_options_t* options = cairo_font_options_create();
@@ -110 +111 @@
     PlatformRefPtr<cairo_font_face_t> fontFace = adoptPlatformRef(cairo_ft_font_face_create_for_pattern(m_pattern.get()));
     m_scaledFont = adoptPlatformRef(cairo_scaled_font_create(fontFace.get(), &fontMatrix, &ctm, options));
+
+    int spacing;
+    if (FcPatternGetInteger(pattern, FC_SPACING, 0, &spacing) == FcResultMatch && spacing == FC_MONO)
+        m_fixedWidth = true;
 }
 
@@ -117 +122 @@
     , m_syntheticBold(bold)
     , m_syntheticOblique(italic)
+    , m_fixedWidth(false)
 {
 }
@@ -144 +150 @@
 
     m_scaledFont = adoptPlatformRef(cairo_scaled_font_create(fontFace, &fontMatrix, &ctm, options));
+
+    FT_Face fontConfigFace = cairo_ft_scaled_font_lock_face(m_scaledFont.get());
+    if (fontConfigFace) {
+        m_fixedWidth = fontConfigFace->face_flags && FT_FACE_FLAG_FIXED_WIDTH;
+        cairo_ft_scaled_font_unlock_face(m_scaledFont.get());
+    }
 }
 
@@ -155 +167 @@
     m_syntheticBold = other.m_syntheticBold;
     m_syntheticOblique = other.m_syntheticOblique;
+    m_fixedWidth = other.m_fixedWidth;
     m_scaledFont = other.m_scaledFont;
     m_pattern = other.m_pattern;
@@ -183 +196 @@
 bool FontPlatformData::isFixedPitch()
 {
-    // TODO: Support isFixedPitch() for custom fonts.
-    if (!m_pattern)
-        return false;
-
-    int spacing;
-    if (FcPatternGetInteger(m_pattern.get(), FC_SPACING, 0, &spacing) == FcResultMatch)
-        return spacing == FC_MONO;
-    return false;
+    return m_fixedWidth;
 }
 

trunk/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.h

@@ -90 +90 @@
     bool m_syntheticBold;
     bool m_syntheticOblique;
+    bool m_fixedWidth;
     PlatformRefPtr<cairo_scaled_font_t> m_scaledFont;
 };