Consolidate Glyph and GlyphBufferGlyph.

Source/platform/fonts/mac/FontMac.cpp

Index: Source/platform/fonts/mac/FontMac.cpp
diff --git a/Source/platform/fonts/mac/FontMac.cpp b/Source/platform/fonts/mac/FontMac.cpp
index 5ce7c8aaec62473b479306350397bee9b07b987c..91314f00df0a0a14f2a6efbd9d5735c52527c51c 100644
--- a/Source/platform/fonts/mac/FontMac.cpp
+++ b/Source/platform/fonts/mac/FontMac.cpp
@@ -83,8 +83,6 @@ void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font,
     const GlyphBuffer& glyphBuffer, unsigned from, unsigned numGlyphs,
     const FloatPoint& point, const FloatRect& textRect) const
 {
-    COMPILE_ASSERT(sizeof(GlyphBufferGlyph) == sizeof(uint16_t), GlyphBufferGlyphSize_equals_uint16_t);
-
     bool shouldSmoothFonts = true;
     bool shouldAntialias = true;
 
@@ -108,7 +106,7 @@ void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font,
         shouldAntialias = shouldAntialias && isFontAntialiasingEnabledForTest();
     }
 
-    const GlyphBufferGlyph* glyphs = glyphBuffer.glyphs(from);
+    const Glyph* glyphs = glyphBuffer.glyphs(from);
     SkScalar x = SkFloatToScalar(point.x());
     SkScalar y = SkFloatToScalar(point.y());
 
@@ -147,7 +145,7 @@ void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font,
         gc->adjustTextRenderMode(&paint);
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
 
-        gc->drawPosText(glyphs, numGlyphs * sizeof(uint16_t), pos, textRect, paint);
+        gc->drawPosText(glyphs, numGlyphs * sizeof(Glyph), pos, textRect, paint);
     }
 
     if ((textMode & TextModeStroke)
@@ -165,7 +163,7 @@ void Font::drawGlyphs(GraphicsContext* gc, const SimpleFontData* font,
             paint.setLooper(0);
         }
 
-        gc->drawPosText(glyphs, numGlyphs * sizeof(uint16_t), pos, textRect, paint);
+        gc->drawPosText(glyphs, numGlyphs * sizeof(Glyph), pos, textRect, paint);
     }
     if (font->platformData().orientation() == Vertical)
         gc->restore();