Changeset 46938 in webkit

Timestamp:

Aug 7, 2009 6:24:13 PM (15 years ago)

Author:

abarth@webkit.org

Message:

2009-08-07 Yong Li <​yong.li@torchmobile.com>

Reviewed by Eric Seidel.

WINCE PORT: pass unrecognized glyphs to GDI to handle
​https://bugs.webkit.org/show_bug.cgi?id=27734

• platform/graphics/FontFastPath.cpp: (WebCore::Font::glyphDataForCharacter):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontFastPath.cpp (modified) (3 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-08-07  Yong Li  <yong.li@torchmobile.com>
+
+        Reviewed by Eric Seidel.
+
+        WINCE PORT: pass unrecognized glyphs to GDI to handle
+        https://bugs.webkit.org/show_bug.cgi?id=27734
+
+        * platform/graphics/FontFastPath.cpp:
+        (WebCore::Font::glyphDataForCharacter):
+
 2009-08-07  Chris Marrin  <cmarrin@apple.com>
 

trunk/WebCore/platform/graphics/FontFastPath.cpp

@@ -2 +2 @@
  * Copyright (C) 2003, 2006 Apple Computer, Inc.
  * Copyright (C) 2008 Holger Hans Peter Freyther
+ * Copyright (C) 2009 Torch Mobile, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -156 +157 @@
         GlyphData data = fallbackPage && fallbackPage->fontDataForCharacter(c) ? fallbackPage->glyphDataForCharacter(c) : characterFontData->missingGlyphData();
         // Cache it so we don't have to do system fallback again next time.
-        if (!useSmallCapsFont)
+        if (!useSmallCapsFont) {
+#if PLATFORM(WINCE)
+            // missingGlyphData returns a null character, which is not suitable for GDI to display.
+            // Also, sometimes we cannot map a font for the character on WINCE, but GDI can still
+            // display the character, probably because the font package is not installed correctly.
+            // So we just always set the glyph to be same as the character, and let GDI solve it.
+            page->setGlyphDataForCharacter(c, c, characterFontData);
+            return page->glyphDataForCharacter(c);
+#else
             page->setGlyphDataForCharacter(c, data.glyph, data.fontData);
+#endif
+        }
         return data;
     }
@@ -164 +175 @@
     // FIXME: It would be nicer to use the missing glyph from the last resort font instead.
     GlyphData data = primaryFont()->missingGlyphData();
-    if (!useSmallCapsFont)
+    if (!useSmallCapsFont) {
+#if PLATFORM(WINCE)
+        // See comment about WINCE GDI handling near setGlyphDataForCharacter above.
+        page->setGlyphDataForCharacter(c, c, data.fontData);
+        return page->glyphDataForCharacter(c);
+#else
         page->setGlyphDataForCharacter(c, data.glyph, data.fontData);
+#endif
+    }
     return data;
 }