diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2008-12-17 18:05:15 -0800 |
| commit | 1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353 (patch) | |
| tree | 4457a7306ea5acb43fe05bfe0973b1f7faf97ba2 /WebCore/rendering/RenderBR.h | |
| parent | 9364f22aed35e1a1e9d07c121510f80be3ab0502 (diff) | |
| download | external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.zip external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.gz external_webkit-1cbdecfa9fc428ac2d8aca0fa91c9580b3d57353.tar.bz2 | |
Code drop from //branches/cupcake/...@124589
Diffstat (limited to 'WebCore/rendering/RenderBR.h')
| -rw-r--r-- | WebCore/rendering/RenderBR.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/WebCore/rendering/RenderBR.h b/WebCore/rendering/RenderBR.h index c5ce42b..b65bb58 100644 --- a/WebCore/rendering/RenderBR.h +++ b/WebCore/rendering/RenderBR.h @@ -45,9 +45,8 @@ public: virtual unsigned width(unsigned /*from*/, unsigned /*len*/, const Font&, int /*xpos*/) const { return 0; } virtual unsigned width(unsigned /*from*/, unsigned /*len*/, int /*xpos*/, bool /*firstLine = false*/) const { return 0; } - virtual short lineHeight(bool firstLine, bool isRootLineBox = false) const; - virtual short baselinePosition(bool firstLine, bool isRootLineBox = false) const; - virtual void setStyle(RenderStyle*); + virtual int lineHeight(bool firstLine, bool isRootLineBox = false) const; + virtual int baselinePosition(bool firstLine, bool isRootLineBox = false) const; // overrides virtual InlineBox* createInlineBox(bool, bool, bool isOnlyRun = false); @@ -60,10 +59,11 @@ public: virtual VisiblePosition positionForCoordinates(int x, int y); - virtual InlineBox* inlineBox(int offset, EAffinity = UPSTREAM); +protected: + virtual void styleDidChange(RenderStyle::Diff, const RenderStyle* oldStyle); private: - mutable short m_lineHeight; + mutable int m_lineHeight; }; } // namespace WebCore |