Changeset 46367 in webkit

Timestamp:

Jul 24, 2009, 11:05:58 AM (16 years ago)

Author:

kenneth@webkit.org

Message:

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

Reviewed by Adam Treat.

As per discussion on IRC, changed originalUrl by requestedUrl.

• Api/qwebframe.cpp: (QWebFrame::requestedUrl):
• Api/qwebframe.h:
• 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/tst_qwebframe.cpp (modified) (5 diffs)

trunk/WebKit/qt/Api/qwebframe.cpp

@@ -283 +283 @@
     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
+    to be loaded (see requestedUrl()). 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
+    the load process. The requestedUrl() also matches to the URL added to the
     frame history (\l{QwebHistory}) if load is successful.
 
@@ -530 +530 @@
 /*!
     \since 4.6
-    \property QWebFrame::originalUrl
-
-    The original url loaded by the frame currently viewed. The URL may differ from
+    \property QWebFrame::requestedUrl
+
+    The URL requested to 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
+QUrl QWebFrame::requestedUrl() const
 {
     if (!d->frame->loader()->activeDocumentLoader()

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 requestedUrl READ requestedUrl)
     Q_PROPERTY(QUrl baseUrl READ baseUrl)
     Q_PROPERTY(QIcon icon READ icon)
@@ -143 +143 @@
     void setUrl(const QUrl &url);
     QUrl url() const;
-    QUrl originalUrl() const;
+    QUrl requestedUrl() const;
     QUrl baseUrl() const;
     QIcon icon() const;

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2009-07-24  Antonio Gomes   <antonio.gomes@openbossa.org>
+
+        Reviewed by Adam Treat.
+
+        As per discussion on IRC, changed originalUrl by requestedUrl.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::requestedUrl):
+        * Api/qwebframe.h:
+        * tests/qwebframe/tst_qwebframe.cpp:
+
 2009-07-24  Andre Pedralho  <andre.pedralho@openbossa.org>
 

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

@@ -576 +576 @@
     void urlChange();
     void domCycles();
-    void originalUrl();
+    void requestedUrl();
     void setHtml();
     void setHtmlWithResource();
@@ -2222 +2222 @@
 };
 
-void tst_QWebFrame::originalUrl()
+void tst_QWebFrame::requestedUrl()
 {
     QWebPage page;
@@ -2235 +2235 @@
     QTest::qWait(200);
     QCOMPARE(spy.count(), 1);
-    QCOMPARE(frame->originalUrl(), QUrl("qrc:/test1.html"));
+    QCOMPARE(frame->requestedUrl(), QUrl("qrc:/test1.html"));
     QCOMPARE(frame->url(), QUrl("qrc:/test2.html"));
 
@@ -2241 +2241 @@
     QTest::qWait(200);
     QCOMPARE(spy.count(), 2);
-    QCOMPARE(frame->originalUrl(), QUrl("qrc:/non-existent.html"));
+    QCOMPARE(frame->requestedUrl(), QUrl("qrc:/non-existent.html"));
     QCOMPARE(frame->url(), QUrl("qrc:/non-existent.html"));
 
@@ -2247 +2247 @@
     QTest::qWait(200);
     QCOMPARE(spy.count(), 3);
-    QCOMPARE(frame->originalUrl(), QUrl("http://abcdef.abcdef/"));
+    QCOMPARE(frame->requestedUrl(), QUrl("http://abcdef.abcdef/"));
     QCOMPARE(frame->url(), QUrl("http://abcdef.abcdef/"));
 }