[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[bfulgham at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5369f872ca23f6fb97f21ad6bcf1034bed2679e4
Author: bfulgham at webkit.org <bfulgham at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 19 01:59:18 2009 +0000

    Build fix, no review.
    
    * page/win/FrameCairoWin.cpp: Add missing include.
    * platform/graphics/win/FontCacheWin.cpp:
    (WebCore::FontCache::createFontPlatformData): Conditionalize
      Safari-only call.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52369 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0694e82..356e0d5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-18  Brent Fulgham  <bfulgham at webkit.org>
+
+        Build fix, no review.
+
+        * page/win/FrameCairoWin.cpp: Add missing include.
+        * platform/graphics/win/FontCacheWin.cpp:
+        (WebCore::FontCache::createFontPlatformData): Conditionalize
+          Safari-only call.
+
 2009-12-16  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by Dmitry Titov.
diff --git a/WebCore/page/win/FrameCairoWin.cpp b/WebCore/page/win/FrameCairoWin.cpp
index f5b832e..3e1fe28 100644
--- a/WebCore/page/win/FrameCairoWin.cpp
+++ b/WebCore/page/win/FrameCairoWin.cpp
@@ -24,6 +24,7 @@
  */
 
 #include "config.h"
+#include "Frame.h"
 #include "FrameWin.h"
 
 #include "EditorClient.h"
diff --git a/WebCore/platform/graphics/win/FontCacheWin.cpp b/WebCore/platform/graphics/win/FontCacheWin.cpp
index 11241d0..366fa54 100644
--- a/WebCore/platform/graphics/win/FontCacheWin.cpp
+++ b/WebCore/platform/graphics/win/FontCacheWin.cpp
@@ -517,9 +517,14 @@ FontPlatformData* FontCache::createFontPlatformData(const FontDescription& fontD
     // This masks rounding errors related to the HFONT metrics being  different from the CGFont metrics.
     // FIXME: We will eventually want subpixel precision for GDI mode, but the scaled rendering doesn't
     // look as nice. That may be solvable though.
+#if PLATFORM(CG)
+    bool canCreateCGFontWithLOGFONT = wkCanCreateCGFontWithLOGFONT();
+#else
+    bool canCreateCGFontWIthLOGFONT = true;
+#endif
     LONG weight = adjustedGDIFontWeight(toGDIFontWeight(fontDescription.weight()), family);
     HFONT hfont = createGDIFont(family, weight, fontDescription.italic(),
-                                fontDescription.computedPixelSize() * (useGDI ? 1 : 32), useGDI && wkCanCreateCGFontWithLOGFONT());
+                                fontDescription.computedPixelSize() * (useGDI ? 1 : 32), useGDI && canCreateCGFontWIthLOGFONT);
 
     if (!hfont)
         return 0;

-- 
WebKit Debian packaging