From f05b935882198ccf7d81675736e3aeb089c5113a Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 5 May 2011 14:36:32 +0100
Subject: Merge WebKit at r74534: Initial merge by git.

Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
---
 WebCore/dom/XMLDocumentParserLibxml2.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'WebCore/dom/XMLDocumentParserLibxml2.cpp')

diff --git a/WebCore/dom/XMLDocumentParserLibxml2.cpp b/WebCore/dom/XMLDocumentParserLibxml2.cpp
index 7a3285f..23f9883 100644
--- a/WebCore/dom/XMLDocumentParserLibxml2.cpp
+++ b/WebCore/dom/XMLDocumentParserLibxml2.cpp
@@ -686,14 +686,12 @@ static inline String toString(const xmlChar* string)
 
 static inline AtomicString toAtomicString(const xmlChar* string, size_t size)
 {
-    // FIXME: Use AtomicString::fromUTF8.
-    return AtomicString(toString(string, size));
+    return AtomicString::fromUTF8(reinterpret_cast<const char*>(string), size);
 }
 
 static inline AtomicString toAtomicString(const xmlChar* string)
 {
-    // FIXME: Use AtomicString::fromUTF8.
-    return AtomicString(toString(string));
+    return AtomicString::fromUTF8(reinterpret_cast<const char*>(string));
 }
 
 struct _xmlSAX2Namespace {
-- 
cgit v1.1