1 files changed, 18 insertions, 23 deletions

diff --git a/Source/WebCore/rendering/svg/RenderSVGContainer.h b/Source/WebCore/rendering/svg/RenderSVGContainer.h
index 78d318e99..bffbfefc5 100644
--- a/Source/WebCore/rendering/svg/RenderSVGContainer.h
+++ b/Source/WebCore/rendering/svg/RenderSVGContainer.h
@@ -20,10 +20,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef RenderSVGContainer_h
-#define RenderSVGContainer_h
-
-#if ENABLE(SVG)
+#pragma once
 
 #include "RenderSVGModelObject.h"
 
@@ -35,31 +32,30 @@ class RenderSVGContainer : public RenderSVGModelObject {
 public:
     virtual ~RenderSVGContainer();
 
-    virtual void paint(PaintInfo&, const LayoutPoint&) override;
-    virtual void setNeedsBoundariesUpdate() override final { m_needsBoundariesUpdate = true; }
-    virtual bool needsBoundariesUpdate() override final { return m_needsBoundariesUpdate; }
+    void paint(PaintInfo&, const LayoutPoint&) override;
+    void setNeedsBoundariesUpdate() final { m_needsBoundariesUpdate = true; }
+    bool needsBoundariesUpdate() final { return m_needsBoundariesUpdate; }
     virtual bool didTransformToRootUpdate() { return false; }
     bool isObjectBoundingBoxValid() const { return m_objectBoundingBoxValid; }
 
 protected:
-    RenderSVGContainer(SVGElement&, PassRef<RenderStyle>);
+    RenderSVGContainer(SVGElement&, RenderStyle&&);
 
-    virtual bool isSVGContainer() const override final { return true; }
-    virtual const char* renderName() const override { return "RenderSVGContainer"; }
+    const char* renderName() const override { return "RenderSVGContainer"; }
 
-    virtual bool canHaveChildren() const override final { return true; }
+    bool canHaveChildren() const final { return true; }
 
-    virtual void layout() override;
+    void layout() override;
 
-    virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0) override final;
-    virtual void removeChild(RenderObject&) override final;
-    virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) override final;
+    void addChild(RenderObject* child, RenderObject* beforeChild = 0) final;
+    void removeChild(RenderObject&) final;
+    void addFocusRingRects(Vector<LayoutRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) final;
 
-    virtual FloatRect objectBoundingBox() const override final { return m_objectBoundingBox; }
-    virtual FloatRect strokeBoundingBox() const override final { return m_strokeBoundingBox; }
-    virtual FloatRect repaintRectInLocalCoordinates() const override final { return m_repaintBoundingBox; }
+    FloatRect objectBoundingBox() const final { return m_objectBoundingBox; }
+    FloatRect strokeBoundingBox() const final { return m_strokeBoundingBox; }
+    FloatRect repaintRectInLocalCoordinates() const final { return m_repaintBoundingBox; }
 
-    virtual bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) override;
+    bool nodeAtFloatPoint(const HitTestRequest&, HitTestResult&, const FloatPoint& pointInParent, HitTestAction) override;
 
     // Allow RenderSVGTransformableContainer to hook in at the right time in layout()
     virtual bool calculateLocalTransform() { return false; }
@@ -75,6 +71,8 @@ protected:
     void updateCachedBoundaries();
 
 private:
+    bool isSVGContainer() const final { return true; }
+
     FloatRect m_objectBoundingBox;
     bool m_objectBoundingBoxValid;
     FloatRect m_strokeBoundingBox;
@@ -82,9 +80,6 @@ private:
     bool m_needsBoundariesUpdate : 1;
 };
 
-RENDER_OBJECT_TYPE_CASTS(RenderSVGContainer, isSVGContainer())
-
 } // namespace WebCore
 
-#endif // ENABLE(SVG)
-#endif // RenderSVGContainer_h
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderSVGContainer, isSVGContainer())