Refactor InspectorCSSAgent to avoid an intermediate 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"
@@ skipping 98 matching lines @@
   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);
 
-  CachingWordShaper shaper(cache.get());
+  CachingWordShaper shaper(font, cache.get());
   GlyphBuffer glyphBuffer;
-  shaper.fillGlyphBuffer(&font, textRun, fallbackFonts, &glyphBuffer, 0, 3);
+  shaper.fillGlyphBuffer(textRun, &glyphBuffer, 0, 3);
 
   std::unique_ptr<ShapeCache> referenceCache = WTF::makeUnique<ShapeCache>();
-  CachingWordShaper referenceShaper(referenceCache.get());
+  CachingWordShaper referenceShaper(font, referenceCache.get());
   GlyphBuffer referenceGlyphBuffer;
   font.setCanShapeWordByWordForTesting(false);
-  referenceShaper.fillGlyphBuffer(&font, textRun, fallbackFonts,
-                                  &referenceGlyphBuffer, 0, 3);
+  referenceShaper.fillGlyphBuffer(textRun, &referenceGlyphBuffer, 0, 3);
 
   ASSERT_EQ(referenceGlyphBuffer.glyphAt(0), glyphBuffer.glyphAt(0));
   ASSERT_EQ(referenceGlyphBuffer.glyphAt(1), glyphBuffer.glyphAt(1));
   ASSERT_EQ(referenceGlyphBuffer.glyphAt(2), glyphBuffer.glyphAt(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);
 
-  CachingWordShaper shaper(cache.get());
+  CachingWordShaper shaper(font, cache.get());
   GlyphBuffer glyphBuffer;
-  shaper.fillGlyphBuffer(&font, textRun, fallbackFonts, &glyphBuffer, 1, 6);
+  shaper.fillGlyphBuffer(textRun, &glyphBuffer, 1, 6);
 
   std::unique_ptr<ShapeCache> referenceCache = WTF::makeUnique<ShapeCache>();
-  CachingWordShaper referenceShaper(referenceCache.get());
+  CachingWordShaper referenceShaper(font, referenceCache.get());
   GlyphBuffer referenceGlyphBuffer;
   font.setCanShapeWordByWordForTesting(false);
-  referenceShaper.fillGlyphBuffer(&font, textRun, fallbackFonts,
-                                  &referenceGlyphBuffer, 1, 6);
+  referenceShaper.fillGlyphBuffer(textRun, &referenceGlyphBuffer, 1, 6);
 
   ASSERT_EQ(5u, referenceGlyphBuffer.size());
   ASSERT_EQ(referenceGlyphBuffer.size(), glyphBuffer.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));
 }
 
 // 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(cache.get());
+  CachingWordShaper shaper(font, cache.get());
   FloatRect glyphBounds;
-  ASSERT_GT(shaper.width(&font, textRun, nullptr, &glyphBounds), 0);
+  ASSERT_GT(shaper.width(textRun, nullptr, &glyphBounds), 0);
 
   GlyphBuffer glyphBuffer;
-  shaper.fillGlyphBuffer(&font, textRun, fallbackFonts, &glyphBuffer, 0, 8);
+  shaper.fillGlyphBuffer(textRun, &glyphBuffer, 0, 8);
 
-  shaper.getCharacterRange(&font, textRun, 0, 8);
+  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
                        0x56FD,  // CJK Unified Ideograph
                        0x0};
@@ skipping 245 matching lines @@
       // using code point such as U+3042, but it'd fallback to system
       // fonts as the glyph is missing.
       0x0};
   TextRun textRun(str, 1);
 
   fontDescription.setOrientation(FontOrientation::VerticalMixed);
   Font verticalMixedFont = Font(fontDescription);
   verticalMixedFont.update(nullptr);
   ASSERT_TRUE(verticalMixedFont.canShapeWordByWord());
 
-  CachingWordShaper shaper(cache.get());
+  CachingWordShaper shaper(verticalMixedFont, cache.get());
   FloatRect glyphBounds;
   HashSet<const SimpleFontData*> fallbackFonts;
   ASSERT_GT(
-      shaper.width(&verticalMixedFont, textRun, &fallbackFonts, &glyphBounds),
+      shaper.width(textRun, &fallbackFonts, &glyphBounds),
       0);
   EXPECT_EQ(0u, fallbackFonts.size());
 }
 
 TEST_F(CachingWordShaperTest, GlyphBoundsWithSpaces) {
-  CachingWordShaper shaper(cache.get());
+  CachingWordShaper shaper(font, cache.get());
 
   TextRun periods(reinterpret_cast<const LChar*>(".........."), 10);
   FloatRect periodsGlyphBounds;
-  float periodsWidth =
-      shaper.width(&font, periods, nullptr, &periodsGlyphBounds);
+  float periodsWidth = shaper.width(periods, nullptr, &periodsGlyphBounds);
 
   TextRun periodsAndSpaces(
       reinterpret_cast<const LChar*>(". . . . . . . . . ."), 19);
   FloatRect periodsAndSpacesGlyphBounds;
-  float periodsAndSpacesWidth = shaper.width(&font, periodsAndSpaces, nullptr,
+  float periodsAndSpacesWidth = shaper.width(periodsAndSpaces, nullptr,
                                              &periodsAndSpacesGlyphBounds);
 
   // 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