diff options
| author | Steve Block <steveblock@google.com> | 2010-09-29 17:32:26 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-09-29 17:35:08 +0100 |
| commit | 68513a70bcd92384395513322f1b801e7bf9c729 (patch) | |
| tree | 161b50f75a5921d61731bb25e730005994fcec85 /WebCore/rendering/RenderText.h | |
| parent | fd5c6425ce58eb75211be7718d5dee960842a37e (diff) | |
| download | external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.zip external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.gz external_webkit-68513a70bcd92384395513322f1b801e7bf9c729.tar.bz2 | |
Merge WebKit at r67908: Initial merge by Git
Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
Diffstat (limited to 'WebCore/rendering/RenderText.h')
| -rw-r--r-- | WebCore/rendering/RenderText.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/WebCore/rendering/RenderText.h b/WebCore/rendering/RenderText.h index f46f053..6ab73f6 100644 --- a/WebCore/rendering/RenderText.h +++ b/WebCore/rendering/RenderText.h @@ -62,6 +62,9 @@ public: virtual void absoluteQuads(Vector<FloatQuad>&); void absoluteQuadsForRange(Vector<FloatQuad>&, unsigned startOffset = 0, unsigned endOffset = UINT_MAX, bool useSelectionHeight = false); + enum ClippingOption { NoClipping, ClipToEllipsis }; + void absoluteQuads(Vector<FloatQuad>&, ClippingOption option = NoClipping); + virtual VisiblePosition positionForPoint(const IntPoint&); const UChar* characters() const { return m_text.characters(); } @@ -83,7 +86,7 @@ public: int& beginMaxW, int& endMaxW, int& minW, int& maxW, bool& stripFrontSpaces); - IntRect linesBoundingBox() const; + virtual IntRect linesBoundingBox() const; IntPoint firstRunOrigin() const; int firstRunX() const; |