[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

mrobinson at webkit.org mrobinson at webkit.org
Wed Dec 22 13:53:07 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 926612856a7513c4674a4d386c48d4e22bf69f08
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 20:45:44 2010 +0000

    2010-09-28  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [Cairo] FreeType fonts should obey FontConfig hinting/anti-aliasing settings
            https://bugs.webkit.org/show_bug.cgi?id=46740
    
            Added a test adapted from platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle.html
            which verifies that when rendering text the GTK+ port follows FontConfig settings.
    
            * platform/gtk/fonts/fontconfig-aliasing-settings-expected.checksum: Added.
            * platform/gtk/fonts/fontconfig-aliasing-settings-expected.png: Added.
            * platform/gtk/fonts/fontconfig-aliasing-settings-expected.txt: Added.
            * platform/gtk/fonts/fontconfig-aliasing-settings.html: Added.
    2010-09-28  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [Cairo] FreeType fonts should obey FontConfig hinting/anti-aliasing settings
            https://bugs.webkit.org/show_bug.cgi?id=46740
    
            When creating a font from a FontConfig pattern, use the FontConfig pattern's
            hinting and anti-aliasing settings. This follows the Chromium Linux approach
            of having FontConfig settings take precedence over GTK+ settings, as GTK+
            settings cannot be configured per-font and per-font-size.
    
            Test: platform/gtk/fonts/fontconfig-aliasing-settings.html
    
            * platform/graphics/cairo/FontPlatformDataFreeType.cpp:
            (WebCore::convertFontConfigSubpixelOrder): Added this helper which converts
            the FontConfig subpixel order into the cairo equivalent.
            (WebCore::convertFontConfigHintStyle): Added this helper which converts the
            FontConfig hint style into the cairo equivalent.
            (WebCore::setCairoFontOptionsFromFontConfigPattern): Added this helper which
            reads the font rendering settings from a pattern and translates them into the
            appropriate cairo_font_options_t settings.
            (WebCore::FontPlatformData::FontPlatformData): When creating a font from a
            FontConfig pattern use setCairoFontOptionsFromFontConfigPattern to get the
            appropriate rendering options for the font.
    2010-09-28  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [Cairo] FreeType fonts should obey FontConfig hinting/anti-aliasing settings
            https://bugs.webkit.org/show_bug.cgi?id=46740
    
            * DumpRenderTree/gtk/fonts/fonts.conf: Add specialized variants of common
            fonts which can be used to fully test FontConfig rendering settings.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68558 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index cef6e1c..01820d6 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-28  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [Cairo] FreeType fonts should obey FontConfig hinting/anti-aliasing settings
+        https://bugs.webkit.org/show_bug.cgi?id=46740
+
+        Added a test adapted from platform/chromium/fast/text/chromium-linux-fontconfig-renderstyle.html
+        which verifies that when rendering text the GTK+ port follows FontConfig settings.
+
+        * platform/gtk/fonts/fontconfig-aliasing-settings-expected.checksum: Added.
+        * platform/gtk/fonts/fontconfig-aliasing-settings-expected.png: Added.
+        * platform/gtk/fonts/fontconfig-aliasing-settings-expected.txt: Added.
+        * platform/gtk/fonts/fontconfig-aliasing-settings.html: Added.
+
 2010-09-28  Dan Bernstein  <mitz at apple.com>
 
         Updated expected result to include the soft hyphen character in the plain text output.
diff --git a/LayoutTests/platform/gtk/fonts/fontconfig-aliasing-settings-expected.checksum b/LayoutTests/platform/gtk/fonts/fontconfig-aliasing-settings-expected.checksum
new file mode 100644
index 0000000..65919a2
--- /dev/null
+++ b/LayoutTests/platform/gtk/fonts/fontconfig-aliasing-settings-expected.checksum
@@ -0,0 +1 @@
+62d5da61a4d8eec229781c9ddc229be8
\ No newline at end of file
diff --git a/LayoutTests/platform/gtk/fonts/fontconfig-aliasing-settings-expected.png b/LayoutTests/platform/gtk/fonts/fontconfig-aliasing-settings-expected.png
new file mode 100644
index 0000000..98ea8c6
Binary files /dev/null and b/LayoutTests/platform/gtk/fonts/fontconfig-aliasing-settings-expected.png differ
diff --git a/LayoutTests/platform/gtk/fonts/fontconfig-aliasing-settings-expected.txt b/LayoutTests/platform/gtk/fonts/fontconfig-aliasing-settings-expected.txt
new file mode 100644
index 0000000..3738b62
--- /dev/null
+++ b/LayoutTests/platform/gtk/fonts/fontconfig-aliasing-settings-expected.txt
@@ -0,0 +1,113 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 465x19
+          text run at (0,0) width 465: "This test should be run in DumpRenderTree, as it requires a special fonts.conf"
+      RenderBlock {OL} at (0,35) size 784x461
+        RenderListItem {LI} at (40,0) size 744x54
+          RenderBlock {P} at (0,0) size 744x19
+            RenderListMarker at (-21,0) size 16x19: "1"
+            RenderText {#text} at (0,0) size 318x19
+              text run at (0,0) width 318: "The following text should render without anti-aliasing:"
+          RenderBlock {P} at (0,35) size 744x19
+            RenderText {#text} at (0,0) size 154x19
+              text run at (0,0) width 154: "Non anti-aliased sans."
+        RenderListItem {LI} at (40,70) size 744x73
+          RenderBlock {P} at (0,0) size 744x38
+            RenderListMarker at (-21,0) size 16x19: "2"
+            RenderText {#text} at (0,0) size 710x38
+              text run at (0,0) width 360: "The following text should be slightly-hinted Liberation Serif. "
+              text run at (360,0) width 57: "The dots "
+              text run at (417,0) width 293: "should be equally spaced, and letters in the word"
+              text run at (0,19) width 146: "\"government\" should be "
+              text run at (146,19) width 101: "naturally spaced."
+          RenderBlock {P} at (0,54) size 744x19
+            RenderText {#text} at (0,0) size 207x19
+              text run at (0,0) width 207: "government ................................"
+        RenderListItem {LI} at (40,159) size 744x73
+          RenderBlock {P} at (0,0) size 744x38
+            RenderListMarker at (-21,0) size 16x19: "3"
+            RenderText {#text} at (0,0) size 742x38
+              text run at (0,0) width 419: "The following text should be unhinted Liberation Sans. The fontconfig "
+              text run at (419,0) width 323: "configuration for this is contradictory, setting both full-"
+              text run at (0,19) width 42: "hinting "
+              text run at (42,19) width 245: "and no-hinting. The latter should win out."
+          RenderBlock {P} at (0,54) size 744x19
+            RenderText {#text} at (0,0) size 553x19
+              text run at (0,0) width 386: "Here is Tigger doing what tiggers do best \x{2026} operating "
+              text run at (386,0) width 167: "hydraulic exoskeletons."
+        RenderListItem {LI} at (40,248) size 744x54
+          RenderBlock {P} at (0,0) size 744x19
+            RenderListMarker at (-21,0) size 16x19: "4"
+            RenderText {#text} at (0,0) size 595x19
+              text run at (0,0) width 329: "The following text should show a difference caused by "
+              text run at (329,0) width 266: "forcing autohinting. Note: the effect is subtle."
+          RenderBlock {P} at (0,35) size 744x19
+            RenderInline {SPAN} at (0,0) size 46x12
+              RenderText {#text} at (0,6) size 46x12
+                text run at (0,6) width 46: "autohinted"
+            RenderText {#text} at (46,0) size 4x19
+              text run at (46,0) width 4: " "
+            RenderInline {I} at (0,0) size 14x19
+              RenderText {#text} at (50,0) size 14x19
+                text run at (50,0) width 14: "vs"
+            RenderText {#text} at (64,0) size 4x19
+              text run at (64,0) width 4: " "
+            RenderInline {SPAN} at (0,0) size 58x12
+              RenderText {#text} at (68,6) size 58x12
+                text run at (68,6) width 58: "not-autohinted"
+        RenderListItem {LI} at (40,318) size 744x73
+          RenderBlock {P} at (0,0) size 744x38
+            RenderListMarker at (-21,0) size 16x19: "5"
+            RenderText {#text} at (0,0) size 512x19
+              text run at (0,0) width 380: "The following text should be the same. It verifies that, given the "
+              text run at (380,0) width 132: "contradictory settings "
+            RenderInline {TT} at (0,0) size 64x15
+              RenderText {#text} at (512,4) size 64x15
+                text run at (512,4) width 64: "hintfull"
+            RenderText {#text} at (576,0) size 30x19
+              text run at (576,0) width 30: " and "
+            RenderInline {TT} at (0,0) size 64x15
+              RenderText {#text} at (606,4) size 64x15
+                text run at (606,4) width 64: "autohint"
+            RenderText {#text} at (670,0) size 730x38
+              text run at (670,0) width 30: ", the "
+              text run at (700,0) width 30: "latter"
+              text run at (0,19) width 53: "wins out:"
+          RenderBlock {P} at (0,54) size 744x19
+            RenderInline {SPAN} at (0,0) size 46x12
+              RenderText {#text} at (0,6) size 46x12
+                text run at (0,6) width 46: "autohinted"
+            RenderText {#text} at (46,0) size 4x19
+              text run at (46,0) width 4: " "
+            RenderInline {I} at (0,0) size 14x19
+              RenderText {#text} at (50,0) size 14x19
+                text run at (50,0) width 14: "vs"
+            RenderText {#text} at (64,0) size 4x19
+              text run at (64,0) width 4: " "
+            RenderInline {SPAN} at (0,0) size 89x12
+              RenderText {#text} at (68,6) size 89x12
+                text run at (68,6) width 89: "hopefully autohinted"
+        RenderListItem {LI} at (40,407) size 744x54
+          RenderBlock {P} at (0,0) size 744x19
+            RenderListMarker at (-21,0) size 16x19: "6"
+            RenderText {#text} at (0,0) size 590x19
+              text run at (0,0) width 414: "The following text should show that fontconfig can be used to enable "
+              text run at (414,0) width 176: "or disable subpixel rendering."
+          RenderBlock {P} at (0,35) size 744x19
+            RenderInline {SPAN} at (0,0) size 57x19
+              RenderText {#text} at (0,0) size 57x19
+                text run at (0,0) width 57: "subpixel"
+            RenderText {#text} at (57,0) size 4x19
+              text run at (57,0) width 4: " "
+            RenderInline {I} at (0,0) size 14x19
+              RenderText {#text} at (61,0) size 14x19
+                text run at (61,0) width 14: "vs"
+            RenderText {#text} at (75,0) size 4x19
+              text run at (75,0) width 4: " "
+            RenderInline {SPAN} at (0,0) size 78x19
+              RenderText {#text} at (79,0) size 78x19
+                text run at (79,0) width 78: "no subpixel"
diff --git a/LayoutTests/platform/gtk/fonts/fontconfig-aliasing-settings.html b/LayoutTests/platform/gtk/fonts/fontconfig-aliasing-settings.html
new file mode 100644
index 0000000..e3f05eb
--- /dev/null
+++ b/LayoutTests/platform/gtk/fonts/fontconfig-aliasing-settings.html
@@ -0,0 +1,68 @@
+<html>
+  <body>
+    <p>This test should be run in DumpRenderTree, as it requires a special fonts.conf</p>
+
+    <ol>
+      <li>
+        <p>The following text should render without anti-aliasing:</p>
+        <p style="font-family: NonAntiAliasedSans">Non anti-aliased sans.</p>
+      </li>
+      <li>
+        <p>
+          The following text should be slightly-hinted Liberation Serif.  The dots
+          should be equally spaced, and letters in the word "government" should be
+          naturally spaced.
+        </p>
+        <p style="font-family:SlightHintedSerif">
+          government ................................
+        </p>
+      </li>
+
+      <li>
+        <p>
+          The following text should be unhinted Liberation Sans. The fontconfig
+          configuration for this is contradictory, setting both full-hinting
+          and no-hinting. The latter should win out.
+        </p>
+        <p style="font-family:NonHintedSans">
+          Here is Tigger doing what tiggers do best &hellip; operating
+          hydraulic exoskeletons.
+        </p>
+      </li>
+
+      <li>
+        <p>
+          The following text should show a difference caused by
+          forcing autohinting. Note: the effect is subtle.
+        </p>
+        <p>
+            <span style="font-family:AutohintedSerif; font-size:0.6em;">autohinted</span> 
+            <i>vs</i>
+            <span style="font-family:HintedSerif; font-size:0.6em;">not-autohinted</span></p>
+      </li>
+
+      <li>
+        <p>
+          The following text should be the same. It verifies that, given the
+          contradictory settings <tt>hintfull</tt> and <tt>autohint</tt>, the
+          latter wins out:
+        </p>
+        <p>
+            <span style="font-family:AutohintedSerif; font-size:0.6em;">autohinted</span>
+            <i>vs</i>
+            <span style="font-family:FullAndAutoHintedSerif; font-size:0.6em;">hopefully autohinted</span></p>
+      </li>
+
+      <li>
+        <p>
+          The following text should show that fontconfig can be used to enable
+          or disable subpixel rendering.
+        </p>
+        <p>
+            <span style="font-family:SubpixelEnabledSans">subpixel</span>
+            <i>vs</i>
+            <span style="font-family:SubpixelDisabledSans">no subpixel</span></p>
+      </li>
+    </ol>
+  </body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e87ba53..8806f7a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2010-09-28  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [Cairo] FreeType fonts should obey FontConfig hinting/anti-aliasing settings
+        https://bugs.webkit.org/show_bug.cgi?id=46740
+
+        When creating a font from a FontConfig pattern, use the FontConfig pattern's
+        hinting and anti-aliasing settings. This follows the Chromium Linux approach
+        of having FontConfig settings take precedence over GTK+ settings, as GTK+
+        settings cannot be configured per-font and per-font-size.
+
+        Test: platform/gtk/fonts/fontconfig-aliasing-settings.html
+
+        * platform/graphics/cairo/FontPlatformDataFreeType.cpp:
+        (WebCore::convertFontConfigSubpixelOrder): Added this helper which converts
+        the FontConfig subpixel order into the cairo equivalent.
+        (WebCore::convertFontConfigHintStyle): Added this helper which converts the
+        FontConfig hint style into the cairo equivalent.
+        (WebCore::setCairoFontOptionsFromFontConfigPattern): Added this helper which
+        reads the font rendering settings from a pattern and translates them into the
+        appropriate cairo_font_options_t settings.
+        (WebCore::FontPlatformData::FontPlatformData): When creating a font from a
+        FontConfig pattern use setCairoFontOptionsFromFontConfigPattern to get the
+        appropriate rendering options for the font.
+
 2010-09-28  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Darin Adler and Dave Hyatt.
diff --git a/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp b/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp
index 7488da1..0617e6c 100644
--- a/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp
+++ b/WebCore/platform/graphics/cairo/FontPlatformDataFreeType.cpp
@@ -37,6 +37,61 @@
 
 namespace WebCore {
 
+cairo_subpixel_order_t convertFontConfigSubpixelOrder(int fontConfigOrder)
+{
+    switch (fontConfigOrder) {
+    case FC_RGBA_RGB:
+        return CAIRO_SUBPIXEL_ORDER_RGB;
+    case FC_RGBA_BGR:
+        return CAIRO_SUBPIXEL_ORDER_BGR;
+    case FC_RGBA_VRGB:
+        return CAIRO_SUBPIXEL_ORDER_VRGB;
+    case FC_RGBA_VBGR:
+        return CAIRO_SUBPIXEL_ORDER_VBGR;
+    case FC_RGBA_NONE:
+    case FC_RGBA_UNKNOWN:
+        return CAIRO_SUBPIXEL_ORDER_DEFAULT;
+    }
+    return CAIRO_SUBPIXEL_ORDER_DEFAULT;
+}
+
+cairo_hint_style_t convertFontConfigHintStyle(int fontConfigStyle)
+{
+    switch (fontConfigStyle) {
+    case FC_HINT_NONE:
+        return CAIRO_HINT_STYLE_NONE;
+    case FC_HINT_SLIGHT:
+        return CAIRO_HINT_STYLE_SLIGHT;
+    case FC_HINT_MEDIUM:
+        return CAIRO_HINT_STYLE_MEDIUM;
+    case FC_HINT_FULL:
+        return CAIRO_HINT_STYLE_FULL;
+    }
+    return CAIRO_HINT_STYLE_NONE;
+}
+
+void setCairoFontOptionsFromFontConfigPattern(cairo_font_options_t* options, FcPattern* pattern)
+{
+    FcBool booleanResult;
+    int integerResult;
+
+    // We will determine if subpixel anti-aliasing is enabled via the FC_RGBA setting.
+    if (FcPatternGetBool(pattern, FC_ANTIALIAS, 0, &booleanResult) == FcResultMatch && booleanResult)
+        cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_GRAY);
+
+    if (FcPatternGetInteger(pattern, FC_RGBA, 0, &integerResult) == FcResultMatch) {
+        if (integerResult != FC_RGBA_NONE)
+            cairo_font_options_set_antialias(options, CAIRO_ANTIALIAS_SUBPIXEL);
+        cairo_font_options_set_subpixel_order(options, convertFontConfigSubpixelOrder(integerResult));
+    }
+
+    if (FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &integerResult) == FcResultMatch)
+        cairo_font_options_set_hint_style(options, convertFontConfigHintStyle(integerResult));
+
+    if (FcPatternGetBool(pattern, FC_HINTING, 0, &booleanResult) == FcResultMatch && !booleanResult)
+        cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_NONE);
+}
+
 FontPlatformData::FontPlatformData(FcPattern* pattern, const FontDescription& fontDescription)
     : m_pattern(pattern)
     , m_fallbacks(0)
@@ -44,17 +99,8 @@ FontPlatformData::FontPlatformData(FcPattern* pattern, const FontDescription& fo
     , m_syntheticBold(false)
     , m_syntheticOblique(false)
 {
-    // FIXME: We should be getting these options from FontConfig.
-    static const cairo_font_options_t* defaultOptions = cairo_font_options_create();
-    const cairo_font_options_t* options = 0;
-#if !PLATFORM(EFL) || ENABLE(GLIB_SUPPORT)
-    if (GdkScreen* screen = gdk_screen_get_default())
-        options = gdk_screen_get_font_options(screen);
-#endif
-    // gdk_screen_get_font_options() returns null if no default options are
-    // set, so we always have to check.
-    if (!options)
-        options = defaultOptions;
+    cairo_font_options_t* options = cairo_font_options_create();
+    setCairoFontOptionsFromFontConfigPattern(options, pattern);
 
     cairo_matrix_t fontMatrix;
     cairo_matrix_init_scale(&fontMatrix, m_size, m_size);
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1a56b2a..eb7c75e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Reviewed by Gustavo Noronha Silva.
 
+        [Cairo] FreeType fonts should obey FontConfig hinting/anti-aliasing settings
+        https://bugs.webkit.org/show_bug.cgi?id=46740
+
+        * DumpRenderTree/gtk/fonts/fonts.conf: Add specialized variants of common
+        fonts which can be used to fully test FontConfig rendering settings.
+
+2010-09-28  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
         [gtk] Fedora has a different path for the liberation fonts
         https://bugs.webkit.org/show_bug.cgi?id=46709
 
diff --git a/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf b/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf
index 640dde3..520f96e 100644
--- a/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf
+++ b/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf
@@ -101,6 +101,119 @@
       </edit>
     </match>
 
+    <!-- The following hinting specializations are adapted from those in the
+         Chromium test_shell.  We try to duplicate their incredibly thorough
+         testing here -->
+    <match target="pattern">
+        <test name="family" compare="eq">
+            <string>NonAntiAliasedSans</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Liberation Sans</string>
+        </edit>
+        <edit name="antialias" mode="assign">
+            <bool>false</bool>
+        </edit>
+    </match>
+    
+    <match target="pattern">
+        <test name="family" compare="eq">
+            <string>SlightHintedSerif</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Liberation Serif</string>
+        </edit>
+        <edit name="hintstyle" mode="assign">
+            <const>hintslight</const>
+        </edit>
+    </match>
+    
+    <match target="pattern">
+        <test name="family" compare="eq">
+            <string>NonHintedSans</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Liberation Sans</string>
+        </edit>
+        <!-- These deliberately contradict each other. The 'hinting' preference
+             should take priority -->
+        <edit name="hintstyle" mode="assign">
+            <const>hintfull</const>
+        </edit>
+     <edit name="hinting" mode="assign">
+            <bool>false</bool>
+        </edit>
+    </match>
+    
+    <match target="pattern">
+        <test name="family" compare="eq">
+            <string>AutohintedSerif</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Liberation Serif</string>
+        </edit>
+        <edit name="autohint" mode="assign">
+            <bool>true</bool>
+        </edit>
+        <edit name="hintstyle" mode="assign">
+            <const>hintmedium</const>
+        </edit>
+    </match>
+    
+    <match target="pattern">
+        <test name="family" compare="eq">
+            <string>HintedSerif</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Liberation Serif</string>
+        </edit>
+        <edit name="autohint" mode="assign">
+            <bool>false</bool>
+        </edit>
+        <edit name="hintstyle" mode="assign">
+            <const>hintmedium</const>
+        </edit>
+    </match>
+    
+    <match target="pattern">
+        <test name="family" compare="eq">
+            <string>FullAndAutoHintedSerif</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Liberation Serif</string>
+        </edit>
+        <edit name="autohint" mode="assign">
+            <bool>true</bool>
+        </edit>
+        <edit name="hintstyle" mode="assign">
+            <const>hintfull</const>
+        </edit>
+    </match>
+    
+    <match target="pattern">
+        <test name="family" compare="eq">
+            <string>SubpixelEnabledSans</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Liberation Sans</string>
+        </edit>
+        <edit name="rgba" mode="assign">
+            <const>rgb</const>
+        </edit>
+    </match>
+    
+    <match target="pattern">
+        <test name="family" compare="eq">
+            <string>SubpixelDisabledSans</string>
+        </test>
+        <edit name="family" mode="assign">
+            <string>Liberation Sans</string>
+        </edit>
+        <edit name="rgba" mode="assign">
+            <const>none</const>
+        </edit>
+    </match>
+
     <config>
         <!-- These are the default Unicode chars that are expected to be blank
              in fonts. All other blank chars are assumed to be broken and won't

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list