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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 181d1ee585061ab3830624e8f73a2e6eed76ed09
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 17:44:54 2010 +0000

    2010-09-10  Patrick Gansterer  <paroga at paroga.com>
    
            Reviewed by Darin Adler.
    
            Use String::fromUTF8 instead of UTF8Encoding().decode
            in the libxml XMLDocumentParser
            https://bugs.webkit.org/show_bug.cgi?id=45488
    
            * dom/XMLDocumentParserLibxml2.cpp:
            (WebCore::toString):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67214 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 91728f2..be395ce 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-10  Patrick Gansterer  <paroga at paroga.com>
+
+        Reviewed by Darin Adler.
+
+        Use String::fromUTF8 instead of UTF8Encoding().decode
+        in the libxml XMLDocumentParser
+        https://bugs.webkit.org/show_bug.cgi?id=45488
+
+        * dom/XMLDocumentParserLibxml2.cpp:
+        (WebCore::toString):
+
 2010-09-10  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by David Kilzer.
diff --git a/WebCore/dom/XMLDocumentParserLibxml2.cpp b/WebCore/dom/XMLDocumentParserLibxml2.cpp
index 927fbbe..eee8d97 100644
--- a/WebCore/dom/XMLDocumentParserLibxml2.cpp
+++ b/WebCore/dom/XMLDocumentParserLibxml2.cpp
@@ -671,17 +671,14 @@ void XMLDocumentParser::doWrite(const String& parseString)
     }
 }
 
-static inline String toString(const xmlChar* str, unsigned len)
+static inline String toString(const xmlChar* string, size_t size)
 {
-    return UTF8Encoding().decode(reinterpret_cast<const char*>(str), len);
+    return String::fromUTF8(reinterpret_cast<const char*>(string), size);
 }
 
-static inline String toString(const xmlChar* str)
+static inline String toString(const xmlChar* string)
 {
-    if (!str)
-        return String();
-
-    return UTF8Encoding().decode(reinterpret_cast<const char*>(str), strlen(reinterpret_cast<const char*>(str)));
+    return String::fromUTF8(reinterpret_cast<const char*>(string));
 }
 
 struct _xmlSAX2Namespace {

-- 
WebKit Debian packaging