| Index: Source/core/rendering/RenderCombineText.h
|
| diff --git a/Source/core/rendering/RenderCombineText.h b/Source/core/rendering/RenderCombineText.h
|
| index d2731671d71fd5b61cf84586e70fdfa0bd2e9be4..28ecc6de49f698a0467e5d19b8624860c6a5e343 100644
|
| --- a/Source/core/rendering/RenderCombineText.h
|
| +++ b/Source/core/rendering/RenderCombineText.h
|
| @@ -38,11 +38,11 @@ public:
|
| const Font& originalFont() const { return parent()->style()->font(); }
|
|
|
| private:
|
| - virtual bool isCombineText() const { return true; }
|
| - virtual float width(unsigned from, unsigned length, const Font&, float xPosition, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
|
| - virtual const char* renderName() const { return "RenderCombineText"; }
|
| - virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
|
| - virtual void setTextInternal(PassRefPtr<StringImpl>);
|
| + 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;
|
| bool m_isCombined : 1;
|
|
|