[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 27aeb88f83e44cecceec95a7b12f615b170871fc
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 6 19:11:00 2010 +0000

    2010-09-06  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [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
    
            Both tests failed because Qt's implementation of String::format()
            is casting a utf8 result to String, which assumes latin1 in
            its constructor. So instead of casting a QString to a String, use
            StringImpl::create() instead. Unfortunately, this involves a lot
            of extra casts but the end result is correct.
    
            https://bugs.webkit.org/show_bug.cgi?id=45240
    
            * wtf/text/WTFString.cpp:
            (WTF::String::format):
    2010-09-06  Robert Hogan  <robert at webkit.org>
    
            Reviewed by Andreas Kling.
    
            [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
    
            Both tests failed because Qt's implementation of String::format()
            is casting a utf8 result to String, which assumes latin1 in
            its constructor. So instead of casting a QString to a String, use
            StringImpl::create() instead. Unfortunately, this involves a lot
            of extra casts but the end result is correct.
    
            https://bugs.webkit.org/show_bug.cgi?id=45240
    
            * platform/qt/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66843 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index df0e2ce..faf0b16 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,24 @@
+2010-09-06  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [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
+
+        Both tests failed because Qt's implementation of String::format()
+        is casting a utf8 result to String, which assumes latin1 in
+        its constructor. So instead of casting a QString to a String, use
+        StringImpl::create() instead. Unfortunately, this involves a lot
+        of extra casts but the end result is correct.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45240
+
+        * wtf/text/WTFString.cpp:
+        (WTF::String::format):
+
 2010-09-03  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/JavaScriptCore/wtf/text/WTFString.cpp b/JavaScriptCore/wtf/text/WTFString.cpp
index a83dbba..7d09ab9 100644
--- a/JavaScriptCore/wtf/text/WTFString.cpp
+++ b/JavaScriptCore/wtf/text/WTFString.cpp
@@ -335,7 +335,7 @@ String String::format(const char *format, ...)
 
     va_end(args);
 
-    return buffer;
+    return StringImpl::create(buffer.constData(), buffer.length());
 
 #elif OS(WINCE)
     va_list args;
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1be5398..6f5f91a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,23 @@
+2010-09-06  Robert Hogan  <robert at webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        [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
+
+        Both tests failed because Qt's implementation of String::format()
+        is casting a utf8 result to String, which assumes latin1 in
+        its constructor. So instead of casting a QString to a String, use
+        StringImpl::create() instead. Unfortunately, this involves a lot
+        of extra casts but the end result is correct.
+
+        https://bugs.webkit.org/show_bug.cgi?id=45240
+
+        * platform/qt/Skipped:
+
 2010-09-06  Justin Schuh  <jschuh at chromium.org>
 
         Unreviewed. Build fix.
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

-- 
WebKit Debian packaging