Changeset 66801 in webkit

Timestamp:

Sep 5, 2010 7:28:20 AM (14 years ago)

Author:

robert@webkit.org

Message:

2010-09-05 Robert Hogan <​robert@webkit.org>

Reviewed by Antonio Gomes.

[Qt] utf8 encoding of console() messages

Unskip:
http/tests/security/xssAuditor/embed-tag-null-char.html
http/tests/security/xssAuditor/object-embed-tag-null-char.html

​https://bugs.webkit.org/show_bug.cgi?id=45240

• platform/qt/Skipped:

2010-09-05 Robert Hogan <​robert@webkit.org>

Reviewed by Antonio Gomes.

[Qt] utf8 encoding of console() messages

http/tests/security/xssAuditor/embed-tag-null-char.html
http/tests/security/xssAuditor/object-embed-tag-null-char.html

both fail because ChromeClientQt::addMessageToConsole() is
casting String to QString rather than String::utf8().data()

​https://bugs.webkit.org/show_bug.cgi?id=45240

• WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::addMessageToConsole):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-09-05  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] utf8 encoding of console() messages
+
+        Unskip:
+        http/tests/security/xssAuditor/embed-tag-null-char.html
+        http/tests/security/xssAuditor/object-embed-tag-null-char.html
+
+        https://bugs.webkit.org/show_bug.cgi?id=45240
+
+        * platform/qt/Skipped:
+
 2010-09-04  Steve Block  <steveblock@google.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -181 +181 @@
 # missing origin header
 http/tests/security/originHeader/origin-header-for-empty.html
-
-# Possibly related to https://bugs.webkit.org/show_bug.cgi?id=35263
-# are we utf-encoding a string twice over?
-http/tests/security/xssAuditor/embed-tag-null-char.html
-http/tests/security/xssAuditor/object-embed-tag-null-char.html
 
 # Disabled HTTP subdirs for now, needs investigation.

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-09-05  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] utf8 encoding of console() messages
+
+        http/tests/security/xssAuditor/embed-tag-null-char.html
+        http/tests/security/xssAuditor/object-embed-tag-null-char.html
+
+        both fail because ChromeClientQt::addMessageToConsole() is
+        casting String to QString rather than String::utf8().data()
+
+        https://bugs.webkit.org/show_bug.cgi?id=45240
+
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::addMessageToConsole):
+
 2010-09-03  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 

trunk/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

@@ -266 +266 @@
                                          unsigned int lineNumber, const String& sourceID)
 {
-    QString x = message;
+    QString x = QString(message.utf8().data());
     QString y = sourceID;
     m_webPage->javaScriptConsoleMessage(x, lineNumber, y);