| Index: Source/WebCore/platform/graphics/GlyphBuffer.h
|
| diff --git a/Source/WebCore/platform/graphics/GlyphBuffer.h b/Source/WebCore/platform/graphics/GlyphBuffer.h
|
| index 3aec08e65e0bf91d52016f5590eea35b3837a2d3..e6d9d1a6a760f064c2e4879b412c79a8a42248dc 100644
|
| --- a/Source/WebCore/platform/graphics/GlyphBuffer.h
|
| +++ b/Source/WebCore/platform/graphics/GlyphBuffer.h
|
| @@ -43,18 +43,11 @@
|
| #include <ApplicationServices/ApplicationServices.h>
|
| #endif
|
|
|
| -#if USE(CAIRO) || (PLATFORM(WX) && defined(wxUSE_CAIRO) && wxUSE_CAIRO)
|
| -#include <cairo.h>
|
| -#endif
|
| -
|
| namespace WebCore {
|
|
|
| class SimpleFontData;
|
|
|
| -#if USE(CAIRO) || (PLATFORM(WX) && defined(wxUSE_CAIRO) && wxUSE_CAIRO)
|
| -// FIXME: Why does Cairo use such a huge struct instead of just an offset into an array?
|
| -typedef cairo_glyph_t GlyphBufferGlyph;
|
| -#elif OS(WINCE)
|
| +#if OS(WINCE)
|
| typedef wchar_t GlyphBufferGlyph;
|
| #elif PLATFORM(QT)
|
| typedef quint32 GlyphBufferGlyph;
|
| @@ -131,11 +124,7 @@ public:
|
|
|
| Glyph glyphAt(int index) const
|
| {
|
| -#if USE(CAIRO) || (PLATFORM(WX) && defined(wxUSE_CAIRO) && wxUSE_CAIRO)
|
| - return m_glyphs[index].index;
|
| -#else
|
| return m_glyphs[index];
|
| -#endif
|
| }
|
|
|
| float advanceAt(int index) const
|
| @@ -156,14 +145,7 @@ public:
|
| void add(Glyph glyph, const SimpleFontData* font, float width, const FloatSize* offset = 0)
|
| {
|
| m_fontData.append(font);
|
| -
|
| -#if USE(CAIRO) || (PLATFORM(WX) && defined(wxUSE_CAIRO) && wxUSE_CAIRO)
|
| - cairo_glyph_t cairoGlyph;
|
| - cairoGlyph.index = glyph;
|
| - m_glyphs.append(cairoGlyph);
|
| -#else
|
| m_glyphs.append(glyph);
|
| -#endif
|
|
|
| #if USE(CG) || (OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM)))
|
| CGSize advance = { width, 0 };
|
| @@ -190,14 +172,7 @@ public:
|
| void add(Glyph glyph, const SimpleFontData* font, GlyphBufferAdvance advance)
|
| {
|
| m_fontData.append(font);
|
| -#if USE(CAIRO) || (PLATFORM(WX) && defined(wxUSE_CAIRO) && wxUSE_CAIRO)
|
| - cairo_glyph_t cairoGlyph;
|
| - cairoGlyph.index = glyph;
|
| - m_glyphs.append(cairoGlyph);
|
| -#else
|
| m_glyphs.append(glyph);
|
| -#endif
|
| -
|
| m_advances.append(advance);
|
| }
|
| #endif
|
|
|