Changeset 437 for trunk/BAL/WKAL/Concretizations/Fonts/WK/BCGlyphBufferWK.h

Timestamp:

08/15/08 13:25:16 (5 months ago)

Author:

mbensi

Message:

merge with webkit revision 35774

Files:

• trunk/BAL/WKAL/Concretizations/Fonts/WK/BCGlyphBufferWK.h (modified) (4 diffs)

trunk/BAL/WKAL/Concretizations/Fonts/WK/BCGlyphBufferWK.h

@@ -45 +45 @@
-class SimpleFontData;
-
+#if PLATFORM(CAIRO)
+// FIXME: Why does Cairo use such a huge struct instead of just an offset into an array?
+typedef cairo_glyph_t GlyphBufferGlyph;
+#else
+typedef Glyph GlyphBufferGlyph;
+#endif
+
+// CG uses CGSize instead of FloatSize so that the result of advances()
+// can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm
-#if PLATFORM(CG)
-typedef Glyph GlyphBufferGlyph;
-typedef CGSize GlyphBufferAdvance;
-
-
-
-
-
-
-
-
+
-typedef FloatSize GlyphBufferAdvance;
-#endif
@@ -104 +105 @@
-    Glyph glyphAt(int index) const
-    {
-
+
+
+
-        return m_glyphs[index];
-#elif PLATFORM(CAIRO)
-        return m_glyphs[index].index;
-#endif
-    }
@@ -115 +116 @@
-#if PLATFORM(CG)
-        return m_advances[index].width;
-if PLATFORM(CAIRO) || PLATFORM(QT) || PLATFORM(WX)
+se
-        return m_advances[index].width();
-#endif
@@ -132 +133 @@
-    {
-        m_fontData.append(font);
-
-
-
-
-
-
-
+
-        cairo_glyph_t cairoGlyph;
-        cairoGlyph.index = glyph;
-        m_glyphs.append(cairoGlyph);
-
-
+
-        m_glyphs.append(glyph);
+#endif
+
+#if PLATFORM(CG)
+        CGSize advance = { width, 0 };
+        m_advances.append(advance);
+#else
-        m_advances.append(FloatSize(width, 0));
-#endif
+
-#if PLATFORM(WIN)
-        if (offset)