Imported WebKit commit 8eb048315f36fa33731f28694630fe4a3c2cbc99 (http://svn.webkit.org/repository/webkit/trunk@135602)

New snapshot that fixes various bugs

Change-Id: Icb6ce541a26a9f500d087821ce4b83a8d8a5474a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 5 insertions, 2 deletions

diff --git a/Source/WebKit/qt/Api/qwebframe.h b/Source/WebKit/qt/Api/qwebframe.h
index ca96661e3..fe00d81f5 100644
--- a/Source/WebKit/qt/Api/qwebframe.h
+++ b/Source/WebKit/qt/Api/qwebframe.h
@@ -41,8 +41,10 @@ class QPrinter;
 QT_END_NAMESPACE
 
 class QWebNetworkRequest;
+class QWebFrameAdapter;
 class QWebFramePrivate;
 class QWebPage;
+class QWebPageAdapter;
 class QWebHitTestResult;
 class QWebHistoryItem;
 class QWebSecurityOrigin;
@@ -115,8 +117,8 @@ class QWEBKIT_EXPORT QWebFrame : public QObject {
     Q_PROPERTY(QPoint scrollPosition READ scrollPosition WRITE setScrollPosition)
     Q_PROPERTY(bool focus READ hasFocus)
 private:
-    QWebFrame(QWebPage *parent, QWebFrameData *frameData);
-    QWebFrame(QWebFrame *parent, QWebFrameData *frameData);
+    QWebFrame(QWebPage *parentPage);
+    QWebFrame(QWebFrame* parent, QWebFrameData*);
     ~QWebFrame();
 
 public:
@@ -200,6 +202,7 @@ public:
     virtual bool event(QEvent *);
 
     QWebSecurityOrigin securityOrigin() const;
+    QWebFrameAdapter* handle() const;
 
 public Q_SLOTS:
     QVariant evaluateJavaScript(const QString& scriptSource);