diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Source/WebCore/rendering/RenderCombineText.h | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Source/WebCore/rendering/RenderCombineText.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderCombineText.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/WebCore/rendering/RenderCombineText.h b/Source/WebCore/rendering/RenderCombineText.h index 582cbd6..3484ab7 100644 --- a/Source/WebCore/rendering/RenderCombineText.h +++ b/Source/WebCore/rendering/RenderCombineText.h @@ -30,13 +30,13 @@ public: RenderCombineText(Node*, PassRefPtr<StringImpl>); void combineText(); - void adjustTextOrigin(IntPoint& textOrigin, const IntRect& boxRect) const; + void adjustTextOrigin(FloatPoint& textOrigin, const FloatRect& boxRect) const; void charactersToRender(int start, const UChar*& characters, int& length) const; bool isCombined() const { return m_isCombined; } - int combinedTextWidth(const Font& font) const { return font.size(); } + float combinedTextWidth(const Font& font) const { return font.size(); } private: - virtual unsigned width(unsigned from, unsigned length, const Font&, int xPosition, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const; + 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); virtual void setTextInternal(PassRefPtr<StringImpl>); |