webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 11 insertions, 14 deletions

diff --git a/Source/WebCore/rendering/svg/RenderSVGTransformableContainer.h b/Source/WebCore/rendering/svg/RenderSVGTransformableContainer.h
index d97eafda0..f21199004 100644
--- a/Source/WebCore/rendering/svg/RenderSVGTransformableContainer.h
+++ b/Source/WebCore/rendering/svg/RenderSVGTransformableContainer.h
@@ -18,10 +18,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef RenderSVGTransformableContainer_h
-#define RenderSVGTransformableContainer_h
+#pragma once
 
-#if ENABLE(SVG)
 #include "RenderSVGContainer.h"
 #include "SVGGraphicsElement.h"
 
@@ -30,18 +28,18 @@ namespace WebCore {
 class SVGGraphicsElement;
 class RenderSVGTransformableContainer final : public RenderSVGContainer {
 public:
-    RenderSVGTransformableContainer(SVGGraphicsElement&, PassRef<RenderStyle>);
-    SVGGraphicsElement& graphicsElement() { return toSVGGraphicsElement(RenderSVGContainer::element()); }
+    RenderSVGTransformableContainer(SVGGraphicsElement&, RenderStyle&&);
+    SVGGraphicsElement& graphicsElement() { return downcast<SVGGraphicsElement>(RenderSVGContainer::element()); }
 
-    virtual bool isSVGTransformableContainer() const { return true; }
-    virtual const AffineTransform& localToParentTransform() const { return m_localTransform; }
-    virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }
-    virtual bool didTransformToRootUpdate() { return m_didTransformToRootUpdate; }
+    bool isSVGTransformableContainer() const override { return true; }
+    const AffineTransform& localToParentTransform() const override { return m_localTransform; }
+    void setNeedsTransformUpdate() override { m_needsTransformUpdate = true; }
+    bool didTransformToRootUpdate() override { return m_didTransformToRootUpdate; }
 
 private:
     void element() const = delete;
-    virtual bool calculateLocalTransform();
-    virtual AffineTransform localTransform() const { return m_localTransform; }
+    bool calculateLocalTransform() override;
+    AffineTransform localTransform() const override { return m_localTransform; }
 
     bool m_needsTransformUpdate : 1;
     bool m_didTransformToRootUpdate : 1;
@@ -49,7 +47,6 @@ private:
     FloatSize m_lastTranslation;
 };
 
-}
+} // namespace WebCore
 
-#endif // ENABLE(SVG)
-#endif // RenderSVGTransformableContainer_h
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderSVGTransformableContainer, isSVGTransformableContainer())