Imported WebKit commit 9a52e27980f47e8b0d8f8b7cc0fd7b5741bceb92 (http://svn.webkit.org/repository/webkit/trunk@116736)

New snapshot to include QDeclarative* -> QQml* build fixes

1 files changed, 7 insertions, 4 deletions

diff --git a/Source/WebCore/html/HTMLFrameOwnerElement.h b/Source/WebCore/html/HTMLFrameOwnerElement.h
index de9d15320..227622f17 100644
--- a/Source/WebCore/html/HTMLFrameOwnerElement.h
+++ b/Source/WebCore/html/HTMLFrameOwnerElement.h
@@ -54,24 +54,27 @@ public:
     virtual ScrollbarMode scrollingMode() const { return ScrollbarAuto; }
 
     SandboxFlags sandboxFlags() const { return m_sandboxFlags; }
+    void disconnectContentFrame();
 
 protected:
     HTMLFrameOwnerElement(const QualifiedName& tagName, Document*);
-
     void setSandboxFlags(SandboxFlags);
 
-    virtual void willRemove();
-
 private:
     friend class Frame;
 
-    virtual bool isFrameOwnerElement() const { return true; }
     virtual bool isKeyboardFocusable(KeyboardEvent*) const;
 
     Frame* m_contentFrame;
     SandboxFlags m_sandboxFlags;
 };
 
+inline HTMLFrameOwnerElement* toFrameOwnerElement(Node* node)
+{
+    ASSERT(!node || node->isFrameOwnerElement());
+    return static_cast<HTMLFrameOwnerElement*>(node);
+}
+
 } // namespace WebCore
 
 #endif // HTMLFrameOwnerElement_h