Changeset 41366 in webkit

Timestamp:

Mar 2, 2009, 1:55:51 PM (16 years ago)

Author:

mitz@apple.com

Message:

Reviewed by Adam Roben.

• fix ​https://bugs.webkit.org/show_bug.cgi?id=21811 REGRESSION: Windows Build Not Selecting Proper Font

• platform/graphics/win/FontCacheWin.cpp: (WebCore::createGDIFont): Added back code to verify that the created HFONT has the requested face name.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/win/FontCacheWin.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-03-02  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Adam Roben.
+
+        - fix https://bugs.webkit.org/show_bug.cgi?id=21811
+          REGRESSION: Windows Build Not Selecting Proper Font
+
+        * platform/graphics/win/FontCacheWin.cpp:
+        (WebCore::createGDIFont): Added back code to verify that the created
+        HFONT has the requested face name.
+
 2009-03-02  Timothy Hatcher  <timothy@apple.com>
 

trunk/WebCore/platform/graphics/win/FontCacheWin.cpp

@@ -423 +423 @@
     matchData.m_chosen.lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;
 
-    return CreateFontIndirect(&matchData.m_chosen);
+    HFONT result = CreateFontIndirect(&matchData.m_chosen);
+    if (!result)
+        return 0;
+
+    HDC dc = GetDC(0);
+    SaveDC(dc);
+    SelectObject(dc, result);
+    WCHAR actualName[LF_FACESIZE];
+    GetTextFace(dc, LF_FACESIZE, actualName);
+    RestoreDC(dc, -1);
+    ReleaseDC(0, dc);
+
+    if (wcsicmp(matchData.m_chosen.lfFaceName, actualName)) {
+        DeleteObject(result);
+        result = 0;
+    }
+
+    return result;
 }