From 49233e234e5c787396cadb2cea33b31ae0cd65c1 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Wed, 20 Jun 2012 13:01:08 +0200
Subject: Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327
 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes
---
 Tools/DumpRenderTree/chromium/fonts.conf | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'Tools/DumpRenderTree/chromium/fonts.conf')

diff --git a/Tools/DumpRenderTree/chromium/fonts.conf b/Tools/DumpRenderTree/chromium/fonts.conf
index b75a9322e..8e4f8d712 100644
--- a/Tools/DumpRenderTree/chromium/fonts.conf
+++ b/Tools/DumpRenderTree/chromium/fonts.conf
@@ -226,4 +226,17 @@
     </edit>
   </match>
 
+  <match target="pattern">
+    <!-- FontConfig doesn't currently provide a well-defined way to turn on
+         subpixel positioning.  This is just an arbitrary pattern to use after
+         turning subpixel positioning on globally to ensure that we don't have
+         issues with our style getting cached for other tests. -->
+    <test name="family" compare="eq">
+      <string>SubpixelPositioning</string>
+    </test>
+    <edit name="family" mode="assign">
+      <string>Times New Roman</string>
+    </edit>
+  </match>
+
 </fontconfig>
-- 
cgit v1.2.1