| Index: Source/core/rendering/RenderCombineText.h
|
| diff --git a/Source/core/rendering/RenderCombineText.h b/Source/core/rendering/RenderCombineText.h
|
| index 95ccd9d3e566f12d9a26563f02cb8f43d3e675d4..c1fc771a767cfc4b3ad552ef8369b86b775a56e5 100644
|
| --- a/Source/core/rendering/RenderCombineText.h
|
| +++ b/Source/core/rendering/RenderCombineText.h
|
| @@ -26,7 +26,7 @@
|
|
|
| namespace blink {
|
|
|
| -class RenderCombineText FINAL : public RenderText {
|
| +class RenderCombineText final : public RenderText {
|
| public:
|
| RenderCombineText(Node*, PassRefPtr<StringImpl>);
|
|
|
| @@ -38,11 +38,11 @@ public:
|
| const Font& originalFont() const { return parent()->style()->font(); }
|
|
|
| private:
|
| - virtual bool isCombineText() const OVERRIDE { return true; }
|
| - virtual float width(unsigned from, unsigned length, const Font&, float xPosition, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const OVERRIDE;
|
| - virtual const char* renderName() const OVERRIDE { return "RenderCombineText"; }
|
| - virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) OVERRIDE;
|
| - virtual void setTextInternal(PassRefPtr<StringImpl>) OVERRIDE;
|
| + virtual bool isCombineText() const override { return true; }
|
| + virtual float width(unsigned from, unsigned length, const Font&, float xPosition, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const override;
|
| + virtual const char* renderName() const override { return "RenderCombineText"; }
|
| + virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle) override;
|
| + virtual void setTextInternal(PassRefPtr<StringImpl>) override;
|
|
|
| float m_combinedTextWidth;
|
| String m_renderingText;
|
|
|