Merge WebKit at r71558: Initial merge by git.

[android-x86/external-webkit.git] / WebKitTools / DumpRenderTree / gtk / fonts / fonts.conf

diff --git a/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf b/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf
index 6eb057e..2d9af17 100644 (file)
--- a/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf
+++ b/WebKitTools/DumpRenderTree/gtk/fonts/fonts.conf
@@ -2,6 +2,19 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <fontconfig>
 
+    <!-- Due to patent (http://freetype.sourceforge.net/patents.html)
+         issues hinting gives different results depending on the
+         freetype version of the linux distribution, avoiding hinting
+         gives more consistent results. When all the distributions
+         release freetype the 2.4, which enables by default the
+         hinting method that was patented, we could undo this change
+         and try the hinting again. -->
+    <match target="font">
+        <edit name="hinting" mode="assign">
+            <bool>false</bool>
+        </edit>
+    </match>
+
     <!-- The sans-serif font should be Liberation Serif -->
     <match target="pattern">
         <test qual="any" name="family">
@@ -158,6 +171,9 @@
         <edit name="family" mode="assign">
             <string>Liberation Serif</string>
         </edit>
+        <edit name="hinting" mode="assign">
+            <bool>true</bool>
+        </edit>
         <edit name="hintstyle" mode="assign">
             <const>hintslight</const>
         </edit>
@@ -175,7 +191,7 @@
         <edit name="hintstyle" mode="assign">
             <const>hintfull</const>
         </edit>
-     <edit name="hinting" mode="assign">
+        <edit name="hinting" mode="assign">
             <bool>false</bool>
         </edit>
     </match>
@@ -187,6 +203,9 @@
         <edit name="family" mode="assign">
             <string>Liberation Serif</string>
         </edit>
+        <edit name="hinting" mode="assign">
+            <bool>true</bool>
+        </edit>
         <edit name="autohint" mode="assign">
             <bool>true</bool>
         </edit>
@@ -202,6 +221,9 @@
         <edit name="family" mode="assign">
             <string>Liberation Serif</string>
         </edit>
+        <edit name="hinting" mode="assign">
+            <bool>true</bool>
+        </edit>
         <edit name="autohint" mode="assign">
             <bool>false</bool>
         </edit>
@@ -217,6 +239,9 @@
         <edit name="family" mode="assign">
             <string>Liberation Serif</string>
         </edit>
+        <edit name="hinting" mode="assign">
+            <bool>true</bool>
+        </edit>
         <edit name="autohint" mode="assign">
             <bool>true</bool>
         </edit>