diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /WebCore/rendering/RenderSVGRoot.h | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'WebCore/rendering/RenderSVGRoot.h')
| -rw-r--r-- | WebCore/rendering/RenderSVGRoot.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/WebCore/rendering/RenderSVGRoot.h b/WebCore/rendering/RenderSVGRoot.h index 3c29b87..1b6aa22 100644 --- a/WebCore/rendering/RenderSVGRoot.h +++ b/WebCore/rendering/RenderSVGRoot.h @@ -35,7 +35,8 @@ class AffineTransform; class RenderSVGRoot : public RenderBox { public: - RenderSVGRoot(SVGStyledElement*); + explicit RenderSVGRoot(SVGStyledElement*); + virtual ~RenderSVGRoot(); const RenderObjectChildList* children() const { return &m_children; } RenderObjectChildList* children() { return &m_children; } @@ -51,11 +52,9 @@ private: virtual bool isSVGRoot() const { return true; } virtual const char* renderName() const { return "RenderSVGRoot"; } - virtual int lineHeight(bool b, bool isRootLineBox = false) const; - virtual int baselinePosition(bool b, bool isRootLineBox = false) const; virtual void computePreferredLogicalWidths(); - virtual int computeReplacedWidth(bool includeMaxWidth = true) const; - virtual int computeReplacedHeight() const; + virtual int computeReplacedLogicalWidth(bool includeMaxWidth = true) const; + virtual int computeReplacedLogicalHeight() const; virtual void layout(); virtual void paint(PaintInfo&, int parentX, int parentY); |