diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /WebCore/dom/XMLDocumentParserLibxml2.cpp | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'WebCore/dom/XMLDocumentParserLibxml2.cpp')
| -rw-r--r-- | WebCore/dom/XMLDocumentParserLibxml2.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
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 { |