diff options
| author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
| commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
| tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/rendering/InlineTextBox.h | |
| parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
| download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 | |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/rendering/InlineTextBox.h')
| -rw-r--r-- | WebCore/rendering/InlineTextBox.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/WebCore/rendering/InlineTextBox.h b/WebCore/rendering/InlineTextBox.h index 0c2dd8a..222e973 100644 --- a/WebCore/rendering/InlineTextBox.h +++ b/WebCore/rendering/InlineTextBox.h @@ -24,7 +24,7 @@ #define InlineTextBox_h #include "InlineRunBox.h" -#include "RenderText.h" // so textObject() can be inline +#include "RenderText.h" // so textRenderer() can be inline namespace WebCore { @@ -50,6 +50,8 @@ public: InlineTextBox* nextTextBox() const { return static_cast<InlineTextBox*>(nextLineBox()); } InlineTextBox* prevTextBox() const { return static_cast<InlineTextBox*>(prevLineBox()); } + virtual int height() const; + unsigned start() const { return m_start; } unsigned end() const { return m_len ? m_start + m_len - 1 : m_start; } unsigned len() const { return m_len; } @@ -73,7 +75,7 @@ private: virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty); public: - RenderText* textObject() const; + RenderText* textRenderer() const; private: virtual void deleteLine(RenderArena*); @@ -135,9 +137,9 @@ private: void paintTextMatchMarker(GraphicsContext*, int tx, int ty, DocumentMarker, RenderStyle*, const Font&); }; -inline RenderText* InlineTextBox::textObject() const +inline RenderText* InlineTextBox::textRenderer() const { - return toRenderText(m_object); + return toRenderText(renderer()); } } // namespace WebCore |