diff options
author | Steve Block <steveblock@google.com> | 2010-07-08 12:51:48 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2010-07-09 15:33:40 +0100 |
commit | ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24 (patch) | |
tree | bb45155550ec013adc0ad10f4d7d354c6469b022 /WebCore/rendering/SVGRootInlineBox.h | |
parent | d4b24d9a829ed7de70381c8b99fb75a07ab40466 (diff) | |
download | external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.zip external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.tar.gz external_webkit-ca9cb53ed1119a3fd98fafa0972ffeb56dee1c24.tar.bz2 |
Merge WebKit at r62496: Initial merge by git
Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
Diffstat (limited to 'WebCore/rendering/SVGRootInlineBox.h')
-rw-r--r-- | WebCore/rendering/SVGRootInlineBox.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/WebCore/rendering/SVGRootInlineBox.h b/WebCore/rendering/SVGRootInlineBox.h index 75e85fd..4e61190 100644 --- a/WebCore/rendering/SVGRootInlineBox.h +++ b/WebCore/rendering/SVGRootInlineBox.h @@ -35,8 +35,7 @@ namespace WebCore { class SVGInlineTextBox; -class SVGRootInlineBox : public RootInlineBox - , protected SVGRenderBase { +class SVGRootInlineBox : public RootInlineBox { public: SVGRootInlineBox(RenderObject* obj) : RootInlineBox(obj) @@ -49,7 +48,7 @@ public: virtual int virtualHeight() const { return m_height; } void setHeight(int height) { m_height = height; } - virtual void paint(RenderObject::PaintInfo&, int tx, int ty); + virtual void paint(PaintInfo&, int tx, int ty); void computePerCharacterLayoutInformation(); |