webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 12 insertions, 20 deletions

diff --git a/Source/WebCore/html/HTMLFrameElement.h b/Source/WebCore/html/HTMLFrameElement.h
index 5579c9848..4f08ab046 100644
--- a/Source/WebCore/html/HTMLFrameElement.h
+++ b/Source/WebCore/html/HTMLFrameElement.h
@@ -21,41 +21,33 @@
  *
  */
 
-#ifndef HTMLFrameElement_h
-#define HTMLFrameElement_h
+#pragma once
 
 #include "HTMLFrameElementBase.h"
 
 namespace WebCore {
 
+class RenderFrame;
+
 class HTMLFrameElement final : public HTMLFrameElementBase {
 public:
-    static PassRefPtr<HTMLFrameElement> create(const QualifiedName&, Document&);
+    static Ref<HTMLFrameElement> create(const QualifiedName&, Document&);
 
     bool hasFrameBorder() const { return m_frameBorder; }
-
     bool noResize() const;
 
+    RenderFrame* renderer() const;
+
 private:
     HTMLFrameElement(const QualifiedName&, Document&);
 
-    virtual void didAttachRenderers() override;
-
-    virtual bool rendererIsNeeded(const RenderStyle&) override;
-    virtual RenderPtr<RenderElement> createElementRenderer(PassRef<RenderStyle>) override;
-    
-    virtual void parseAttribute(const QualifiedName&, const AtomicString&) override;
+    void didAttachRenderers() final;
+    bool rendererIsNeeded(const RenderStyle&) final;
+    RenderPtr<RenderElement> createElementRenderer(RenderStyle&&, const RenderTreePosition&) final;
+    void parseAttribute(const QualifiedName&, const AtomicString&) final;
 
-#if ENABLE(FULLSCREEN_API)
-    virtual bool allowFullScreen() const { return false; }
-#endif
-
-    bool m_frameBorder;
-    bool m_frameBorderSet;
+    bool m_frameBorder { true };
+    bool m_frameBorderSet { false };
 };
 
-NODE_TYPE_CASTS(HTMLFrameElement)
-
 } // namespace WebCore
-
-#endif // HTMLFrameElement_h