| Index: Source/core/rendering/RenderCombineText.cpp
|
| diff --git a/Source/core/rendering/RenderCombineText.cpp b/Source/core/rendering/RenderCombineText.cpp
|
| index fb58e1ab932675aedca302c19fcd03567c36ee0b..0aefedc35cd78dc4803a46e85235b7c0615d8e26 100644
|
| --- a/Source/core/rendering/RenderCombineText.cpp
|
| +++ b/Source/core/rendering/RenderCombineText.cpp
|
| @@ -115,7 +115,7 @@ void RenderCombineText::combineText()
|
| FontSelector* fontSelector = style()->font().fontSelector();
|
|
|
| if (m_isCombined)
|
| - shouldUpdateFont = style()->setFontDescription(description); // Need to change font orientation to horizontal.
|
| + shouldUpdateFont = deprecatedMutableStyle()->setFontDescription(description); // Need to change font orientation to horizontal.
|
| else {
|
| // Need to try compressed glyphs.
|
| static const FontWidthVariant widthVariants[] = { HalfWidth, ThirdWidth, QuarterWidth };
|
| @@ -129,14 +129,14 @@ void RenderCombineText::combineText()
|
| m_isCombined = true;
|
|
|
| // Replace my font with the new one.
|
| - shouldUpdateFont = style()->setFontDescription(description);
|
| + shouldUpdateFont = deprecatedMutableStyle()->setFontDescription(description);
|
| break;
|
| }
|
| }
|
| }
|
|
|
| if (!m_isCombined)
|
| - shouldUpdateFont = style()->setFontDescription(originalFont().fontDescription());
|
| + shouldUpdateFont = deprecatedMutableStyle()->setFontDescription(originalFont().fontDescription());
|
|
|
| if (shouldUpdateFont)
|
| style()->font().update(fontSelector);
|
|
|