diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/WebCore/xml/DOMParser.cpp | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/WebCore/xml/DOMParser.cpp')
| -rw-r--r-- | Source/WebCore/xml/DOMParser.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Source/WebCore/xml/DOMParser.cpp b/Source/WebCore/xml/DOMParser.cpp index e6aa3b0..c0d146c 100644 --- a/Source/WebCore/xml/DOMParser.cpp +++ b/Source/WebCore/xml/DOMParser.cpp @@ -24,20 +24,15 @@ #include "PlatformString.h" namespace WebCore { - + PassRefPtr<Document> DOMParser::parseFromString(const String& str, const String& contentType) { if (!DOMImplementation::isXMLMIMEType(contentType)) return 0; RefPtr<Document> doc = DOMImplementation::createDocument(contentType, 0, KURL(), false); - - doc->open(); - doc->write(str); - doc->finishParsing(); - doc->close(); - + doc->setContent(str); return doc.release(); } -} +} // namespace WebCore |