Remove QWebPage::createFrame()

now that QWebFrame doesn't have virtual methods anymore, there
is no need for a createFrame() factory method in QWebpage.

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

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index 05a7697ebd1bd566e02fa20bf720390cdd42d4f1..8441f2a6a9f6c69f29fa40bb3bace3ea47f9737c 100644 (file)
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -109,7 +109,7 @@ void QWebPagePrivate::createMainFrame()
         frameData.allowsScrolling = true;
         frameData.marginWidth = 0;
         frameData.marginHeight = 0;
-        mainFrame = q->createFrame(0, &frameData);
+        mainFrame = new QWebFrame(q, &frameData);
         QObject::connect(mainFrame, SIGNAL(titleChanged(const QString&)),
                 q, SIGNAL(titleChanged(const QString&)));
         QObject::connect(mainFrame, SIGNAL(hoveringOverLink(const QString&, const QString&)),
@@ -159,14 +159,6 @@ QWebPage::~QWebPage()
     delete d;
 }
 
-QWebFrame *QWebPage::createFrame(QWebFrame *parentFrame, QWebFrameData *frameData)
-{
-    if (parentFrame)
-        return new QWebFrame(parentFrame, frameData);
-    QWebFrame *f = new QWebFrame(this, frameData);
-    return f;
-}
-
 void QWebPage::open(const QUrl &url)
 {
     open(QWebNetworkRequest(url));

diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index 19424adc6238af23952040739e9d6c3ce4e439cc..99fc15d57be8b9c06842bbf94f40c32a84fcc699 100644 (file)
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -175,7 +175,6 @@ private slots:
     void onLoadProgressChanged(int);
 
 protected:
-    virtual QWebFrame *createFrame(QWebFrame *parentFrame, QWebFrameData *frameData);
     virtual QWebPage *createWindow();
     virtual QWebPage *createModalDialog();
     virtual QObject *createPlugin(const QString &classid, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 1624027a9464cb2b755fc0ba79c2b3f59a9b6881..d544b6ac12fc37ede1c7edbe1bdb270720c006dd 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,18 @@
+2007-11-07  Lars Knoll  <lars@trolltech.com>
+
+        Reviewed by Simon.
+
+        Remove QWebPage::createFrame()
+        
+        now that QWebFrame doesn't have virtual methods anymore, there
+        is no need for a createFrame() factory method in QWebpage.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::createMainFrame):
+        * Api/qwebpage.h:
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::createFrame):
+
 2007-11-07  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Lars Knoll <lars@trolltech.com>.

diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 7148616e991b5f510b4a0cf58cb99afe3f69fe6b..a8fb3660b71f04d68a04758667bf3f10eebb8853 100644 (file)
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -833,7 +833,7 @@ PassRefPtr<Frame> FrameLoaderClientQt::createFrame(const KURL& url, const String
     frameData.marginWidth = marginWidth;
     frameData.marginHeight = marginHeight;
 
-    QWebFrame* webFrame = m_webFrame->page()->createFrame(m_webFrame, &frameData);
+    QWebFrame* webFrame = new QWebFrame(m_webFrame, &frameData);
 
     RefPtr<Frame> childFrame = webFrame->d->frame;