Consolidate Glyph and GlyphBufferGlyph.

Source/platform/fonts/mac/FontMac.cpp

 /*
  * Copyright (c) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 65 matching lines @@
         paint->setHinting(SkPaint::kNo_Hinting);
 }
 
 // TODO: This needs to be split into helper functions to better scope the
 // inputs/outputs, and reduce duplicate code.
 // This issue is tracked in https://bugs.webkit.org/show_bug.cgi?id=62989
 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;
 
     switch (fontDescription().fontSmoothing()) {
     case Antialiased:
         shouldSmoothFonts = false;
         break;
     case SubpixelAntialiased:
         break;
     case NoSmoothing:
         shouldAntialias = false;
         shouldSmoothFonts = false;
         break;
     case AutoSmoothing:
         // For the AutoSmooth case, don't do anything! Keep the default settings.
         break;
     }
 
     if (isRunningLayoutTest()) {
         shouldSmoothFonts = false;
         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());
 
     if (font->platformData().orientation() == Vertical)
         y += SkFloatToScalar(font->fontMetrics().floatAscent(IdeographicBaseline) - font->fontMetrics().floatAscent());
     // FIXME: text rendering speed:
     // Android has code in their WebCore fork to special case when the
     // GlyphBuffer has no advances other than the defaults. In that case the
     // text drawing can proceed faster. However, it's unclear when those
     // patches may be upstreamed to WebKit so we always use the slower path
@@ skipping 18 matching lines @@
     }
     TextDrawingModeFlags textMode = gc->textDrawingMode();
 
     // We draw text up to two times (once for fill, once for stroke).
     if (textMode & TextModeFill) {
         SkPaint paint = gc->fillPaint();
         setupPaint(&paint, font, this, shouldAntialias, shouldSmoothFonts);
         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)
         && gc->strokeStyle() != NoStroke
         && gc->strokeThickness() > 0) {
 
         SkPaint paint = gc->strokePaint();
         setupPaint(&paint, font, this, shouldAntialias, shouldSmoothFonts);
         gc->adjustTextRenderMode(&paint);
         paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
 
         if (textMode & TextModeFill) {
             // If we also filled, we don't want to draw shadows twice.
             // See comment in FontHarfBuzz.cpp::paintGlyphs() for more details.
             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();
 }
 
 } // namespace WebCore