Changeset 49937 in webkit

Timestamp:

Oct 22, 2009 4:52:52 AM (15 years ago)

Author:

eric@webkit.org

Message:

2009-10-22 Maxime Simon <Maxime Simon>

Reviewed by Holger Freyther.

[Haiku] Correction of the accented letter width (they were 2 characters long).
​https://bugs.webkit.org/show_bug.cgi?id=30629

• platform/graphics/haiku/SimpleFontDataHaiku.cpp: (WebCore::SimpleFontData::platformWidthForGlyph):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/haiku/SimpleFontDataHaiku.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-22  Maxime Simon  <simon.maxime@gmail.com>
+
+        Reviewed by Holger Freyther.
+
+        [Haiku] Correction of the accented letter width (they were 2 characters long).
+        https://bugs.webkit.org/show_bug.cgi?id=30629
+
+        * platform/graphics/haiku/SimpleFontDataHaiku.cpp:
+        (WebCore::SimpleFontData::platformWidthForGlyph):
+
 2009-10-21  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebCore/platform/graphics/haiku/SimpleFontDataHaiku.cpp

@@ -39 +39 @@
 #include <unicode/unorm.h>
 
+
+extern int charUnicodeToUTF8HACK(unsigned short, char*);
 
 namespace WebCore {
@@ -94 +96 @@
 float SimpleFontData::platformWidthForGlyph(Glyph glyph) const
 {
-    const char charArray[1] = { glyph };
+    if (!m_platformData.font())
+        return 0;
+
+    char charArray[4];
     float escapements[1];
 
-    if (m_platformData.font()) {
-        m_platformData.font()->GetEscapements(charArray, 1, escapements);
-        return escapements[0] * m_platformData.font()->Size();
-    }
-
-    return 0;
+    charUnicodeToUTF8HACK(glyph, charArray);
+    m_platformData.font()->GetEscapements(charArray, 1, escapements);
+    return escapements[0] * m_platformData.font()->Size();
 }