* Add core and kit functions to QWebFramePrivate to convert from

  QWebFrame to WebCore::Frame and vice versa.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29516 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index 0b125f0e49c22b07cd53b618024e34eb57daf592..72509566496970c7328a51ab22407d03f49313c0 100644 (file)
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -535,6 +535,15 @@ QString QWebFrame::evaluateJavaScript(const QString& scriptSource)
     return rc;
 }
 
+WebCore::Frame* QWebFramePrivate::core(QWebFrame* webFrame)
+{
+    return webFrame->d->frame.get();
+}
+
+QWebFrame* QWebFramePrivate::kit(WebCore::Frame* coreFrame)
+{
+    return static_cast<FrameLoaderClientQt*>(coreFrame->loader()->client())->webFrame();
+}
 
 
 /*!

diff --git a/WebKit/qt/Api/qwebframe.h b/WebKit/qt/Api/qwebframe.h
index 9e58f13dd0d5096f9c5879e790cc8d4614915336..cca1fdaf920429d705e0f9b4f23398318836de15 100644 (file)
--- a/WebKit/qt/Api/qwebframe.h
+++ b/WebKit/qt/Api/qwebframe.h
@@ -127,6 +127,7 @@ Q_SIGNALS:
 private:
     friend class QWebPage;
     friend class QWebPagePrivate;
+    friend class QWebFramePrivate;
     friend class WebCore::WidgetPrivate;
     friend class WebCore::FrameLoaderClientQt;
     friend class WebCore::ChromeClientQt;

diff --git a/WebKit/qt/Api/qwebframe_p.h b/WebKit/qt/Api/qwebframe_p.h
index dd66f67a3e6d061fdb306f2fc3934aad60b5725c..0a2131a2c8a977540437f7ffa0f4f0ef2ce5b288 100644 (file)
--- a/WebKit/qt/Api/qwebframe_p.h
+++ b/WebKit/qt/Api/qwebframe_p.h
@@ -80,6 +80,9 @@ public:
     inline QPoint pos() const
     { return frameView->frameGeometry().topLeft(); }
 
+    static WebCore::Frame* core(QWebFrame*);
+    static QWebFrame* kit(WebCore::Frame*);
+
     QWebFrame *q;
     WebCore::FrameLoaderClientQt *frameLoaderClient;
     WTF::RefPtr<WebCore::Frame> frame;

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index f5e29e3c20d8e152e3accdb9bd0906b42b018bae..f9708aa5441d51bfe509fd3019afde53f60d80b8 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,17 @@
+2008-01-16  Holger Freyther  <holger.freyther@trolltech.com>
+
+        Reviewed by Simon.
+
+        * Add core and kit functions to QWebFramePrivate to convert from
+        QWebFrame to WebCore::Frame and vice versa.
+        
+
+        * Api/qwebframe.cpp:
+        (QWebFramePrivate::core):
+        (QWebFramePrivate::kit):
+        * Api/qwebframe.h:
+        * Api/qwebframe_p.h:
+
 2008-01-16  Lars Knoll  <lars@trolltech.com>
 
         Reviewed by Simon.