Reland "Change fallback font collection in HarfBuzzShaper"

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 "config.h"
 
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/GlyphBuffer.h"
 #include "platform/fonts/shaping/CachingWordShapeIterator.h"
 #include <gtest/gtest.h>
@@ skipping 29 matching lines @@
     unsigned startIndex = 0;
     unsigned numGlyphs = 0;
     hb_script_t script = HB_SCRIPT_INVALID;
 };
 
 TEST_F(CachingWordShaperTest, LatinLeftToRightByWord)
 {
     TextRun textRun(reinterpret_cast<const LChar*>("ABC DEF."), 8);
 
     RefPtr<ShapeResult> result;
-    CachingWordShapeIterator iterator(cache, textRun, font, fallbackFonts);
+    CachingWordShapeIterator iterator(cache, textRun, font);
     ASSERT_TRUE(iterator.next(&result));
     ASSERT_TRUE(result->runInfoForTesting(0, startIndex, numGlyphs, script));
     EXPECT_EQ(0u, startIndex);
     EXPECT_EQ(3u, numGlyphs);
     EXPECT_EQ(HB_SCRIPT_LATIN, script);
 
     ASSERT_TRUE(iterator.next(&result));
     ASSERT_TRUE(result->runInfoForTesting(0, startIndex, numGlyphs, script));
     EXPECT_EQ(0u, startIndex);
     EXPECT_EQ(1u, numGlyphs);
     EXPECT_EQ(HB_SCRIPT_COMMON, script);
 
     ASSERT_TRUE(iterator.next(&result));
     ASSERT_TRUE(result->runInfoForTesting(0, startIndex, numGlyphs, script));
     EXPECT_EQ(0u, startIndex);
     EXPECT_EQ(4u, numGlyphs);
     EXPECT_EQ(HB_SCRIPT_LATIN, script);
 
     ASSERT_FALSE(iterator.next(&result));
 }
 
 TEST_F(CachingWordShaperTest, CommonAccentLeftToRightByWord)
 {
     const UChar str[] = { 0x2F, 0x301, 0x2E, 0x20, 0x2E, 0x0 };
     TextRun textRun(str, 5);
 
     unsigned offset = 0;
     RefPtr<ShapeResult> result;
-    CachingWordShapeIterator iterator(cache, textRun, font, fallbackFonts);
+    CachingWordShapeIterator iterator(cache, textRun, font);
     ASSERT_TRUE(iterator.next(&result));
     ASSERT_TRUE(result->runInfoForTesting(0, startIndex, numGlyphs, script));
     EXPECT_EQ(0u, offset + startIndex);
     EXPECT_EQ(3u, numGlyphs);
     EXPECT_EQ(HB_SCRIPT_COMMON, script);
     offset += result->numCharacters();
 
     ASSERT_TRUE(iterator.next(&result));
     ASSERT_TRUE(result->runInfoForTesting(0, startIndex, numGlyphs, script));
     EXPECT_EQ(3u, offset + startIndex);
@@ skipping 81 matching lines @@
     GlyphBuffer glyphBuffer;
     shaper.fillGlyphBuffer(font, textRun, fallbackFonts, &glyphBuffer, 0, 8);
 
     FloatPoint point;
     int height = 16;
     shaper.selectionRect(font, textRun, point, height, 0, 8);
 }
 
 
 } // namespace blink