Changeset 64679 in webkit

Timestamp:

Aug 4, 2010 2:26:22 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-04 Pierre Rossi <​pierre.rossi@nokia.com>

Reviewed by Antonio Gomes.

[Qt] QWebFrame::setContent() does not respect charset provided in the mimeType
​https://bugs.webkit.org/show_bug.cgi?id=43125

• Api/qwebframe.cpp: (QWebFrame::setContent):
• tests/qwebframe/tst_qwebframe.cpp:

Location:

trunk/WebKit/qt

Files:

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

trunk/WebKit/qt/Api/qwebframe.cpp

@@ -37 +37 @@
 #include "HTMLMetaElement.h"
 #include "HitTestResult.h"
+#include "HTTPParsers.h"
 #include "IconDatabase.h"
 #include "InspectorController.h"
@@ -831 +832 @@
     WebCore::ResourceRequest request(kurl);
     WTF::RefPtr<WebCore::SharedBuffer> buffer = WebCore::SharedBuffer::create(data.constData(), data.length());
-    QString actualMimeType = mimeType;
-    if (actualMimeType.isEmpty())
+    QString actualMimeType;
+    WebCore::String encoding;
+    if (mimeType.isEmpty())
         actualMimeType = QLatin1String("text/html");
-    WebCore::SubstituteData substituteData(buffer, WebCore::String(actualMimeType), WebCore::String(), KURL());
+    else {
+        actualMimeType = extractMIMETypeFromMediaType(mimeType);
+        encoding = extractCharsetFromMediaType(mimeType);
+    }
+    WebCore::SubstituteData substituteData(buffer, WebCore::String(actualMimeType), encoding, KURL());
     d->frame->loader()->load(request, substituteData, false);
 }

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-08-04  Pierre Rossi  <pierre.rossi@nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] QWebFrame::setContent() does not respect charset provided in the mimeType
+        https://bugs.webkit.org/show_bug.cgi?id=43125
+
+        * Api/qwebframe.cpp:
+        (QWebFrame::setContent):
+        * tests/qwebframe/tst_qwebframe.cpp:
+
 2010-08-03  Noam Rosenthal  <noam.rosenthal@nokia.com>
 

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

@@ -34 +34 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
+#include <QTextCodec>
 #ifndef QT_NO_OPENSSL
 #include <qsslerror.h>
@@ -626 +627 @@
     void introspectQtMethods_data();
     void introspectQtMethods();
+    void setContent_data();
+    void setContent();
 
 private:
@@ -3102 +3105 @@
 }
 
+void tst_QWebFrame::setContent_data()
+{
+    QTest::addColumn<QString>("mimeType");
+    QTest::addColumn<QByteArray>("testContents");
+    QTest::addColumn<QString>("expected");
+
+    QString str = QString::fromUtf8("ὕαλον ϕαγεῖν δύναμαι· τοῦτο οὔ με βλάπτει");
+    QTest::newRow("UTF-8 plain text") << "text/plain; charset=utf-8" << str.toUtf8() << str;
+
+    QTextCodec *utf16 = QTextCodec::codecForName("UTF-16");
+    if (utf16)
+        QTest::newRow("UTF-16 plain text") << "text/plain; charset=utf-16" << utf16->fromUnicode(str) << str;
+
+    str = QString::fromUtf8("Une chaîne de caractères à sa façon.");
+    QTest::newRow("latin-1 plain text") << "text/plain; charset=iso-8859-1" << str.toLatin1() << str;
+
+
+}
+
+void tst_QWebFrame::setContent()
+{
+    QFETCH(QString, mimeType);
+    QFETCH(QByteArray, testContents);
+    QFETCH(QString, expected);
+    m_view->setContent(testContents, mimeType);
+    QWebFrame* mainFrame = m_view->page()->mainFrame();
+    QCOMPARE(expected , mainFrame->toPlainText());
+}
+
 QTEST_MAIN(tst_QWebFrame)
 #include "tst_qwebframe.moc"