Changeset 23539

Timestamp:

2007-06-14 14:58:39 (1 year ago)

Author:

hyatt

Message:

Fix for missing text in non-English Windows installs.

Files:

• trunk/WebCore/ChangeLog (modified) (1 diff)
• trunk/WebCore/platform/win/FontCacheWin.cpp (modified) (1 diff)
• trunk/WebCore/platform/win/FontPlatformDataWin.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-06-14  Dave Hyatt  <hyatt@apple.com>
+
+        Fix for Bugzilla bug 14806, missing text for bold/italic fonts in non-English Windows installs.
+        
+        This patch adds an additional step after the lookup by full name fails.  It will then look up
+        a PostScript name in a (localized full name) -> (PostScript name) cache.  If the name is not
+        found, then the font's name table is obtained and searched for a PostScript name (and the
+        result is cached).
+        
+        If lookup on PostScript name fails too, then we now properly fall back to the next font in the
+        list (so text should never be missing).
+
+        Reviewed by Darin (thoroughly reviewed, super reviewed even)
+
+        * platform/win/FontCacheWin.cpp:
+        * platform/win/FontPlatformDataWin.cpp:
+
-2007-06-14  Anders Carlsson  <andersca@apple.com>
-

trunk/WebCore/platform/win/FontCacheWin.cpp

@@ -159 +159 @@
-    }
-    
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

trunk/WebCore/platform/win/FontPlatformDataWin.cpp

@@ -24 +24 @@
-#include "config.h"
-#include "FontPlatformData.h"
+
+#include "PlatformString.h"
+#include "StringHash.h"
-#include <ApplicationServices/ApplicationServices.h>
+#include <wtf/HashMap.h>
+#include <wtf/RetainPtr.h>
+#include <wtf/Vector.h>
-
-using std::min;
@@ -33 +39 @@
-static const int Italic = (1 << 1);
-static const int BoldOblique = (1 << 2);
+
+static inline USHORT readBigEndianWord(const BYTE* word) { return (word[0] << 8) | word[1]; }
+
+static CFStringRef getPostScriptName(CFStringRef faceName, HDC dc)
+{
+    const DWORD cMaxNameTableSize = 1024 * 1024;
+
+    static HashMap<String, RetainPtr<CFStringRef> > nameMap;
+
+    // Check our hash first.
+    String faceString(faceName);
+    RetainPtr<CFStringRef> result = nameMap.get(faceString);
+    if (result)
+        return result.get();
+
+    // We need to obtain the PostScript name from the name table and use it instead,.
+    DWORD bufferSize = GetFontData(dc, 'eman', 0, NULL, 0); // "name" backwards
+    if (bufferSize == 0 || bufferSize == GDI_ERROR || bufferSize > cMaxNameTableSize)
+        return NULL;
+   
+    Vector<BYTE> bufferVector(bufferSize);
+    BYTE* buffer = bufferVector.data();
+    if (GetFontData(dc, 'eman', 0, buffer, bufferSize) == GDI_ERROR)
+        return NULL;
+
+    if (bufferSize < 6)
+        return NULL;
+
+    USHORT numberOfRecords = readBigEndianWord(buffer + 2);
+    UINT stringsOffset = readBigEndianWord(buffer + 4);
+    if (bufferSize < stringsOffset)
+        return NULL;
+
+    BYTE* strings = buffer + stringsOffset;
+
+    // Now walk each name record looking for a Mac or Windows PostScript name.
+    UINT offset = 6;
+    for (int i = 0; i < numberOfRecords; i++) {
+        if (bufferSize < offset + 12)
+            return NULL;
+
+        USHORT platformID = readBigEndianWord(buffer + offset);
+        USHORT encodingID = readBigEndianWord(buffer + offset + 2);
+        USHORT languageID = readBigEndianWord(buffer + offset + 4);
+        USHORT nameID = readBigEndianWord(buffer + offset + 6);
+        USHORT length = readBigEndianWord(buffer + offset + 8);
+        USHORT nameOffset = readBigEndianWord(buffer + offset + 10);
+
+        if (platformID == 3 && encodingID == 1 && languageID == 0x409 && nameID == 6) {
+            // This is a Windows PostScript name and is therefore UTF-16.
+            // Pass Big Endian as the encoding.
+            if (bufferSize < stringsOffset + nameOffset + length)
+                return NULL;
+            result.adoptCF(CFStringCreateWithBytes(NULL, strings + nameOffset, length, kCFStringEncodingUTF16BE, false));
+            break;
+        } else if (platformID == 1 && encodingID == 0 && languageID == 0 && nameID == 6) {
+            // This is a Mac PostScript name and is therefore ASCII.
+            // See http://developer.apple.com/textfonts/TTRefMan/RM06/Chap6name.html
+            if (bufferSize < stringsOffset + nameOffset + length)
+                return NULL;
+            result.adoptCF(CFStringCreateWithBytes(NULL, strings + nameOffset, length, kCFStringEncodingASCII, false));
+            break;
+        }
+
+        offset += 12;
+    }
+
+    if (result)
+        nameMap.set(faceString, result);
+    return result.get();
+}
-
-static int CALLBACK enumStylesCallback(const LOGFONT* logFont, const TEXTMETRIC* metrics, DWORD fontType, LPARAM lParam)
@@ -67 +144 @@
-    ASSERT_WITH_MESSAGE(bufferSize != 0, "Bitmap fonts not supported with CoreGraphics.");
-
-
-
+
-        OUTLINETEXTMETRICW* metrics = (OUTLINETEXTMETRICW*)malloc(bufferSize);
-
@@ -103 +179 @@
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        free(metrics);
-    }