Changeset 58068 in webkit

Timestamp:

Apr 22, 2010 12:29:58 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-22 Stephan Aßmus <​superstippi@gmx.de>

Reviewed by David Levin.

[Haiku] Improve SimpleFontDataHaiku
​https://bugs.webkit.org/show_bug.cgi?id=37411

Covered by existing tests.

• platform/graphics/haiku/SimpleFontDataHaiku.cpp:
  • Cleaned up includes
  • Removed prototype "charUnicodeToUTF8HACK"

(WebCore::SimpleFontData::platformInit):

• Use const BFont pointer

(WebCore::SimpleFontData::smallCapsFontData):

• "fontPlatformData" was leaked. It is only used as the key for the font cache lookup.

(WebCore::SimpleFontData::platformMetricsForGlyph):

• Use existing WebCore encoding infrastructure instead of adding a hack for Haiku.

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-22  Stephan Aßmus  <superstippi@gmx.de>
+
+        Reviewed by David Levin.
+
+        [Haiku] Improve SimpleFontDataHaiku
+        https://bugs.webkit.org/show_bug.cgi?id=37411
+
+        Covered by existing tests.
+
+        * platform/graphics/haiku/SimpleFontDataHaiku.cpp:
+            - Cleaned up includes
+            - Removed prototype "charUnicodeToUTF8HACK"
+        (WebCore::SimpleFontData::platformInit):
+            - Use const BFont pointer
+        (WebCore::SimpleFontData::smallCapsFontData):
+            - "fontPlatformData" was leaked. It is only
+              used as the key for the font cache lookup.
+        (WebCore::SimpleFontData::platformMetricsForGlyph):
+            - Use existing WebCore encoding infrastructure
+              instead of adding a hack for Haiku. 
+
 2010-04-21  Steve Block  <steveblock@google.com>
 

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

@@ -35 +35 @@
 #include "FontDescription.h"
 #include "NotImplemented.h"
-#include <Rect.h>
-#include <unicode/uchar.h>
-#include <unicode/unorm.h>
+#include "TextEncoding.h"
+#include <wtf/text/CString.h>
 
-
-extern int charUnicodeToUTF8HACK(unsigned short, char*);
 
 namespace WebCore {
@@ -46 +43 @@
 void SimpleFontData::platformInit()
 {
-    BFont* font = m_platformData.font();
+    const BFont* font = m_platformData.font();
     if (!font)
         return;
@@ -77 +74 @@
         FontDescription desc = FontDescription(fontDescription);
         desc.setSpecifiedSize(0.70f * fontDescription.computedSize());
-        const FontPlatformData* fontPlatformData = new FontPlatformData(desc, desc.family().family());
-        m_smallCapsFontData = new SimpleFontData(*fontPlatformData);
+        FontPlatformData fontPlatformData(desc, desc.family().family());
+        m_smallCapsFontData = new SimpleFontData(fontPlatformData);
     }
     return m_smallCapsFontData;
@@ -96 +93 @@
 GlyphMetrics SimpleFontData::platformMetricsForGlyph(Glyph glyph, GlyphMetricsMode) const
 {
+    GlyphMetrics metrics;
     if (!m_platformData.font())
-        return 0;
+        return metrics;
 
-    char charArray[4];
+    CString encoded = UTF8Encoding().encode(static_cast<UChar*>(&glyph), 1,
+                                            URLEncodedEntitiesForUnencodables);
     float escapements[1];
-
-    charUnicodeToUTF8HACK(glyph, charArray);
-    m_platformData.font()->GetEscapements(charArray, 1, escapements);
-    GlyphMetrics metrics;
+    m_platformData.font()->GetEscapements(encoded.data(), 1, escapements);
     metrics.horizontalAdvance = escapements[0] * m_platformData.font()->Size();
     return metrics;