diff options
author | Ben Murdoch <benm@google.com> | 2011-06-02 12:07:03 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2011-06-10 10:47:21 +0100 |
commit | 2daae5fd11344eaa88a0d92b0f6d65f8d2255c00 (patch) | |
tree | e4964fbd1cb70599f7718ff03e50ea1dab33890b /Source/WebCore/rendering/InlineTextBox.h | |
parent | 87bdf0060a247bfbe668342b87e0874182e0ffa9 (diff) | |
download | external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.zip external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.gz external_webkit-2daae5fd11344eaa88a0d92b0f6d65f8d2255c00.tar.bz2 |
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Diffstat (limited to 'Source/WebCore/rendering/InlineTextBox.h')
-rw-r--r-- | Source/WebCore/rendering/InlineTextBox.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/Source/WebCore/rendering/InlineTextBox.h b/Source/WebCore/rendering/InlineTextBox.h index 98a1b78..1878c9f 100644 --- a/Source/WebCore/rendering/InlineTextBox.h +++ b/Source/WebCore/rendering/InlineTextBox.h @@ -51,6 +51,8 @@ public: { } + virtual void destroy(RenderArena*); + InlineTextBox* prevTextBox() const { return m_prevTextBox; } InlineTextBox* nextTextBox() const { return m_nextTextBox; } void setNextTextBox(InlineTextBox* n) { m_nextTextBox = n; } @@ -80,6 +82,13 @@ public: bool getEmphasisMarkPosition(RenderStyle*, TextEmphasisPosition&) const; + IntRect logicalOverflowRect() const; + void setLogicalOverflowRect(const IntRect&); + int logicalTopVisualOverflow() const { return logicalOverflowRect().y(); } + int logicalBottomVisualOverflow() const { return logicalOverflowRect().maxY(); } + int logicalLeftVisualOverflow() const { return logicalOverflowRect().x(); } + int logicalRightVisualOverflow() const { return logicalOverflowRect().maxX(); } + private: int selectionTop(); int selectionBottom(); @@ -93,8 +102,8 @@ public: void selectionStartEnd(int& sPos, int& ePos); protected: - virtual void paint(PaintInfo&, int tx, int ty); - virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty); + virtual void paint(PaintInfo&, int tx, int ty, int lineTop, int lineBottom); + virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, int lineTop, int lineBottom); public: RenderText* textRenderer() const; |