| Index: Source/core/layout/LayoutTextCombine.cpp
|
| diff --git a/Source/core/layout/LayoutTextCombine.cpp b/Source/core/layout/LayoutTextCombine.cpp
|
| index d1b983df1ad2c7ae48829a3c0f3ac220e4f2f5a4..e519b9a7dbf1143ccdf570eda1a85ae210b2d78c 100644
|
| --- a/Source/core/layout/LayoutTextCombine.cpp
|
| +++ b/Source/core/layout/LayoutTextCombine.cpp
|
| @@ -52,7 +52,7 @@ void LayoutTextCombine::setTextInternal(PassRefPtr<StringImpl> text)
|
| updateIsCombined();
|
| }
|
|
|
| -float LayoutTextCombine::width(unsigned from, unsigned length, const Font& font, LayoutUnit xPosition, TextDirection direction, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
|
| +float LayoutTextCombine::width(unsigned from, unsigned length, const Font& font, LayoutUnit xPosition, TextDirection direction, HashSet<const SimpleFontData*>* fallbackFonts, FloatRect* glyphBounds) const
|
| {
|
| if (!length)
|
| return 0;
|
| @@ -63,7 +63,7 @@ float LayoutTextCombine::width(unsigned from, unsigned length, const Font& font,
|
| if (m_isCombined)
|
| return font.fontDescription().computedSize();
|
|
|
| - return LayoutText::width(from, length, font, xPosition, direction, fallbackFonts, glyphOverflow);
|
| + return LayoutText::width(from, length, font, xPosition, direction, fallbackFonts, glyphBounds);
|
| }
|
|
|
| void scaleHorizontallyAndTranslate(GraphicsContext& context, float scaleX, float centerX, float offsetX, float offsetY)
|
|
|