Index: Source/platform/fonts/shaping/CachingWordShaper.cpp |
diff --git a/Source/platform/fonts/shaping/CachingWordShaper.cpp b/Source/platform/fonts/shaping/CachingWordShaper.cpp |
index b632fd49e7764c79e964a65396fac03cd3e98844..b9b2d77c9bad48c9dcf3cb0b6bdb9bb6fc0b6e61 100644 |
--- a/Source/platform/fonts/shaping/CachingWordShaper.cpp |
+++ b/Source/platform/fonts/shaping/CachingWordShaper.cpp |
@@ -56,14 +56,12 @@ |
{ |
float width = 0; |
RefPtr<ShapeResult> wordResult; |
- CachingWordShapeIterator iterator(m_shapeCache, run, font); |
+ CachingWordShapeIterator iterator(m_shapeCache, run, font, fallbackFonts); |
while (iterator.next(&wordResult)) { |
if (wordResult) { |
width += wordResult->width(); |
if (glyphBounds) |
glyphBounds->unite(wordResult->bounds()); |
- if (fallbackFonts) |
- wordResult->fallbackFonts(fallbackFonts); |
} |
} |
@@ -74,15 +72,13 @@ |
const TextRun& run, HashSet<const SimpleFontData*>* fallbackFonts, |
Vector<RefPtr<ShapeResult>>* results) |
{ |
- CachingWordShapeIterator iterator(shapeCache, run, font); |
+ CachingWordShapeIterator iterator(shapeCache, run, font, fallbackFonts); |
RefPtr<ShapeResult> wordResult; |
float totalWidth = 0; |
while (iterator.next(&wordResult)) { |
if (wordResult) { |
results->append(wordResult); |
totalWidth += wordResult->width(); |
- if (fallbackFonts) |
- wordResult->fallbackFonts(fallbackFonts); |
} |
} |
return totalWidth; |