Changeset 25611 in webkit

Timestamp:

Sep 17, 2007 5:36:51 PM (17 years ago)

Author:

hyatt

Message:

Fix for 14743, missing glyphs because of mlang's tiny font cache.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/FontData.h (modified) (2 diffs)
• platform/win/FontCacheWin.cpp (modified) (1 diff)
• platform/win/FontDataWin.cpp (modified) (2 diffs)
• platform/win/UniscribeController.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-09-17  Dave Hyatt  <hyatt@apple.com>
+
+        Fix for bug 14743, missing glyphs on many international sites because of MLang's tiny cache.
+        
+        Bypass Mlang's cache entirely.  Get the mapped font from MLang, obtain the font name, and then feed
+        the name back into our own system so that it gets created and cached again without MLang being involved.
+        Then free up the font obtained from MLang immediately so that its cache just remains empty.
+           
+        Reviewed by aroben
+
+        * platform/FontData.h:
+        (WebCore::FontData::isSystemFont):
+        * platform/win/FontCacheWin.cpp:
+        (WebCore::FontCache::getFontDataForCharacters):
+        * platform/win/FontDataWin.cpp:
+        (WebCore::FontData::platformInit):
+        (WebCore::FontData::platformDestroy):
+        * platform/win/UniscribeController.cpp:
+        (WebCore::UniscribeController::shapeAndPlaceItem):
+        
 2007-09-17  Adam Roben  <aroben@apple.com>
 

trunk/WebCore/platform/FontData.h

@@ -86 +86 @@
 #if PLATFORM(WIN)
     bool isSystemFont() const { return m_isSystemFont; }
-    void setIsMLangFont() { m_isMLangFont = true; }
     SCRIPT_FONTPROPERTIES* scriptFontProperties() const;
     SCRIPT_CACHE* scriptCache() const { return &m_scriptCache; }
@@ -132 +131 @@
 
 #if PLATFORM(WIN)
-    bool m_isMLangFont;
     bool m_isSystemFont;
     mutable SCRIPT_CACHE m_scriptCache;

trunk/WebCore/platform/win/FontCacheWin.cpp

@@ -85 +85 @@
         HFONT result;
         if (langFontLink->MapFont(hdc, actualCodePages, characters[0], &result) == S_OK) {
-            // MLang has an internal cache, which means it really will hand back the same HFONT pointer if it can.  We can
-            // therefore safely use our hash on HFONT pointers (FontPlatformData -> FontData) and actually expect it to work.
-            FontPlatformData platformData(result, font.fontDescription().computedPixelSize(), font.fontDescription().bold(), font.fontDescription().italic());
-            fontData = getCachedFontData(&platformData);
-            fontData->setIsMLangFont();
+            // Fill in a log font with the returned font from MLang, and then use that to create a new font.
+            LOGFONT lf;
+            GetObject(result, sizeof(LOGFONT), &lf);
+            langFontLink->ReleaseFont(result);
+
+            HFONT hfont = CreateFontIndirect(&lf);
+            SelectObject(hdc, hfont);
+
+            WCHAR name[LF_FACESIZE];
+            GetTextFace(hdc, LF_FACESIZE, name);
+            
+            String familyName(name);
+            if (!familyName.isEmpty()) {
+                FontPlatformData* result = getCachedFontPlatformData(font.fontDescription(), familyName);
+                if (result)
+                    return getCachedFontData(result);
+            }
         }
     }

trunk/WebCore/platform/win/FontDataWin.cpp

@@ -59 +59 @@
     GetTextFace(dc, faceLength, faceName.data());
 
-    m_isMLangFont = false;
-
     m_syntheticBoldOffset = m_font.syntheticBold() ? 1.0f : 0.f;
 
@@ -114 +112 @@
 {
     CGFontRelease(m_font.cgFont());
-
-    if (m_isMLangFont) {
-        // We have to release the font instead of just deleting it, since we didn't make it.
-        IMLangFontLink2* langFontLink = FontCache::getFontLinkInterface();
-        if (langFontLink)
-            langFontLink->ReleaseFont(m_font.hfont());
-    } else
-        DeleteObject(m_font.hfont());
+    DeleteObject(m_font.hfont());
 
     // We don't hash this on Win32, so it's effectively owned by us.

trunk/WebCore/platform/win/UniscribeController.cpp

@@ -244 +244 @@
 
     // We now have a collection of glyphs.
-    // FIXME: Use the cluster and visual attr information to do letter-spacing, word-spacing
-    // and justification.
-    // FIXME: Support rounding hacks.
-    // FIXME: Support smallcaps (re-itemize and re-shape to do this?).
     Vector<GOFFSET> offsets;
     Vector<int> advances;