| Index: Source/core/rendering/RenderCombineText.h
|
| diff --git a/Source/core/rendering/RenderCombineText.h b/Source/core/rendering/RenderCombineText.h
|
| index c1fc771a767cfc4b3ad552ef8369b86b775a56e5..b9a1b9a37b97ec79418a16361067e3e7c1f6b5da 100644
|
| --- a/Source/core/rendering/RenderCombineText.h
|
| +++ b/Source/core/rendering/RenderCombineText.h
|
| @@ -30,9 +30,10 @@ class RenderCombineText final : public RenderText {
|
| public:
|
| RenderCombineText(Node*, PassRefPtr<StringImpl>);
|
|
|
| - void combineText();
|
| + void updateFont();
|
| void adjustTextOrigin(FloatPoint& textOrigin, const FloatRect& boxRect) const;
|
| - void getStringToRender(int, StringView&, int& length) const;
|
| + bool isTransformNeeded() const { return m_scaleX < 1.0f; }
|
| + void transform(GraphicsContext&, const FloatRect& boxRect) const;
|
| bool isCombined() const { return m_isCombined; }
|
| float combinedTextWidth(const Font& font) const { return font.fontDescription().computedSize(); }
|
| const Font& originalFont() const { return parent()->style()->font(); }
|
| @@ -43,9 +44,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 updateIsCombined();
|
|
|
| float m_combinedTextWidth;
|
| - String m_renderingText;
|
| + float m_scaleX;
|
| bool m_isCombined : 1;
|
| bool m_needsFontUpdate : 1;
|
| };
|
|
|