Remove Cairo support.

Source/WebCore/platform/graphics/GlyphBuffer.h

 /*
  * Copyright (C) 2006, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2007-2008 Torch Mobile Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer. 
@@ skipping 25 matching lines @@
 #include <wtf/Vector.h>
 
 #if USE(CG)
 #include <CoreGraphics/CGGeometry.h>
 #endif
 
 #if OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM))
 #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;
 #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 USE(CG) || (OS(DARWIN) && (PLATFORM(WX) || PLATFORM(CHROMIUM)))
@@ skipping 56 matching lines @@
 
     GlyphBufferGlyph* glyphs(int from) { return m_glyphs.data() + from; }
     GlyphBufferAdvance* advances(int from) { return m_advances.data() + from; }
     const GlyphBufferGlyph* glyphs(int from) const { return m_glyphs.data() + from; }
     const GlyphBufferAdvance* advances(int from) const { return m_advances.data() + from; }
 
     const SimpleFontData* fontDataAt(int index) const { return m_fontData[index]; }
     
     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
     {
         return m_advances[index].width();
     }
 
     FloatSize offsetAt(int index) const
     {
 #if PLATFORM(WIN)
         return m_offsets[index];
 #else
         UNUSED_PARAM(index);
         return FloatSize();
 #endif
     }
 
     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 };
         m_advances.append(advance);
 #elif OS(WINCE)
         m_advances.append(width);
 #elif PLATFORM(QT)
         m_advances.append(QPointF(width, 0));
 #else
         m_advances.append(FloatSize(width, 0));
 #endif
 
 #if PLATFORM(WIN)
         if (offset)
             m_offsets.append(*offset);
         else
             m_offsets.append(FloatSize());
 #else
         UNUSED_PARAM(offset);
 #endif
     }
     
 #if !OS(WINCE)
     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
 
     void reverse(int from, int length)
     {
         for (int i = from, end = from + length - 1; i < end; ++i, --end)
             swap(i, end);
     }
 
@@ skipping 29 matching lines @@
     Vector<const SimpleFontData*, 2048> m_fontData;
     Vector<GlyphBufferGlyph, 2048> m_glyphs;
     Vector<GlyphBufferAdvance, 2048> m_advances;
 #if PLATFORM(WIN)
     Vector<FloatSize, 2048> m_offsets;
 #endif
 };
 
 }
 #endif