| Index: Source/core/rendering/RenderCombineText.h
|
| diff --git a/Source/core/rendering/RenderCombineText.h b/Source/core/rendering/RenderCombineText.h
|
| index c1fc771a767cfc4b3ad552ef8369b86b775a56e5..a80580235482f9ae2835c0aa46567d572db15e09 100644
|
| --- a/Source/core/rendering/RenderCombineText.h
|
| +++ b/Source/core/rendering/RenderCombineText.h
|
| @@ -30,8 +30,10 @@ class RenderCombineText final : public RenderText {
|
| public:
|
| RenderCombineText(Node*, PassRefPtr<StringImpl>);
|
|
|
| - void combineText();
|
| + void updateFont();
|
| void adjustTextOrigin(FloatPoint& textOrigin, const FloatRect& boxRect) const;
|
| + bool isTransformNeeded() const { return m_scaleX; }
|
| + void transform(GraphicsContext&, const FloatRect& boxRect) const;
|
| void getStringToRender(int, StringView&, int& length) const;
|
| bool isCombined() const { return m_isCombined; }
|
| float combinedTextWidth(const Font& font) const { return font.fontDescription().computedSize(); }
|
| @@ -43,8 +45,10 @@ private:
|
| virtual const char* renderName() const override { return "RenderCombineText"; }
|
| virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
|
| virtual void setTextInternal(PassRefPtr<StringImpl>) override;
|
| + void updateIsCombinedAndText();
|
|
|
| float m_combinedTextWidth;
|
| + float m_scaleX;
|
| String m_renderingText;
|
| bool m_isCombined : 1;
|
| bool m_needsFontUpdate : 1;
|
|
|