[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

tony at chromium.org tony at chromium.org
Sun Feb 20 22:57:42 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 482e80c7c3f9e2049a58959ad68ad0a7d5c5f348
Author: tony at chromium.org <tony at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 14 17:35:48 2011 +0000

    2011-01-14  Tony Chang  <tony at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [chromium] update fonts.conf to fix 6 linux tests in drt
            https://bugs.webkit.org/show_bug.cgi?id=52411
    
            * platform/chromium/test_expectations.txt:
    2011-01-14  Tony Chang  <tony at chromium.org>
    
            Reviewed by Kent Tamura.
    
            [chromium] update fonts.conf to fix 6 linux tests in drt
            https://bugs.webkit.org/show_bug.cgi?id=52411
    
            * DumpRenderTree/chromium/fonts.conf: Update to match the copy in
                chromium's src/webkit/tools/test_shell/resources/fonts.conf
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75799 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b47f27d..9cc7bc3 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-14  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] update fonts.conf to fix 6 linux tests in drt
+        https://bugs.webkit.org/show_bug.cgi?id=52411
+
+        * platform/chromium/test_expectations.txt:
+
 2011-01-14  Philippe Normand  <pnormand at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index e32f492..2bd1151 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2839,11 +2839,6 @@ BUG_DRT : http/tests/misc/slow-loading-image-in-pattern.html = IMAGE
 // The first didFinishDocumentLoadForFrame line is for the previous test document.
 BUG_DRT WIN MAC LINUX : http/tests/loading/preload-img-test.html = TEXT TIMEOUT PASS
 
-// Font anti-aliasing issue
-BUG_DRT LINUX : fast/text/international/001.html = IMAGE
-BUG_DRT LINUX : fast/text/international/002.html = IMAGE
-BUG_DRT LINUX : fast/text/international/003.html = IMAGE
-
 // CJK characters are not rotated.
 BUG_DRT LINUX : svg/batik/text/verticalText.svg = IMAGE+TEXT CRASH PASS
 // Flaky since 2010-09-17?
@@ -2905,10 +2900,7 @@ BUG_DRT LINUX : fast/repaint/japanese-rl-selection-clear.html = IMAGE+TEXT
 BUG_DRT LINUX : fast/repaint/japanese-rl-selection-repaint.html = IMAGE+TEXT
 BUG_DRT LINUX : fast/repaint/repaint-across-writing-mode-boundary.html = IMAGE
 BUG_DRT LINUX : fast/table/border-changes.html = TIMEOUT PASS
-BUG_DRT LINUX : fast/text/backslash-to-yen-sign-euc.html = IMAGE
-BUG_DRT LINUX : fast/text/backslash-to-yen-sign.html = IMAGE
 BUG_DRT LINUX : fast/text/find-soft-hyphen.html = CRASH PASS
-BUG_DRT LINUX : fast/text/international/wrap-CJK-001.html = IMAGE
 BUG_DRT LINUX : fast/text/justification-padding-mid-word.html = PASS CRASH
 BUG_DRT MAC LINUX : http/tests/plugins/post-url-file.html = TIMEOUT
 BUG_DRT BUGCR8729 MAC LINUX : http/tests/multipart/invalid-image-data.html = IMAGE PASS
diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 514e482..2eaba79 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-01-14  Tony Chang  <tony at chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [chromium] update fonts.conf to fix 6 linux tests in drt
+        https://bugs.webkit.org/show_bug.cgi?id=52411
+
+        * DumpRenderTree/chromium/fonts.conf: Update to match the copy in
+            chromium's src/webkit/tools/test_shell/resources/fonts.conf
+
 2011-01-14  Eric Seidel  <eric at webkit.org>
 
         Original patch from Peter Gal  <galpater at inf.u-szeged.hu>
diff --git a/Tools/DumpRenderTree/chromium/fonts.conf b/Tools/DumpRenderTree/chromium/fonts.conf
index be214c6..b75a932 100644
--- a/Tools/DumpRenderTree/chromium/fonts.conf
+++ b/Tools/DumpRenderTree/chromium/fonts.conf
@@ -2,6 +2,10 @@
 <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
 <!-- /etc/fonts/fonts.conf file to configure system font access -->
 <fontconfig>
+  <match target="font">
+    <edit name="embeddedbitmap" mode="assign"><bool>false</bool></edit>
+  </match>
+
   <match target="pattern">
     <test qual="any" name="family">
       <string>Times</string>
@@ -152,4 +156,74 @@
       <bool>false</bool>
     </edit>
   </match>
+
+  <match target="pattern">
+    <test name="family" compare="eq">
+      <string>AutohintedSerif</string>
+    </test>
+    <edit name="family" mode="assign">
+      <string>Arial</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>Arial</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>Arial</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>SubpixelEnabledArial</string>
+    </test>
+    <edit name="family" mode="assign">
+      <string>Arial</string>
+    </edit>
+    <edit name="rgba" mode="assign">
+      <const>rgb</const>
+    </edit>
+  </match>
+
+  <match target="pattern">
+    <test name="family" compare="eq">
+      <string>SubpixelDisabledArial</string>
+    </test>
+    <edit name="family" mode="assign">
+      <string>Arial</string>
+    </edit>
+    <edit name="rgba" mode="assign">
+      <const>none</const>
+    </edit>
+  </match>
+
 </fontconfig>

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list