[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
paroga at webkit.org
paroga at webkit.org
Wed Dec 22 16:16:15 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 480452bb5845bd2514eb160f76cd172be64a588d
Author: paroga at webkit.org <paroga at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Nov 20 17:40:10 2010 +0000
2010-11-20 Patrick Gansterer <paroga at webkit.org>
Reviewed by Andreas Kling.
Use String::fromUTF8 instead of UTF8Encoding().decode
in the libxml XMLDocumentParser
https://bugs.webkit.org/show_bug.cgi?id=45488
* dom/XMLDocumentParser.cpp:
(WebCore::toString):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72476 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6b67002..63e7c70 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-20 Patrick Gansterer <paroga at webkit.org>
+
+ Reviewed by Andreas Kling.
+
+ Use String::fromUTF8 instead of UTF8Encoding().decode
+ in the libxml XMLDocumentParser
+ https://bugs.webkit.org/show_bug.cgi?id=45488
+
+ * dom/XMLDocumentParser.cpp:
+ (WebCore::toString):
+
2010-11-20 Renata Hodovan <reni at inf.u-szeged.hu>
Reviewed by Dirk Schulze.
diff --git a/WebCore/dom/XMLDocumentParser.cpp b/WebCore/dom/XMLDocumentParser.cpp
index b790217..2bfd9cc 100644
--- a/WebCore/dom/XMLDocumentParser.cpp
+++ b/WebCore/dom/XMLDocumentParser.cpp
@@ -181,9 +181,9 @@ void XMLDocumentParser::enterText()
}
#if !USE(QXMLSTREAM)
-static inline String toString(const xmlChar* str, unsigned len)
-{
- return UTF8Encoding().decode(reinterpret_cast<const char*>(str), len);
+static inline String toString(const xmlChar* string, size_t size)
+{
+ return String::fromUTF8(reinterpret_cast<const char*>(string), size);
}
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list