Changeset 76679 in webkit

Timestamp:

Jan 26, 2011 2:12:50 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-01-26 Hironori Bono <​hbono@chromium.org>

Reviewed by Kent Tamura.

A speculative fix for Bug 52422 - [chromium] More crash in
FontFallbackList::determinePitch(const Font* font)
​https://bugs.webkit.org/show_bug.cgi?id=52422

My previous change may not work on non-US Windows whose system fonts
have localized aliases matching to the system locale because of a
font-name mismatch in createFontIndirectAndGetWinName(). This change
tries all the fonts installed in a PC and returns the first font that we
can create without errors.

• platform/graphics/chromium/FontCacheChromiumWin.cpp: (WebCore::GetLastResortFallbackFontProcData::GetLastResortFallbackFontProcData): Added a struct used for getLastResortFallbackFontProc(). (WebCore::getLastResortFallbackFontProc): Added a callback for EnumFontFamilies(). (WebCore::FontCache::getLastResortFallbackFont): Use EnumFontFamilies() to find a last-resort font.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/FontCacheChromiumWin.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-26  Hironori Bono  <hbono@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        A speculative fix for Bug 52422 - [chromium] More crash in
+        FontFallbackList::determinePitch(const Font* font)
+        https://bugs.webkit.org/show_bug.cgi?id=52422
+
+        My previous change may not work on non-US Windows whose system fonts
+        have localized aliases matching to the system locale because of a
+        font-name mismatch in createFontIndirectAndGetWinName(). This change
+        tries all the fonts installed in a PC and returns the first font that we
+        can create without errors.
+
+        * platform/graphics/chromium/FontCacheChromiumWin.cpp:
+        (WebCore::GetLastResortFallbackFontProcData::GetLastResortFallbackFontProcData):
+        Added a struct used for getLastResortFallbackFontProc().
+        (WebCore::getLastResortFallbackFontProc): Added a callback for EnumFontFamilies().
+        (WebCore::FontCache::getLastResortFallbackFont): Use EnumFontFamilies() to find a last-resort font.
+
 2011-01-26  James Robinson  <jamesr@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/FontCacheChromiumWin.cpp

@@ -400 +400 @@
 }
 
+struct GetLastResortFallbackFontProcData {
+    GetLastResortFallbackFontProcData(FontCache* fontCache, const FontDescription* fontDescription, wchar_t* fontName)
+        : m_fontCache(fontCache)
+        , m_fontDescription(fontDescription)
+        , m_fontName(fontName)
+        , m_fontData(0)
+    {
+    }
+
+    FontCache* m_fontCache;
+    const FontDescription* m_fontDescription;
+    wchar_t* m_fontName;
+    SimpleFontData* m_fontData;
+};
+
+static int CALLBACK getLastResortFallbackFontProc(const LOGFONT* logFont, const TEXTMETRIC* metrics, DWORD fontType, LPARAM lParam)
+{
+    GetLastResortFallbackFontProcData* procData = reinterpret_cast<GetLastResortFallbackFontProcData*>(lParam);
+    procData->m_fontData = fontDataFromDescriptionAndLogFont(procData->m_fontCache, *procData->m_fontDescription, *logFont, procData->m_fontName);
+    return !procData->m_fontData;
+}
+
 void FontCache::platformInit()
 {
@@ -549 +571 @@
     }
 
+    // Fall back to all the fonts installed in this PC. When a font has a
+    // localized name according to the system locale as well as an English name,
+    // both GetTextFace() and EnumFontFamilies() return the localized name. So,
+    // FontCache::createFontPlatformData() does not filter out the fonts
+    // returned by this EnumFontFamilies() call.
+    HDC dc = GetDC(0);
+    if (dc) {
+        GetLastResortFallbackFontProcData procData(this, &description, fallbackFontName);
+        EnumFontFamilies(dc, 0, getLastResortFallbackFontProc, reinterpret_cast<LPARAM>(&procData));
+        ReleaseDC(0, dc);
+
+        if (procData.m_fontData)
+            return procData.m_fontData;
+    }
+
     ASSERT_NOT_REACHED();
     return 0;