Changeset 46364 in webkit

Timestamp:

Jul 24, 2009 10:55:49 AM (15 years ago)

Author:

kenneth@webkit.org

Message:

2009-07-24 Antonio Gomes <​antonio.gomes@openbossa.org>

Reviewed by Simon Hausmann.

[QT] Implement originalUrl getter method to the API
​https://bugs.webkit.org/show_bug.cgi?id=25867

• Api/qwebframe.cpp: (QWebFrame::originalUrl):
• Api/qwebframe.h:
• tests/qwebframe/qwebframe.qrc:
• tests/qwebframe/test1.html: Added.
• tests/qwebframe/test2.html: Added.
• tests/qwebframe/tst_qwebframe.cpp:

Location:

trunk/WebKit/qt

Files:

• Api/qwebframe.cpp (modified) (2 diffs)
• Api/qwebframe.h (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• tests/qwebframe/qwebframe.qrc (modified) (1 diff)
• tests/qwebframe/test1.html (added)
• tests/qwebframe/test2.html (added)
• tests/qwebframe/tst_qwebframe.cpp (modified) (3 diffs)

trunk/WebKit/qt/Api/qwebframe.cpp

@@ -281 +281 @@
     frames are related to a web page and web view.
 
+    The QWebFrame class also offers methods to retrieve both the URL currently
+    loaded by the frame (see url()) as well as the URL originally requested
+    to be loaded (see originalUrl()). These methods make possible the retrieval
+    of the URL before and after a DNS resolution or a redirection occurs during
+    the load process. The originalUrl() also matches to the URL added to the
+    frame history (\l{QwebHistory}) if load is successful.
+
     The title of an HTML frame can be accessed with the title() property.
     Additionally, a frame may also specify an icon, which can be accessed
@@ -522 +529 @@
 
 /*!
+    \since 4.6
+    \property QWebFrame::originalUrl
+
+    The original url loaded by the frame currently viewed. The URL may differ from
+    the one returned by url() if a DNS resolution or a redirection occurs.
+
+    \sa url(), setUrl()
+*/
+QUrl QWebFrame::originalUrl() const
+{
+    if (!d->frame->loader()->activeDocumentLoader()
+        || !d->frameLoaderClient->m_loadSucceeded)
+        return QUrl(d->frame->loader()->outgoingReferrer());
+
+    return d->frame->loader()->originalRequest().url();
+}
+/*!
+    \since 4.6
     \property QWebFrame::baseUrl
     \brief the base URL of the frame, can be used to resolve relative URLs

trunk/WebKit/qt/Api/qwebframe.h

@@ -108 +108 @@
     Q_PROPERTY(QString title READ title)
     Q_PROPERTY(QUrl url READ url WRITE setUrl)
+    Q_PROPERTY(QUrl originalUrl READ originalUrl)
     Q_PROPERTY(QUrl baseUrl READ baseUrl)
     Q_PROPERTY(QIcon icon READ icon)
@@ -141 +142 @@
     void setUrl(const QUrl &url);
     QUrl url() const;
+    QUrl originalUrl() const;
     QUrl baseUrl() const;
     QIcon icon() const;

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-07-24  Antonio Gomes   <antonio.gomes@openbossa.org>
+
+        Reviewed by Simon Hausmann.
+
+        [QT] Implement originalUrl getter method to the API
+        https://bugs.webkit.org/show_bug.cgi?id=25867
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::originalUrl):
+        * Api/qwebframe.h:
+        * tests/qwebframe/qwebframe.qrc:
+        * tests/qwebframe/test1.html: Added.
+        * tests/qwebframe/test2.html: Added.
+        * tests/qwebframe/tst_qwebframe.cpp:
+
 2009-07-24  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 

trunk/WebKit/qt/tests/qwebframe/qwebframe.qrc

@@ -3 +3 @@
 <file>image.png</file>
 <file>style.css</file>
+<file>test1.html</file>
+<file>test2.html</file>
 </qresource>
 </RCC>

trunk/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp

@@ -32 +32 @@
 #include <QRegExp>
 #include <QNetworkRequest>
+#include <QNetworkReply>
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -574 +575 @@
     void urlChange();
     void domCycles();
+    void originalUrl();
     void setHtml();
     void setHtmlWithResource();
@@ -2160 +2162 @@
 }
 
+class FakeReply : public QNetworkReply {
+    Q_OBJECT
+
+    public:
+        FakeReply(const QNetworkRequest& request, QObject* parent = 0)
+            : QNetworkReply(parent)
+        {
+            setOperation(QNetworkAccessManager::GetOperation);
+            setRequest(request);
+            if (request.url() == QUrl("qrc:/test1.html")) {
+                setHeader(QNetworkRequest::LocationHeader, QString("qrc:/test2.html"));
+                setAttribute(QNetworkRequest::RedirectionTargetAttribute, QUrl("qrc:/test2.html"));
+            } else
+                setError(QNetworkReply::HostNotFoundError, tr("Invalid URL"));
+
+            open(QIODevice::ReadOnly);
+            QTimer::singleShot(0, this, SLOT(timeout()));
+        }
+        ~FakeReply()
+        {
+            close();
+        }
+        virtual void abort() {}
+        virtual void close() {}
+    protected:
+        qint64 readData(char* data, qint64 maxSize)
+        {
+            return 0;
+        }
+    private slots:
+        void timeout()
+        {
+            if (request().url() == QUrl("qrc://test1.html"))
+                emit error(this->error());
+            else if (request().url() == QUrl("http://abcdef.abcdef/"))
+                emit metaDataChanged();
+
+            emit readyRead();
+            emit finished();
+        }
+};
+
+class FakeNetworkManager : public QNetworkAccessManager {
+public:
+    FakeNetworkManager(QObject* parent) : QNetworkAccessManager(parent) { }
+
+protected:
+    virtual QNetworkReply* createRequest(Operation op, const QNetworkRequest& request, QIODevice* outgoingData)
+    {
+        if (op == QNetworkAccessManager::GetOperation
+            && (request.url().toString() == "qrc:/test1.html"
+            ||  request.url().toString() == "http://abcdef.abcdef/"))
+            return new FakeReply(request, this);
+
+        return QNetworkAccessManager::createRequest(op, request, outgoingData);
+    }
+};
+
+void tst_QWebFrame::originalUrl()
+{
+    QWebPage page;
+    QWebFrame* frame = page.mainFrame();
+
+    // in few seconds, the image should be completely loaded
+    QSignalSpy spy(&page, SIGNAL(loadFinished(bool)));
+    FakeNetworkManager* networkManager = new FakeNetworkManager(&page);
+    page.setNetworkAccessManager(networkManager);
+
+    frame->setUrl(QUrl("qrc:/test1.html"));
+    QTest::qWait(200);
+    QCOMPARE(spy.count(), 1);
+    QCOMPARE(frame->originalUrl(), QUrl("qrc:/test1.html"));
+    QCOMPARE(frame->url(), QUrl("qrc:/test2.html"));
+
+    frame->setUrl(QUrl("qrc:/non-existent.html"));
+    QTest::qWait(200);
+    QCOMPARE(spy.count(), 2);
+    QCOMPARE(frame->originalUrl(), QUrl("qrc:/non-existent.html"));
+    QCOMPARE(frame->url(), QUrl("qrc:/non-existent.html"));
+
+    frame->setUrl(QUrl("http://abcdef.abcdef"));
+    QTest::qWait(200);
+    QCOMPARE(spy.count(), 3);
+    QCOMPARE(frame->originalUrl(), QUrl("http://abcdef.abcdef/"));
+    QCOMPARE(frame->url(), QUrl("http://abcdef.abcdef/"));
+}
+
 void tst_QWebFrame::setHtml()
 {