[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[robert at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f85fb242a81eaa8a02fd53e9c11a2c9b9bede040
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 5 14:28:20 2010 +0000

    2010-09-05  Robert Hogan  <robert at 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 at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66801 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ac58ce8..2d58bee 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2010-09-05  Robert Hogan  <robert at 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 at google.com>
 
         Reviewed by Martin Robinson.
diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 9c9210b..b3503c8 100644
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -181,11 +181,6 @@ http/tests/security/frameNavigation/not-opener.html
 # 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.
 http/tests/media
 http/tests/wml
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 8f026a2..65e482e 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-05  Robert Hogan  <robert at 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 at openbossa.org>
 
         Reviewed by Darin Adler.
diff --git a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
index 8b01d4d..2585f6a 100644
--- a/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+++ b/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -265,7 +265,7 @@ void ChromeClientQt::setResizable(bool)
 void ChromeClientQt::addMessageToConsole(MessageSource, MessageType, MessageLevel, const String& message,
                                          unsigned int lineNumber, const String& sourceID)
 {
-    QString x = message;
+    QString x = QString(message.utf8().data());
     QString y = sourceID;
     m_webPage->javaScriptConsoleMessage(x, lineNumber, y);
 }

-- 
WebKit Debian packaging