| Index: Source/core/rendering/RenderText.h
|
| diff --git a/Source/core/rendering/RenderText.h b/Source/core/rendering/RenderText.h
|
| index 9f75febd484f766680ad695a3dc34dedb77f5505..798a9d4868be53253ffdfddaff28094cf64bbf8d 100644
|
| --- a/Source/core/rendering/RenderText.h
|
| +++ b/Source/core/rendering/RenderText.h
|
| @@ -82,8 +82,8 @@ public:
|
| unsigned textLength() const { return m_text.length(); } // non virtual implementation of length()
|
| void positionLineBox(InlineBox*);
|
|
|
| - virtual float width(unsigned from, unsigned len, const Font&, float xPos, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
|
| - virtual float width(unsigned from, unsigned len, float xPos, bool firstLine = false, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
|
| + virtual float width(unsigned from, unsigned len, const Font&, float xPos, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
|
| + virtual float width(unsigned from, unsigned len, float xPos, TextDirection, bool firstLine = false, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
|
|
|
| float minLogicalWidth() const;
|
| float maxLogicalWidth() const;
|
| @@ -161,7 +161,7 @@ protected:
|
| virtual InlineTextBox* createTextBox(); // Subclassed by SVG.
|
|
|
| private:
|
| - void computePreferredLogicalWidths(float leadWidth, HashSet<const SimpleFontData*>& fallbackFonts, GlyphOverflow&);
|
| + void computePreferredLogicalWidths(float leadWidth, TextDirection, HashSet<const SimpleFontData*>& fallbackFonts, GlyphOverflow&);
|
|
|
| bool computeCanUseSimpleFontCodePath() const;
|
|
|
| @@ -176,7 +176,7 @@ private:
|
|
|
| void deleteTextBoxes();
|
| bool containsOnlyWhitespace(unsigned from, unsigned len) const;
|
| - float widthFromCache(const Font&, int start, int len, float xPos, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow*) const;
|
| + float widthFromCache(const Font&, int start, int len, float xPos, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts, GlyphOverflow*) const;
|
| bool isAllASCII() const { return m_isAllASCII; }
|
|
|
| void secureText(UChar mask);
|
|
|