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

[mrobinson at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6df588749bfdde68c26b1f0ba44ce343fb34693c
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 7 23:57:42 2010 +0000

    2010-10-07  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] The FreeType backend does not respect the FC_EMBOLDEN property
            https://bugs.webkit.org/show_bug.cgi?id=46216
    
            Fix a baseline that was merged improperly.
    
            * platform/gtk/fonts/fontconfig-synthetic-bold-expected.txt: Fix baseline.
    2010-10-07  Martin Robinson  <mrobinson at igalia.com>
    
            Reviewed by Gustavo Noronha Silva.
    
            [GTK] The FreeType backend does not respect the FC_EMBOLDEN property
            https://bugs.webkit.org/show_bug.cgi?id=46216
    
            Fix my latest commit, as it contained some bad changes from a merge gone wrong.
    
            * DumpRenderTree/gtk/DumpRenderTree.cpp:
            (initializeFonts): Also initialize the DevaVu Sans font.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69355 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 237d632..50bb626 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-07  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] The FreeType backend does not respect the FC_EMBOLDEN property
+        https://bugs.webkit.org/show_bug.cgi?id=46216
+
+        Fix a baseline that was merged improperly.
+
+        * platform/gtk/fonts/fontconfig-synthetic-bold-expected.txt: Fix baseline.
+
 2010-10-07  Ryosuke Niwa  <rniwa at webkit.org>
 
         Reviewed by Tony Chang.
diff --git a/LayoutTests/platform/gtk/fonts/fontconfig-synthetic-bold-expected.txt b/LayoutTests/platform/gtk/fonts/fontconfig-synthetic-bold-expected.txt
index 71f2874..db4875e 100644
--- a/LayoutTests/platform/gtk/fonts/fontconfig-synthetic-bold-expected.txt
+++ b/LayoutTests/platform/gtk/fonts/fontconfig-synthetic-bold-expected.txt
@@ -1,4 +1,5 @@
-layer at (0,0) size 800x600 RenderView at (0,0) size 800x600
+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
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 65dd528..9108ea1 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-07  Martin Robinson  <mrobinson at igalia.com>
+
+        Reviewed by Gustavo Noronha Silva.
+
+        [GTK] The FreeType backend does not respect the FC_EMBOLDEN property
+        https://bugs.webkit.org/show_bug.cgi?id=46216
+
+        Fix my latest commit, as it contained some bad changes from a merge gone wrong.
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (initializeFonts): Also initialize the DevaVu Sans font.
+
 2010-10-07  Daniel Cheng  <dcheng at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
index 521a0e1..1a7427e 100644
--- a/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
+++ b/WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp
@@ -177,6 +177,8 @@ static void initializeFonts()
           "/usr/share/fonts/liberation/LiberationSerif-Regular.ttf", },
         { "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf",
           "/usr/share/fonts/dejavu/DejaVuSans.ttf", },
+        { "/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf",
+          "/usr/share/fonts/dejavu/DejaVuSerif.ttf", },
     };
 
     // TODO: Some tests use Lucida. We should load these as well, once it becomes

-- 
WebKit Debian packaging