Consolidate Glyph and GlyphBufferGlyph.

Source/platform/fonts/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 24 matching lines @@
 #include "wtf/Vector.h"
 
 #if OS(MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
 namespace WebCore {
 
 class SimpleFontData;
 
-typedef Glyph GlyphBufferGlyph;
-
 // CG uses CGSize instead of FloatSize so that the result of advances()
 // can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm
 #if OS(MACOSX)
 struct GlyphBufferAdvance : CGSize {
 public:
     GlyphBufferAdvance(CGSize size) : CGSize(size)
     {
     }
 
     void setWidth(CGFloat width) { this->CGSize::width = width; }
     CGFloat width() const { return this->CGSize::width; }
     CGFloat height() const { return this->CGSize::height; }
 };
 #else
 typedef FloatSize GlyphBufferAdvance;
 #endif
 
 class GlyphBuffer {
 public:
     bool isEmpty() const { return m_fontData.isEmpty(); }
     unsigned size() const { return m_fontData.size(); }
 
     void clear()
     {
         m_fontData.clear();
         m_glyphs.clear();
         m_advances.clear();
     }
 
-    GlyphBufferGlyph* glyphs(unsigned from) { return m_glyphs.data() + from; }
+    Glyph* glyphs(unsigned from) { return m_glyphs.data() + from; }
     GlyphBufferAdvance* advances(unsigned from) { return m_advances.data() + from; }
-    const GlyphBufferGlyph* glyphs(unsigned from) const { return m_glyphs.data() + from; }
+    const Glyph* glyphs(unsigned from) const { return m_glyphs.data() + from; }
     const GlyphBufferAdvance* advances(unsigned from) const { return m_advances.data() + from; }
 
     const SimpleFontData* fontDataAt(unsigned index) const { return m_fontData[index]; }
 
     Glyph glyphAt(unsigned index) const
     {
         return m_glyphs[index];
     }
 
     FloatSize advanceAt(unsigned index) const
@@ skipping 38 matching lines @@
         lastAdvance.setWidth(lastAdvance.width() + width);
     }
 
 private:
     void swap(unsigned index1, unsigned index2)
     {
         const SimpleFontData* f = m_fontData[index1];
         m_fontData[index1] = m_fontData[index2];
         m_fontData[index2] = f;
 
-        GlyphBufferGlyph g = m_glyphs[index1];
+        Glyph g = m_glyphs[index1];
         m_glyphs[index1] = m_glyphs[index2];
         m_glyphs[index2] = g;
 
         GlyphBufferAdvance s = m_advances[index1];
         m_advances[index1] = m_advances[index2];
         m_advances[index2] = s;
     }
 
     Vector<const SimpleFontData*, 2048> m_fontData;
-    Vector<GlyphBufferGlyph, 2048> m_glyphs;
+    Vector<Glyph, 2048> m_glyphs;
     Vector<GlyphBufferAdvance, 2048> m_advances;
 };
 
 }
 #endif