From 635860845790a19bf50bbc51ba8fb66a96dde068 Mon Sep 17 00:00:00 2001 From: The Android Open Source Project Date: Thu, 5 Mar 2009 14:34:32 -0800 Subject: auto import from //depot/cupcake/@136594 --- WebCore/rendering/RenderSVGContainer.h | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'WebCore/rendering/RenderSVGContainer.h') diff --git a/WebCore/rendering/RenderSVGContainer.h b/WebCore/rendering/RenderSVGContainer.h index 06751a3..e498a8a 100644 --- a/WebCore/rendering/RenderSVGContainer.h +++ b/WebCore/rendering/RenderSVGContainer.h @@ -40,8 +40,8 @@ public: virtual RenderObject* firstChild() const { return m_firstChild; } virtual RenderObject* lastChild() const { return m_lastChild; } - virtual int width() const { return m_width; } - virtual int height() const { return m_height; } + int width() const { return m_width; } + int height() const { return m_height; } virtual bool canHaveChildren() const; virtual void addChild(RenderObject* newChild, RenderObject* beforeChild = 0); @@ -69,22 +69,23 @@ public: virtual bool isSVGContainer() const { return true; } virtual const char* renderName() const { return "RenderSVGContainer"; } - virtual bool requiresLayer(); + virtual bool requiresLayer() const { return false; } virtual int lineHeight(bool b, bool isRootLineBox = false) const; virtual int baselinePosition(bool b, bool isRootLineBox = false) const; virtual void layout(); virtual void paint(PaintInfo&, int parentX, int parentY); - virtual IntRect absoluteClippedOverflowRect(); + virtual IntRect clippedOverflowRectForRepaint(RenderBox* repaintContainer); virtual void absoluteRects(Vector& rects, int tx, int ty, bool topLevel = true); + virtual void absoluteQuads(Vector&, bool topLevel = true); virtual void addFocusRingRects(GraphicsContext*, int tx, int ty); FloatRect relativeBBox(bool includeStroke = true) const; virtual bool calculateLocalTransform(); - virtual AffineTransform localTransform() const; - virtual AffineTransform viewportTransform() const; + virtual TransformationMatrix localTransform() const; + virtual TransformationMatrix viewportTransform() const; virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, int x, int y, int tx, int ty, HitTestAction); @@ -94,6 +95,8 @@ protected: void calcBounds(); + virtual IntRect outlineBoundsForRepaint(RenderBox* /*repaintContainer*/) const; + private: int calcReplacedWidth() const; int calcReplacedHeight() const; @@ -110,7 +113,7 @@ private: protected: IntRect m_absoluteBounds; - AffineTransform m_localTransform; + TransformationMatrix m_localTransform; }; } // namespace WebCore -- cgit v1.1