Changeset 62903 in webkit

Timestamp:

Jul 9, 2010 12:11:19 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-09 Anders Bakken <​agbakken@gmail.com>

Reviewed by Simon Hausmann.

[Qt] Remove superfluous function calls
​https://bugs.webkit.org/show_bug.cgi?id=40353

QWebFrame::setUrl() calls ensureAbsoluteUrl() twice. It's better to
store a local variable and reuse this one.

QWebFrame::load(QUrl) calls QWebFrame::load(QNetworkRequest) which in
turn will get the QUrl from the request and make sure it's absolute by
calling ensureAbsoluteUrl() on it.

• Api/qwebframe.cpp: (QWebFrame::setUrl): (QWebFrame::load):

Location:

trunk/WebKit/qt

Files:

• Api/qwebframe.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

trunk/WebKit/qt/Api/qwebframe.cpp

@@ -622 +622 @@
 void QWebFrame::setUrl(const QUrl &url)
 {
-    d->frame->loader()->writer()->begin(ensureAbsoluteUrl(url));
+    const QUrl absolute = ensureAbsoluteUrl(url);
+    d->frame->loader()->writer()->begin(absolute);
     d->frame->loader()->writer()->end();
-    load(ensureAbsoluteUrl(url));
+    load(absolute);
 }
 
@@ -715 +716 @@
 void QWebFrame::load(const QUrl &url)
 {
-    load(QNetworkRequest(ensureAbsoluteUrl(url)));
+    // The load() overload ensures that the url is absolute.
+    load(QNetworkRequest(url));
 }
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-07-09  Anders Bakken  <agbakken@gmail.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Remove superfluous function calls
+        https://bugs.webkit.org/show_bug.cgi?id=40353
+
+        QWebFrame::setUrl() calls ensureAbsoluteUrl() twice. It's better to
+        store a local variable and reuse this one.
+
+        QWebFrame::load(QUrl) calls QWebFrame::load(QNetworkRequest) which in
+        turn will get the QUrl from the request and make sure it's absolute by
+        calling ensureAbsoluteUrl() on it.
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::setUrl):
+        (QWebFrame::load):
+
 2010-07-08  Sam Magnuson  <smagnuson@netflix.com>