diff options
Diffstat (limited to 'WebCore/rendering/RenderSVGContainer.h')
| -rw-r--r-- | WebCore/rendering/RenderSVGContainer.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/WebCore/rendering/RenderSVGContainer.h b/WebCore/rendering/RenderSVGContainer.h index f2195e3..f681e50 100644 --- a/WebCore/rendering/RenderSVGContainer.h +++ b/WebCore/rendering/RenderSVGContainer.h @@ -42,10 +42,9 @@ public: void setDrawsContents(bool); bool drawsContents() const; -protected: virtual void paint(PaintInfo&, int parentX, int parentY); -private: +protected: virtual RenderObjectChildList* virtualChildren() { return children(); } virtual const RenderObjectChildList* virtualChildren() const { return children(); } @@ -54,9 +53,10 @@ private: virtual void layout(); - virtual void addFocusRingRects(GraphicsContext*, int tx, int ty); + virtual void addFocusRingRects(Vector<IntRect>&, int tx, int ty); virtual FloatRect objectBoundingBox() const; + virtual FloatRect strokeBoundingBox() const; virtual FloatRect repaintRectInLocalCoordinates() const; virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction); @@ -71,6 +71,7 @@ private: bool selfWillPaint() const; +private: RenderObjectChildList m_children; bool m_drawsContents : 1; }; @@ -78,14 +79,14 @@ private: inline RenderSVGContainer* toRenderSVGContainer(RenderObject* object) { // Note: isSVGContainer is also true for RenderSVGViewportContainer, which is not derived from this. - ASSERT(!object || object->isSVGContainer() && strcmp(object->renderName(), "RenderSVGViewportContainer")); + ASSERT(!object || (object->isSVGContainer() && strcmp(object->renderName(), "RenderSVGViewportContainer"))); return static_cast<RenderSVGContainer*>(object); } inline const RenderSVGContainer* toRenderSVGContainer(const RenderObject* object) { // Note: isSVGContainer is also true for RenderSVGViewportContainer, which is not derived from this. - ASSERT(!object || object->isSVGContainer() && strcmp(object->renderName(), "RenderSVGViewportContainer")); + ASSERT(!object || (object->isSVGContainer() && strcmp(object->renderName(), "RenderSVGViewportContainer"))); return static_cast<const RenderSVGContainer*>(object); } |
