| Index: Source/core/rendering/RenderCombineText.cpp
|
| diff --git a/Source/core/rendering/RenderCombineText.cpp b/Source/core/rendering/RenderCombineText.cpp
|
| index 75ae66dec91854b162c85c1e3395b9b0ff0f3d47..886be494163cfcb63a029a78286775969e307166 100644
|
| --- a/Source/core/rendering/RenderCombineText.cpp
|
| +++ b/Source/core/rendering/RenderCombineText.cpp
|
| @@ -55,7 +55,7 @@ void RenderCombineText::setTextInternal(PassRefPtr<StringImpl> text)
|
| m_needsFontUpdate = true;
|
| }
|
|
|
| -float RenderCombineText::width(unsigned from, unsigned length, const Font& font, float xPosition, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
|
| +float RenderCombineText::width(unsigned from, unsigned length, const Font& font, float xPosition, TextDirection direction, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow* glyphOverflow) const
|
| {
|
| if (hasEmptyText())
|
| return 0;
|
| @@ -63,7 +63,7 @@ float RenderCombineText::width(unsigned from, unsigned length, const Font& font,
|
| if (m_isCombined)
|
| return font.size();
|
|
|
| - return RenderText::width(from, length, font, xPosition, fallbackFonts, glyphOverflow);
|
| + return RenderText::width(from, length, font, xPosition, direction, fallbackFonts, glyphOverflow);
|
| }
|
|
|
| void RenderCombineText::adjustTextOrigin(FloatPoint& textOrigin, const FloatRect& boxRect) const
|
|
|