webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 13 insertions, 11 deletions

diff --git a/Source/WebCore/rendering/RenderFrame.h b/Source/WebCore/rendering/RenderFrame.h
index 03f5a4fbb..7cb6b673e 100644
--- a/Source/WebCore/rendering/RenderFrame.h
+++ b/Source/WebCore/rendering/RenderFrame.h
@@ -20,34 +20,36 @@
  *
  */
 
-#ifndef RenderFrame_h
-#define RenderFrame_h
+#pragma once
 
+#include "HTMLFrameElement.h"
 #include "RenderFrameBase.h"
-#include "RenderFrameSet.h"
 
 namespace WebCore {
 
-class HTMLFrameElement;
+struct FrameEdgeInfo;
 
 class RenderFrame final : public RenderFrameBase {
 public:
-    RenderFrame(HTMLFrameElement&, PassRef<RenderStyle>);
+    RenderFrame(HTMLFrameElement&, RenderStyle&&);
 
     HTMLFrameElement& frameElement() const;
     FrameEdgeInfo edgeInfo() const;
 
+    void updateFromElement() final;
+
 private:
     void frameOwnerElement() const = delete;
 
-    virtual const char* renderName() const override { return "RenderFrame"; }
-    virtual bool isFrame() const override { return true; }
-
-    virtual void updateFromElement() override;
+    const char* renderName() const final { return "RenderFrame"; }
+    bool isFrame() const final { return true; }
 };
 
-RENDER_OBJECT_TYPE_CASTS(RenderFrame, isFrame())
+inline RenderFrame* HTMLFrameElement::renderer() const
+{
+    return downcast<RenderFrame>(HTMLFrameElementBase::renderer());
+}
 
 } // namespace WebCore
 
-#endif // RenderFrame_h
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderFrame, isFrame())