diff options
Diffstat (limited to 'Source/WebCore/rendering/RenderCombineText.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderCombineText.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/RenderCombineText.h b/Source/WebCore/rendering/RenderCombineText.h index 3484ab7..406c3f6 100644 --- a/Source/WebCore/rendering/RenderCombineText.h +++ b/Source/WebCore/rendering/RenderCombineText.h @@ -34,8 +34,10 @@ public: void charactersToRender(int start, const UChar*& characters, int& length) const; bool isCombined() const { return m_isCombined; } float combinedTextWidth(const Font& font) const { return font.size(); } + 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, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const; virtual const char* renderName() const { return "RenderCombineText"; } virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle); @@ -48,13 +50,13 @@ private: inline RenderCombineText* toRenderCombineText(RenderObject* object) { - ASSERT(!object || object->isText()); + ASSERT(!object || object->isCombineText()); return static_cast<RenderCombineText*>(object); } inline const RenderCombineText* toRenderCombineText(const RenderObject* object) { - ASSERT(!object || object->isText()); + ASSERT(!object || object->isCombineText()); return static_cast<const RenderCombineText*>(object); } |