Changeset 116637 in webkit

Timestamp:

May 10, 2012 6:19:08 AM (12 years ago)

Author:

alexis.menard@openbossa.org

Message:

[Qt] Avoid string conversions to construct a QUrl when using Qt5.
​https://bugs.webkit.org/show_bug.cgi?id=86006

Reviewed by Kenneth Rohde Christiansen.

In Qt5, the QUrl constructor can handle the string directly, even in UTF-16 because the
constructor QUrl(QString) has been fixed. Unfortunately we still need to use the old
code path when building with Qt4.

No new tests : it's a performance improvement which should be covered by tests.

• platform/qt/KURLQt.cpp:

(WebCore::KURL::operator QUrl):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/KURLQt.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-10  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt] Avoid string conversions to construct a QUrl when using Qt5.
+        https://bugs.webkit.org/show_bug.cgi?id=86006
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        In Qt5, the QUrl constructor can handle the string directly, even in UTF-16 because the
+        constructor QUrl(QString) has been fixed. Unfortunately we still need to use the old
+        code path when building with Qt4.
+
+        No new tests : it's a performance improvement which should be covered by tests.
+
+        * platform/qt/KURLQt.cpp:
+        (WebCore::KURL::operator QUrl):
+
 2012-05-10  Noel Gordon  <noel.gordon@gmail.com>
 

trunk/Source/WebCore/platform/qt/KURLQt.cpp

@@ -35 +35 @@
 KURL::operator QUrl() const
 {
+#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
     QString str = QString::fromRawData(reinterpret_cast<const QChar*>(m_string.characters()), m_string.length());
     QByteArray ba = str.toUtf8();
@@ -40 +41 @@
     QUrl url = QUrl::fromEncoded(ba);
     return url;
+#else
+    return QUrl(m_string);
+#endif
 }