Remove GlyphBuffer

third_party/WebKit/Source/platform/fonts/shaping/CachingWordShaper.cpp

 /*
  * Copyright (C) 2015 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 71 matching lines @@
 
 int CachingWordShaper::offsetForPosition(const TextRun& run,
                                          float targetX,
                                          bool includePartialGlyphs) {
   ShapeResultBuffer buffer;
   shapeResultsForRun(shapeCache(), &m_font, run, &buffer);
 
   return buffer.offsetForPosition(run, targetX, includePartialGlyphs);
 }
 
-float CachingWordShaper::fillGlyphBuffer(
-    const TextRun& run,
-    GlyphBuffer* glyphBuffer,
-    unsigned from,
-    unsigned to) {
+float CachingWordShaper::fillGlyphs(const TextRunPaintInfo& runInfo,
+                                    ShapeResultBloberizer& bloberizer) {
   ShapeResultBuffer buffer;
-  shapeResultsForRun(shapeCache(), &m_font, run, &buffer);
+  shapeResultsForRun(shapeCache(), &m_font, runInfo.run, &buffer);
 
-  return buffer.fillGlyphBuffer(glyphBuffer, run, from, to);
+  return buffer.fillGlyphs(runInfo, bloberizer);
 }
 
-float CachingWordShaper::fillGlyphBufferForTextEmphasis(
-    const TextRun& run,
-    const GlyphData* emphasisData,
-    GlyphBuffer* glyphBuffer,
-    unsigned from,
-    unsigned to) {
+void CachingWordShaper::fillTextEmphasisGlyphs(
+    const TextRunPaintInfo& runInfo,
+    const GlyphData& emphasisData,
+    ShapeResultBloberizer& bloberizer) {
   ShapeResultBuffer buffer;
-  shapeResultsForRun(shapeCache(), &m_font, run, &buffer);
+  shapeResultsForRun(shapeCache(), &m_font, runInfo.run, &buffer);
 
-  return buffer.fillGlyphBufferForTextEmphasis(glyphBuffer, run, emphasisData,
-                                               from, to);
+  buffer.fillTextEmphasisGlyphs(runInfo, emphasisData, bloberizer);
 }
 
 CharacterRange CachingWordShaper::getCharacterRange(const TextRun& run,
                                                     unsigned from,
                                                     unsigned to) {
   ShapeResultBuffer buffer;
   float totalWidth =
       shapeResultsForRun(shapeCache(), &m_font, run, &buffer);
 
   return buffer.getCharacterRange(run.direction(), totalWidth, from, to);
@@ skipping 24 matching lines @@
 
 GlyphData CachingWordShaper::emphasisMarkGlyphData(
     const TextRun& emphasisMarkRun) const {
   ShapeResultBuffer buffer;
   shapeResultsForRun(shapeCache(), &m_font, emphasisMarkRun, &buffer);
 
   return buffer.emphasisMarkGlyphData(m_font.m_fontDescription);
 }
 
 };  // namespace blink