Changeset 54060 in webkit

Timestamp:

Jan 29, 2010 6:33:13 AM (10 years ago)

Author:

Simon Hausmann

Message:

[Qt] Speed up the WebCore::String -> QString conversion

Patch by Oswald Buddenhagen <​oswald.buddenhagen@nokia.com> on 2010-01-29
Reviewed by Simon Hausmann.

Use QString(const QChar *, int len) constructor instead of QString::fromUtf16 to
avoid BOM checks and byteswapping.

• bridge/qt/qt_class.cpp:

(JSC::Bindings::QtClass::fieldNamed):

• bridge/qt/qt_runtime.cpp:

(JSC::Bindings::convertValueToQVariant):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/qt/qt_class.cpp (modified) (1 diff)
• bridge/qt/qt_runtime.cpp (modified) (9 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-29  Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Speed up the WebCore::String -> QString conversion
+
+        Use QString(const QChar *, int len) constructor instead of QString::fromUtf16 to
+        avoid BOM checks and byteswapping.
+
+        * bridge/qt/qt_class.cpp:
+        (JSC::Bindings::QtClass::fieldNamed):
+        * bridge/qt/qt_runtime.cpp:
+        (JSC::Bindings::convertValueToQVariant):
+
 2010-01-29  Alexander Pavlov  <apavlov@chromium.org>
 

trunk/WebCore/bridge/qt/qt_class.cpp

@@ -128 +128 @@
     QObject* obj = qtinst->getObject();
     UString ustring = identifier.ustring();
-    QString objName(QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size()));
+    QString objName((const QChar*)ustring.rep()->data(), ustring.size());
     QByteArray ba = objName.toAscii();
 

trunk/WebCore/bridge/qt/qt_runtime.cpp

@@ -306 +306 @@
             } else {
                 UString ustring = value.toString(exec);
-                ret = QVariant(QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size()));
+                ret = QVariant(QString((const QChar*)ustring.rep()->data(), ustring.size()));
                 if (type == String)
                     dist = 0;
@@ -330 +330 @@
                         if (objdist >= 0) {
                             UString ustring = (*it).ustring();
-                            QString id = QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size());
+                            QString id = QString((const QChar*)ustring.rep()->data(), ustring.size());
                             result.insert(id, v);
                         }
@@ -405 +405 @@
                     JSValue val = rtarray->getConcreteArray()->valueAt(exec, i);
                     UString ustring = val.toString(exec);
-                    QString qstring = QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size());
+                    QString qstring = QString((const QChar*)ustring.rep()->data(), ustring.size());
 
                     result.append(qstring);
@@ -419 +419 @@
                     JSValue val = array->get(exec, i);
                     UString ustring = val.toString(exec);
-                    QString qstring = QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size());
+                    QString qstring = QString((const QChar*)ustring.rep()->data(), ustring.size());
 
                     result.append(qstring);
@@ -428 +428 @@
                 // Make a single length array
                 UString ustring = value.toString(exec);
-                QString qstring = QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size());
+                QString qstring = QString((const QChar*)ustring.rep()->data(), ustring.size());
                 QStringList result;
                 result.append(qstring);
@@ -444 +444 @@
             } else {
                 UString ustring = value.toString(exec);
-                ret = QVariant(QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size()).toLatin1());
+                ret = QVariant(QString((const QChar*)ustring.rep()->data(), ustring.size()).toLatin1());
                 if (type == String)
                     dist = 5;
@@ -486 +486 @@
             } else if (type == String) {
                 UString ustring = value.toString(exec);
-                QString qstring = QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size());
+                QString qstring = QString((const QChar*)ustring.rep()->data(), ustring.size());
 
                 if (hint == QMetaType::QDateTime) {
@@ -535 +535 @@
                 // Attempt to convert.. a bit risky
                 UString ustring = value.toString(exec);
-                QString qstring = QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size());
+                QString qstring = QString((const QChar*)ustring.rep()->data(), ustring.size());
 
                 // this is of the form '/xxxxxx/i'
@@ -555 +555 @@
             } else if (type == String) {
                 UString ustring = value.toString(exec);
-                QString qstring = QString::fromUtf16((const ushort*)ustring.rep()->data(),ustring.size());
+                QString qstring = QString((const QChar*)ustring.rep()->data(), ustring.size());
 
                 QRegExp re(qstring);