webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 11 insertions, 15 deletions

diff --git a/Source/WebCore/rendering/RenderFrameSet.h b/Source/WebCore/rendering/RenderFrameSet.h
index a1838e7d1..843e2155c 100644
--- a/Source/WebCore/rendering/RenderFrameSet.h
+++ b/Source/WebCore/rendering/RenderFrameSet.h
@@ -20,8 +20,7 @@
  *
  */
 
-#ifndef RenderFrameSet_h
-#define RenderFrameSet_h
+#pragma once
 
 #include "RenderBox.h"
 
@@ -55,14 +54,14 @@ private:
 
 class RenderFrameSet final : public RenderBox {
 public:
-    RenderFrameSet(HTMLFrameSetElement&, PassRef<RenderStyle>);
+    RenderFrameSet(HTMLFrameSetElement&, RenderStyle&&);
     virtual ~RenderFrameSet();
 
     HTMLFrameSetElement& frameSetElement() const;
 
     FrameEdgeInfo edgeInfo() const;
 
-    bool userResize(MouseEvent*);
+    bool userResize(MouseEvent&);
 
     bool isResizingRow() const;
     bool isResizingColumn() const;
@@ -91,14 +90,14 @@ private:
         int m_splitResizeOffset;
     };
 
-    virtual const char* renderName() const override { return "RenderFrameSet"; }
-    virtual bool isFrameSet() const override { return true; }
+    const char* renderName() const override { return "RenderFrameSet"; }
+    bool isFrameSet() const override { return true; }
 
-    virtual void layout() override;
-    virtual void paint(PaintInfo&, const LayoutPoint&) override;
-    virtual bool canHaveChildren() const override { return true; }
-    virtual bool isChildAllowed(const RenderObject&, const RenderStyle&) const override;
-    virtual CursorDirective getCursor(const LayoutPoint&, Cursor&) const override;
+    void layout() override;
+    void paint(PaintInfo&, const LayoutPoint&) override;
+    bool canHaveChildren() const override { return true; }
+    bool isChildAllowed(const RenderObject&, const RenderStyle&) const override;
+    CursorDirective getCursor(const LayoutPoint&, Cursor&) const override;
 
     bool flattenFrameSet() const;
 
@@ -126,9 +125,6 @@ private:
     bool m_isChildResizing;
 };
 
-template<> inline bool isRendererOfType<const RenderFrameSet>(const RenderObject& renderer) { return renderer.isFrameSet(); }
-RENDER_OBJECT_TYPE_CASTS(RenderFrameSet, isFrameSet())
-
 } // namespace WebCore
 
-#endif // RenderFrameSet_h
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderFrameSet, isFrameSet())