Move blobalizer implementation to ShapeResultBloberizer

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 70 matching lines @@
 
 int CachingWordShaper::OffsetForPosition(const TextRun& run,
                                          float target_x,
                                          bool include_partial_glyphs) {
   ShapeResultBuffer buffer;
   ShapeResultsForRun(GetShapeCache(), &font_, run, &buffer);
 
   return buffer.OffsetForPosition(run, target_x, include_partial_glyphs);
 }
 
-float CachingWordShaper::FillGlyphs(const TextRunPaintInfo& run_info,
-                                    ShapeResultBloberizer& bloberizer) {
-  ShapeResultBuffer buffer;
-  ShapeResultsForRun(GetShapeCache(), &font_, run_info.run, &buffer);
-
-  return buffer.FillGlyphs(run_info, bloberizer);
-}
-
-void CachingWordShaper::FillTextEmphasisGlyphs(
-    const TextRunPaintInfo& run_info,
-    const GlyphData& emphasis_data,
-    ShapeResultBloberizer& bloberizer) {
-  ShapeResultBuffer buffer;
-  ShapeResultsForRun(GetShapeCache(), &font_, run_info.run, &buffer);
-
-  buffer.FillTextEmphasisGlyphs(run_info, emphasis_data, bloberizer);
+void CachingWordShaper::FillResultBuffer(const TextRunPaintInfo& run_info,
+                                         ShapeResultBuffer* buffer) {
+  DCHECK(buffer);
+  ShapeResultsForRun(GetShapeCache(), &font_, run_info.run, buffer);
 }
 
 CharacterRange CachingWordShaper::GetCharacterRange(const TextRun& run,
                                                     unsigned from,
                                                     unsigned to) {
   ShapeResultBuffer buffer;
   float total_width = ShapeResultsForRun(GetShapeCache(), &font_, run, &buffer);
 
   return buffer.GetCharacterRange(run.Direction(), total_width, from, to);
 }
@@ skipping 22 matching lines @@
 
 GlyphData CachingWordShaper::EmphasisMarkGlyphData(
     const TextRun& emphasis_mark_run) const {
   ShapeResultBuffer buffer;
   ShapeResultsForRun(GetShapeCache(), &font_, emphasis_mark_run, &buffer);
 
   return buffer.EmphasisMarkGlyphData(font_.font_description_);
 }
 
 };  // namespace blink