[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[jchaffraix at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2b8c9f567a0b70481ef386d667f1812d04be7843
Author: jchaffraix at webkit.org <jchaffraix at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 10 16:36:37 2010 +0000

    Not reviewed (build fix).
    
    * platform/graphics/win/FontCacheWin.cpp:
    (WebCore::FontCache::getLastResortFallbackFont): Return a
    SimpleFontData here.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54602 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2c1d435..80faa2c 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-02-10  Julien Chaffraix  <jchaffraix at webkit.org>
+
+        Not reviewed (build fix).
+
+        * platform/graphics/win/FontCacheWin.cpp:
+        (WebCore::FontCache::getLastResortFallbackFont): Return a
+        SimpleFontData here.
+
 2010-02-10 Julien Chaffraix  <jchaffraix at pleyo.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/platform/graphics/win/FontCacheWin.cpp b/WebCore/platform/graphics/win/FontCacheWin.cpp
index 8b082fa..8869a90 100644
--- a/WebCore/platform/graphics/win/FontCacheWin.cpp
+++ b/WebCore/platform/graphics/win/FontCacheWin.cpp
@@ -306,8 +306,8 @@ SimpleFontData* FontCache::getLastResortFallbackFont(const FontDescription& font
     // FIXME: Would be even better to somehow get the user's default font here.  For now we'll pick
     // the default that the user would get without changing any prefs.
     static AtomicString timesStr("Times New Roman");
-    if (FontPlatformData* platformFont = getCachedFontPlatformData(fontDescription, timesStr))
-        return platformFont;
+    if (SimpleFontData* simpleFont = getCachedFontData(fontDescription, timesStr))
+        return simpleFont;
 
     DEFINE_STATIC_LOCAL(String, defaultGUIFontFamily, ());
     if (defaultGUIFontFamily.isEmpty()) {

-- 
WebKit Debian packaging