Remove GlyphBuffer

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

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/fonts/shaping/CachingWordShaper.h"
 
 #include "platform/fonts/CharacterRange.h"
 #include "platform/fonts/FontCache.h"
-#include "platform/fonts/GlyphBuffer.h"
 #include "platform/fonts/shaping/CachingWordShapeIterator.h"
 #include "platform/fonts/shaping/ShapeResultTestInfo.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
 namespace blink {
 
 class CachingWordShaperTest : public ::testing::Test {
  protected:
@@ skipping 88 matching lines @@
   ASSERT_EQ(5u, offset);
   ASSERT_FALSE(iterator.next(&result));
 }
 
 // Tests that filling a glyph buffer for a specific range returns the same
 // results when shaping word by word as when shaping the full run in one go.
 TEST_F(CachingWordShaperTest, CommonAccentLeftToRightFillGlyphBuffer) {
   // "/. ." with an accent mark over the first dot.
   const UChar str[] = {0x2F, 0x301, 0x2E, 0x20, 0x2E, 0x0};
   TextRun textRun(str, 5);
+  TextRunPaintInfo runInfo(textRun);
+  runInfo.to = 3;
 
-  CachingWordShaper shaper(font);
-  GlyphBuffer glyphBuffer;
-  shaper.fillGlyphBuffer(textRun, &glyphBuffer, 0, 3);
+  ShapeResultBloberizer bloberizer(font, 1);
+  CachingWordShaper(font).fillGlyphs(runInfo, bloberizer);
 
   Font referenceFont(fontDescription);
   referenceFont.update(nullptr);
-  CachingWordShaper referenceShaper(referenceFont);
-  GlyphBuffer referenceGlyphBuffer;
   referenceFont.setCanShapeWordByWordForTesting(false);
-  referenceShaper.fillGlyphBuffer(textRun, &referenceGlyphBuffer, 0, 3);
+  ShapeResultBloberizer referenceBloberizer(referenceFont, 1);
+  CachingWordShaper(referenceFont).fillGlyphs(runInfo, referenceBloberizer);
 
-  ASSERT_EQ(referenceGlyphBuffer.glyphAt(0), glyphBuffer.glyphAt(0));
-  ASSERT_EQ(referenceGlyphBuffer.glyphAt(1), glyphBuffer.glyphAt(1));
-  ASSERT_EQ(referenceGlyphBuffer.glyphAt(2), glyphBuffer.glyphAt(2));
+  const auto& glyphs =
+      ShapeResultBloberizerTestInfo::pendingRunGlyphs(bloberizer);
+  ASSERT_EQ(glyphs.size(), 3ul);
+  const auto referenceGlyphs =
+      ShapeResultBloberizerTestInfo::pendingRunGlyphs(referenceBloberizer);
+  ASSERT_EQ(referenceGlyphs.size(), 3ul);
+
+  EXPECT_EQ(referenceGlyphs[0], glyphs[0]);
+  EXPECT_EQ(referenceGlyphs[1], glyphs[1]);
+  EXPECT_EQ(referenceGlyphs[2], glyphs[2]);
 }
 
 // Tests that filling a glyph buffer for a specific range returns the same
 // results when shaping word by word as when shaping the full run in one go.
 TEST_F(CachingWordShaperTest, CommonAccentRightToLeftFillGlyphBuffer) {
   // "[] []" with an accent mark over the last square bracket.
   const UChar str[] = {0x5B, 0x5D, 0x20, 0x5B, 0x301, 0x5D, 0x0};
   TextRun textRun(str, 6);
   textRun.setDirection(TextDirection::kRtl);
+  TextRunPaintInfo runInfo(textRun);
+  runInfo.from = 1;
 
-  CachingWordShaper shaper(font);
-  GlyphBuffer glyphBuffer;
-  shaper.fillGlyphBuffer(textRun, &glyphBuffer, 1, 6);
+  ShapeResultBloberizer bloberizer(font, 1);
+  CachingWordShaper(font).fillGlyphs(runInfo, bloberizer);
 
   Font referenceFont(fontDescription);
   referenceFont.update(nullptr);
-  CachingWordShaper referenceShaper(referenceFont);
-  GlyphBuffer referenceGlyphBuffer;
   referenceFont.setCanShapeWordByWordForTesting(false);
-  referenceShaper.fillGlyphBuffer(textRun, &referenceGlyphBuffer, 1, 6);
+  ShapeResultBloberizer referenceBloberizer(referenceFont, 1);
+  CachingWordShaper(referenceFont).fillGlyphs(runInfo, referenceBloberizer);
 
-  ASSERT_EQ(5u, referenceGlyphBuffer.size());
-  ASSERT_EQ(referenceGlyphBuffer.size(), glyphBuffer.size());
+  const auto& glyphs =
+      ShapeResultBloberizerTestInfo::pendingRunGlyphs(bloberizer);
+  ASSERT_EQ(5u, glyphs.size());
+  const auto referenceGlyphs =
+      ShapeResultBloberizerTestInfo::pendingRunGlyphs(referenceBloberizer);
+  ASSERT_EQ(5u, referenceGlyphs.size());
 
-  ASSERT_EQ(referenceGlyphBuffer.glyphAt(0), glyphBuffer.glyphAt(0));
-  ASSERT_EQ(referenceGlyphBuffer.glyphAt(1), glyphBuffer.glyphAt(1));
-  ASSERT_EQ(referenceGlyphBuffer.glyphAt(2), glyphBuffer.glyphAt(2));
-  ASSERT_EQ(referenceGlyphBuffer.glyphAt(3), glyphBuffer.glyphAt(3));
-  ASSERT_EQ(referenceGlyphBuffer.glyphAt(4), glyphBuffer.glyphAt(4));
+  EXPECT_EQ(referenceGlyphs[0], glyphs[0]);
+  EXPECT_EQ(referenceGlyphs[1], glyphs[1]);
+  EXPECT_EQ(referenceGlyphs[2], glyphs[2]);
+  EXPECT_EQ(referenceGlyphs[3], glyphs[3]);
+  EXPECT_EQ(referenceGlyphs[4], glyphs[4]);
 }
 
 // Tests that runs with zero glyphs (the ZWJ non-printable character in this
 // case) are handled correctly. This test passes if it does not cause a crash.
 TEST_F(CachingWordShaperTest, SubRunWithZeroGlyphs) {
   // "Foo &zwnj; bar"
   const UChar str[] = {0x46, 0x6F, 0x6F, 0x20, 0x200C,
                        0x20, 0x62, 0x61, 0x71, 0x0};
   TextRun textRun(str, 9);
 
   CachingWordShaper shaper(font);
   FloatRect glyphBounds;
   ASSERT_GT(shaper.width(textRun, nullptr, &glyphBounds), 0);
 
-  GlyphBuffer glyphBuffer;
-  shaper.fillGlyphBuffer(textRun, &glyphBuffer, 0, 8);
+  ShapeResultBloberizer bloberizer(font, 1);
+  TextRunPaintInfo runInfo(textRun);
+  runInfo.to = 8;
+  shaper.fillGlyphs(runInfo, bloberizer);
 
   shaper.getCharacterRange(textRun, 0, 8);
 }
 
 TEST_F(CachingWordShaperTest, SegmentCJKByCharacter) {
   const UChar str[] = {0x56FD, 0x56FD,  // CJK Unified Ideograph
                        'a',    'b',
                        0x56FD,  // CJK Unified Ideograph
                        'x',    'y',    'z',
                        0x3042,  // HIRAGANA LETTER A
@@ skipping 279 matching lines @@
   // The total width of periods and spaces should be longer than the width of
   // periods alone.
   ASSERT_GT(periodsAndSpacesWidth, periodsWidth);
 
   // The glyph bounds of periods and spaces should be longer than the glyph
   // bounds of periods alone.
   ASSERT_GT(periodsAndSpacesGlyphBounds.width(), periodsGlyphBounds.width());
 }
 
 }  // namespace blink