[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 312bb28b212bc5240661a9d8788cd18e0a603779
Author: robert at webkit.org <robert at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Sep 6 19:38:37 2010 +0000

    Fix compile failure in r66843
    
    Revert to original patch in bugzilla. Leave bug open for
    discussion on potential removal of double utf8 conversion.
    
    https://bugs.webkit.org/show_bug.cgi?id=45240
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66844 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index faf0b16..b57ba26 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,19 @@
 2010-09-06  Robert Hogan  <robert at webkit.org>
 
+        Unreviewed, compile fix.
+
+        Fix compile failure in r66843
+
+        Revert to original patch in bugzilla. Leave bug open for
+        discussion on potential removal of double utf8 conversion.
+
+        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
diff --git a/JavaScriptCore/wtf/text/WTFString.cpp b/JavaScriptCore/wtf/text/WTFString.cpp
index 7d09ab9..853e1b5 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 StringImpl::create(buffer.constData(), buffer.length());
+    return StringImpl::create(buffer.toUtf8().constData(), buffer.toUtf8().length());
 
 #elif OS(WINCE)
     va_list args;

-- 
WebKit Debian packaging