Changeset 145512 in webkit

Timestamp:

Mar 12, 2013 4:11:14 AM (11 years ago)

Author:

jocelyn.turcotte@digia.com

Message:

[Qt][WK2] Favor QUrl and QString over WTF::String in the Qt API layer
​https://bugs.webkit.org/show_bug.cgi?id=109468

Reviewed by Allan Sandfeld Jensen.
Signed off for WebKit2 by Benjamin Poulain.

In preparation for patches using the C API types in some areas, remove the
usage of WTF::String on the affected line.

Use a QUrl for icon URL to avoid unnecessary conversion.
Use a QString for the page URL to keep it compatible with WebPageProxy and
WebIconDatabase and avoid QUrl parsing.

• UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::_q_onIconChangedForPageURL):
(QQuickWebViewPrivate::updateIcon):
(QQuickWebView::emitUrlChangeIfNeeded):
(QQuickWebView::icon):

• UIProcess/API/qt/qquickwebview_p_p.h:

(QQuickWebViewPrivate):

• UIProcess/API/qt/qwebiconimageprovider.cpp:

(QWebIconImageProvider::iconURLForPageURLInContext):

• UIProcess/API/qt/qwebiconimageprovider_p.h:
• UIProcess/qt/QtWebIconDatabaseClient.cpp:

(WebKit::QtWebIconDatabaseClient::iconForPageURL):
(WebKit::QtWebIconDatabaseClient::iconImageForPageURL):
(WebKit::QtWebIconDatabaseClient::retainIconForPageURL):
(WebKit::QtWebIconDatabaseClient::releaseIconForPageURL):

• UIProcess/qt/QtWebIconDatabaseClient.h:

(QtWebIconDatabaseClient):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/qquickwebview.cpp (modified) (4 diffs)
• UIProcess/API/qt/qquickwebview_p_p.h (modified) (1 diff)
• UIProcess/API/qt/qwebiconimageprovider.cpp (modified) (3 diffs)
• UIProcess/API/qt/qwebiconimageprovider_p.h (modified) (1 diff)
• UIProcess/qt/QtWebIconDatabaseClient.cpp (modified) (4 diffs)
• UIProcess/qt/QtWebIconDatabaseClient.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-02-14  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
+
+        [Qt][WK2] Favor QUrl and QString over WTF::String in the Qt API layer
+        https://bugs.webkit.org/show_bug.cgi?id=109468
+
+        Reviewed by Allan Sandfeld Jensen.
+        Signed off for WebKit2 by Benjamin Poulain.
+
+        In preparation for patches using the C API types in some areas, remove the
+        usage of WTF::String on the affected line.
+
+        Use a QUrl for icon URL to avoid unnecessary conversion.
+        Use a QString for the page URL to keep it compatible with WebPageProxy and
+        WebIconDatabase and avoid QUrl parsing.
+
+        * UIProcess/API/qt/qquickwebview.cpp:
+        (QQuickWebViewPrivate::_q_onIconChangedForPageURL):
+        (QQuickWebViewPrivate::updateIcon):
+        (QQuickWebView::emitUrlChangeIfNeeded):
+        (QQuickWebView::icon):
+        * UIProcess/API/qt/qquickwebview_p_p.h:
+        (QQuickWebViewPrivate):
+        * UIProcess/API/qt/qwebiconimageprovider.cpp:
+        (QWebIconImageProvider::iconURLForPageURLInContext):
+        * UIProcess/API/qt/qwebiconimageprovider_p.h:
+        * UIProcess/qt/QtWebIconDatabaseClient.cpp:
+        (WebKit::QtWebIconDatabaseClient::iconForPageURL):
+        (WebKit::QtWebIconDatabaseClient::iconImageForPageURL):
+        (WebKit::QtWebIconDatabaseClient::retainIconForPageURL):
+        (WebKit::QtWebIconDatabaseClient::releaseIconForPageURL):
+        * UIProcess/qt/QtWebIconDatabaseClient.h:
+        (QtWebIconDatabaseClient):
+
 2013-03-12  Manuel Rego Casasnovas  <rego@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

@@ -628 +628 @@
 void QQuickWebViewPrivate::_q_onIconChangedForPageURL(const QString& pageUrl)
 {
-    if (pageUrl != QString(m_currentUrl))
+    if (pageUrl != m_currentUrl)
         return;
 
@@ -648 +648 @@
         return;
 
-    WTF::String iconUrl = provider->iconURLForPageURLInContext(m_currentUrl, context.get());
+    QUrl iconUrl = provider->iconURLForPageURLInContext(m_currentUrl, context.get());
 
     if (iconUrl == m_iconUrl)
@@ -1701 +1701 @@
     Q_D(QQuickWebView);
 
-    WTF::String activeUrl = d->webPageProxy->activeURL();
+    QString activeUrl = d->webPageProxy->activeURL();
     if (activeUrl != d->m_currentUrl) {
         d->m_currentUrl = activeUrl;
@@ -1729 +1729 @@
 {
     Q_D(const QQuickWebView);
-    return QUrl(d->m_iconUrl);
+    return d->m_iconUrl;
 }
 

trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h

@@ -203 +203 @@
     bool m_renderToOffscreenBuffer;
     bool m_allowAnyHTTPSCertificateForLocalHost;
-    WTF::String m_iconUrl;
+    QUrl m_iconUrl;
     int m_loadProgress;
-    WTF::String m_currentUrl;
+    QString m_currentUrl;
 };
 

trunk/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider.cpp

@@ -39 +39 @@
 }
 
-WTF::String QWebIconImageProvider::iconURLForPageURLInContext(const WTF::String &pageURL, QtWebContext* context)
+QUrl QWebIconImageProvider::iconURLForPageURLInContext(const QString &pageURL, QtWebContext* context)
 {
     QtWebIconDatabaseClient* iconDatabase = context->iconDatabase();
-    WTF::String iconURL = iconDatabase->iconForPageURL(pageURL);
+    QUrl iconURL = iconDatabase->iconForPageURL(pageURL);
 
     if (iconURL.isEmpty())
-        return String();
+        return QUrl();
 
     QUrl url;
@@ -51 +51 @@
     url.setHost(QWebIconImageProvider::identifier());
     // Make sure that QML doesn't show cached versions of the previous icon if the icon location changed.
-    url.setPath(QLatin1Char('/') + QString::number(WTF::StringHash::hash(iconURL)));
+    url.setPath(QLatin1Char('/') + QString::number(WTF::StringHash::hash(iconURL.toString())));
 
     // FIXME: Use QUrl::DecodedMode when landed in Qt
-    url.setFragment(QString::fromLatin1(QByteArray(QString(pageURL).toUtf8()).toBase64()));
+    url.setFragment(QString::fromLatin1(pageURL.toUtf8().toBase64()));
 
     // FIXME: We can't know when the icon url is no longer in use,
@@ -61 +61 @@
     iconDatabase->retainIconForPageURL(pageURL);
 
-    return url.toString(QUrl::FullyEncoded);
+    return url;
 }
 

trunk/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h

@@ -37 +37 @@
     static QString identifier() { return QStringLiteral("webicon"); }
 
-    WTF::String iconURLForPageURLInContext(const WTF::String& pageURL, WebKit::QtWebContext* context);
+    QUrl iconURLForPageURLInContext(const QString& pageURL, WebKit::QtWebContext* context);
     virtual QImage requestImage(const QString& id, QSize* size, const QSize& requestedSize);
 };

trunk/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp

@@ -66 +66 @@
 }
 
-WTF::String QtWebIconDatabaseClient::iconForPageURL(const WTF::String& pageURL)
+QUrl QtWebIconDatabaseClient::iconForPageURL(const QString& pageURL)
 {
     String iconURL;
@@ -72 +72 @@
 
     if (iconURL.isEmpty())
-        return String();
+        return QUrl();
 
     // Verify that the image data is actually available before reporting back
@@ -78 +78 @@
     WebCore::Image* iconImage = m_iconDatabase->imageForPageURL(pageURL);
     if (!iconImage || iconImage->isNull())
-        return String();
+        return QUrl();
 
-    return iconURL;
+    return QUrl(iconURL);
 }
 
-QImage QtWebIconDatabaseClient::iconImageForPageURL(const WTF::String& pageURL, const QSize& iconSize)
+QImage QtWebIconDatabaseClient::iconImageForPageURL(const QString& pageURL, const QSize& iconSize)
 {
     MutexLocker locker(m_imageLock);
@@ -96 +96 @@
 }
 
-void QtWebIconDatabaseClient::retainIconForPageURL(const String& pageURL)
+void QtWebIconDatabaseClient::retainIconForPageURL(const QString& pageURL)
 {
     m_iconDatabase->retainIconForPageURL(pageURL);
 }
 
-void QtWebIconDatabaseClient::releaseIconForPageURL(const String& pageURL)
+void QtWebIconDatabaseClient::releaseIconForPageURL(const QString& pageURL)
 {
     m_iconDatabase->releaseIconForPageURL(pageURL);

trunk/Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.h

@@ -34 +34 @@
 QT_END_NAMESPACE
 
-namespace WTF {
-class String;
-}
-
 namespace WebKit {
 
@@ -50 +46 @@
     ~QtWebIconDatabaseClient();
 
-    WTF::String iconForPageURL(const WTF::String& pageURL);
-    QImage iconImageForPageURL(const WTF::String& pageURL, const QSize& iconSize = QSize(32, 32));
+    QUrl iconForPageURL(const QString& pageURL);
+    QImage iconImageForPageURL(const QString& pageURL, const QSize& iconSize = QSize(32, 32));
 
-    void retainIconForPageURL(const WTF::String&);
-    void releaseIconForPageURL(const WTF::String&);
+    void retainIconForPageURL(const QString&);
+    void releaseIconForPageURL(const QString&);
 
 public: