moved title(), url(), icon() and initialLayoutComplete() from QWebPage to QWebFrame

Signed-off-by: Simon
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29156 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebframe.cpp b/WebKit/qt/Api/qwebframe.cpp
index a695695a3524886b1601b9310a18d57f5025160d..c70ac2f66e1a16806795d62ff7d6cd6e28324ac0 100644 (file)
--- a/WebKit/qt/Api/qwebframe.cpp
+++ b/WebKit/qt/Api/qwebframe.cpp
@@ -32,6 +32,7 @@
 #include "Frame.h"
 #include "FrameTree.h"
 #include "FrameView.h"
+#include "IconDatabase.h"
 #include "Page.h"
 #include "ResourceRequest.h"
 #include "SelectionController.h"
@@ -187,6 +188,31 @@ QString QWebFrame::title() const
     else return QString();
 }
 
+QUrl QWebFrame::url() const
+{
+    return QUrl((QString)d->frame->loader()->url().string());
+}
+
+QPixmap QWebFrame::icon() const
+{
+    String url = d->frame->loader()->url().string();
+    Image* image = iconDatabase()->iconForPageURL(url, IntSize(16, 16));
+    if (!image || image->isNull()) {
+        image = iconDatabase()->defaultIcon(IntSize(16, 16));
+    }
+
+    if (!image) {
+        return QPixmap();
+    }
+
+    QPixmap *icon = image->getPixmap();
+    if (!icon) {
+        return QPixmap();
+    }
+    return *icon;
+}
+
+
 QString QWebFrame::name() const
 {
     return d->frame->tree()->name();
@@ -284,9 +310,9 @@ Qt::ScrollBarPolicy QWebFrame::verticalScrollBarPolicy() const
 
 void QWebFrame::setVerticalScrollBarPolicy(Qt::ScrollBarPolicy policy)
 {
-    Q_ASSERT(ScrollbarAuto == Qt::ScrollBarAsNeeded);
-    Q_ASSERT(ScrollbarAlwaysOff == Qt::ScrollBarAlwaysOff);
-    Q_ASSERT(ScrollbarAlwaysOn == Qt::ScrollBarAlwaysOn);
+    Q_ASSERT((int)ScrollbarAuto == (int)Qt::ScrollBarAsNeeded);
+    Q_ASSERT((int)ScrollbarAlwaysOff == (int)Qt::ScrollBarAlwaysOff);
+    Q_ASSERT((int)ScrollbarAlwaysOn == (int)Qt::ScrollBarAlwaysOn);
     d->frameView->setVScrollbarMode((ScrollbarMode)policy);
 }
 

diff --git a/WebKit/qt/Api/qwebframe.h b/WebKit/qt/Api/qwebframe.h
index 597b091b2ea619ec492b36f7041d7c2d6563ed9a..4cf11f9ed80a7d0d26eba5f95588403135c669eb 100644 (file)
--- a/WebKit/qt/Api/qwebframe.h
+++ b/WebKit/qt/Api/qwebframe.h
@@ -32,6 +32,7 @@
 class QRect;
 class QPoint;
 class QPainter;
+class QPixmap;
 class QMouseEvent;
 class QWheelEvent;
 class QWebNetworkRequest;
@@ -67,7 +68,11 @@ public:
     QString markup() const;
     QString innerText() const;
     QString renderTreeDump() const;
+
     QString title() const;
+    QUrl url() const;
+    QPixmap icon() const;
+    
     QString name() const;
 
     QList<QWebFrame*> childFrames() const;
@@ -96,6 +101,11 @@ Q_SIGNALS:
     void loadStarted();
     void loadFinished();
 
+    /**
+      * Signal is emitted when the mainframe()'s initial layout is completed.
+     */
+    void initialLayoutComplete();
+    
     /**
      * Signal is emitted when an icon ("favicon") is loaded from the site.
      */

diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index ab4fcfd94f42b1ed60433d49bf2ac6687b0b07d3..b6822b1e9a3153156e4a8848e7b05f0b36398e1a 100644 (file)
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -46,7 +46,6 @@
 #include "FrameLoadRequest.h"
 #include "KURL.h"
 #include "Image.h"
-#include "IconDatabase.h"
 #include "InspectorClientQt.h"
 #include "InspectorController.h"
 #include "FocusController.h"
@@ -308,16 +307,6 @@ QWebPage::~QWebPage()
     delete d;
 }
 
-QUrl QWebPage::url() const
-{
-    return QUrl((QString)mainFrame()->d->frame->loader()->url().string());
-}
-
-QString QWebPage::title() const
-{
-    return mainFrame()->title();
-}
-
 QWebFrame *QWebPage::mainFrame() const
 {
     d->createMainFrame();
@@ -341,13 +330,13 @@ void QWebPage::javaScriptConsoleMessage(const QString& message, unsigned int lin
 void QWebPage::javaScriptAlert(QWebFrame *frame, const QString& msg)
 {
     //FIXME frame pos...
-    QMessageBox::information(this, title(), msg, QMessageBox::Ok);
+    QMessageBox::information(this, mainFrame()->title(), msg, QMessageBox::Ok);
 }
 
 bool QWebPage::javaScriptConfirm(QWebFrame *frame, const QString& msg)
 {
     //FIXME frame pos...
-    return 0 == QMessageBox::information(this, title(), msg, QMessageBox::Yes, QMessageBox::No);
+    return 0 == QMessageBox::information(this, mainFrame()->title(), msg, QMessageBox::Yes, QMessageBox::No);
 }
 
 bool QWebPage::javaScriptPrompt(QWebFrame *frame, const QString& msg, const QString& defaultValue, QString* result)
@@ -355,7 +344,7 @@ bool QWebPage::javaScriptPrompt(QWebFrame *frame, const QString& msg, const QStr
     //FIXME frame pos...
     bool ok = false;
 #ifndef QT_NO_INPUTDIALOG
-    QString x = QInputDialog::getText(this, title(), msg, QLineEdit::Normal, defaultValue, &ok);
+    QString x = QInputDialog::getText(this, mainFrame()->title(), msg, QLineEdit::Normal, defaultValue, &ok);
     if (ok && result) {
         *result = x;
     }
@@ -1166,24 +1155,6 @@ QWebNetworkInterface *QWebPage::networkInterface() const
         return QWebNetworkInterface::defaultInterface();
 }
 
-QPixmap QWebPage::icon() const
-{
-    Image* image = iconDatabase()->iconForPageURL(url().toString(), IntSize(16, 16));
-    if (!image || image->isNull()) {
-        image = iconDatabase()->defaultIcon(IntSize(16, 16));
-    }
-
-    if (!image) {
-        return QPixmap();
-    }
-
-    QPixmap *icon = image->getPixmap();
-    if (!icon) {
-        return QPixmap();
-    }
-    return *icon;
-}
-
 QWebSettings *QWebPage::settings()
 {
     return d->settings;

diff --git a/WebKit/qt/Api/qwebpage.h b/WebKit/qt/Api/qwebpage.h
index d0d011c55976a73b098c3e9ec055dbb855aa3911..452e8b68f45571f7a359bdbbebf5f4893b9cd6b9 100644 (file)
--- a/WebKit/qt/Api/qwebpage.h
+++ b/WebKit/qt/Api/qwebpage.h
@@ -147,11 +147,6 @@ public:
 
     QWebSettings *settings();
 
-    // ### move to frame
-    QString title() const;
-    QUrl url() const;
-    QPixmap icon() const;
-
     bool isModified() const;
     QUndoStack *undoStack() const;
 
@@ -192,12 +187,6 @@ Q_SIGNALS:
 
     void selectionChanged();
 
-    /**
-      * Signal is emitted when the mainframe()'s initial layout is completed.
-     */
-    // ### move to frame
-    void initialLayoutComplete();
-
     // ### call addedToHistory instead, something more signal'ish
     void addToHistory(const QUrl&);
 

diff --git a/WebKit/qt/Api/qwebview.cpp b/WebKit/qt/Api/qwebview.cpp
index b1802e3d4a2043c2b69cd23e20be9fe8f05d5dc9..b1bee8a45076d335ebeac9a7d74321be48ce3533 100644 (file)
--- a/WebKit/qt/Api/qwebview.cpp
+++ b/WebKit/qt/Api/qwebview.cpp
@@ -121,21 +121,21 @@ QWebSettings *QWebView::settings() const
 QString QWebView::title() const
 {
     if (d->page)
-        return d->page->title();
+        return d->page->mainFrame()->title();
     return QString();
 }
 
 QUrl QWebView::url() const
 {
     if (d->page)
-        return d->page->url();
+        return d->page->mainFrame()->url();
     return QUrl();
 }
 
 QPixmap QWebView::icon() const
 {
     if (d->page)
-        return d->page->icon();
+        return d->page->mainFrame()->icon();
     return QPixmap();
 }
 

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 2e11f3fda4fd9c85948925b9aba4385b3b2c82fe..623817dba3cfbeca8dcdcfbf89cb808232b99b96 100644 (file)
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,25 @@
+2008-01-04  Lars Knoll  <lars@trolltech.com>
+
+        Reviewed by Simon.
+
+        moved title(), url(), icon() and initialLayoutComplete() from QWebPage to QWebFrame
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::url):
+        (QWebFrame::icon):
+        (QWebFrame::setVerticalScrollBarPolicy):
+        * Api/qwebframe.h:
+        * Api/qwebpage.cpp:
+        (QWebPage::javaScriptAlert):
+        (QWebPage::javaScriptPrompt):
+        (QWebPage::networkInterface):
+        * Api/qwebpage.h:
+        * Api/qwebview.cpp:
+        (QWebView::title):
+        (QWebView::url):
+        (QWebView::icon):
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+
 2008-01-03  Simon Hausmann  <hausmann@webkit.org>
 
         Reviewed by Lars.

diff --git a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 7f99cd1259c5367d61cb96606cf92469bf042fb8..3753ad6787e8585fea8ee305fd59832fc010edab 100644 (file)
--- a/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -335,7 +335,7 @@ void FrameLoaderClientQt::dispatchDidFinishLoad()
 void FrameLoaderClientQt::dispatchDidFirstLayout()
 {
     if (m_webFrame)
-        emit m_webFrame->page()->initialLayoutComplete();
+        emit m_webFrame->initialLayoutComplete();
 }