Imported QtWebKit TP3 (git b57bc6801f1876c3220d5a4bfea33d620d477443)

Change-Id: I3b1d8a2808782c9f34d50240000e20cb38d3680f
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

1 files changed, 9 insertions, 15 deletions

diff --git a/Source/WebCore/rendering/RenderFrame.h b/Source/WebCore/rendering/RenderFrame.h
index 9eadb9393..956b73a24 100644
--- a/Source/WebCore/rendering/RenderFrame.h
+++ b/Source/WebCore/rendering/RenderFrame.h
@@ -30,30 +30,24 @@ namespace WebCore {
 
 class HTMLFrameElement;
 
-class RenderFrame : public RenderFrameBase {
+class RenderFrame final : public RenderFrameBase {
 public:
-    explicit RenderFrame(HTMLFrameElement*);
+    RenderFrame(HTMLFrameElement&, Ref<RenderStyle>&&);
 
+    HTMLFrameElement& frameElement() const;
     FrameEdgeInfo edgeInfo() const;
 
 private:
-    virtual const char* renderName() const { return "RenderFrame"; }
-    virtual bool isFrame() const { return true; }
+    void frameOwnerElement() const = delete;
 
-    virtual void updateFromElement();
+    virtual const char* renderName() const override { return "RenderFrame"; }
+    virtual bool isFrame() const override { return true; }
 
-    virtual void viewCleared();
+    virtual void updateFromElement() override;
 };
 
-inline RenderFrame* toRenderFrame(RenderObject* object)
-{
-    ASSERT_WITH_SECURITY_IMPLICATION(!object || object->isFrame());
-    return static_cast<RenderFrame*>(object);
-}
-
-// This will catch anyone doing an unnecessary cast.
-void toRenderFrame(const RenderFrame*);
-
 } // namespace WebCore
 
+SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderFrame, isFrame())
+
 #endif // RenderFrame_h