Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1268)

Side by Side Diff: third_party/WebKit/Source/core/xml/DOMParser.cpp

Issue 2744153002: Use parseFromString type arg to set mime type. (Closed)
Patch Set: Fixed parseFromString-xml test expectations Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/external/wpt/domparsing/DOMParser-parseFromString-xml-expected.txt ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2006, 2008 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Lesser General Public 5 * modify it under the terms of the GNU Lesser General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 11 matching lines...) Expand all
22 #include "core/dom/DOMImplementation.h" 22 #include "core/dom/DOMImplementation.h"
23 #include "platform/weborigin/SecurityOrigin.h" 23 #include "platform/weborigin/SecurityOrigin.h"
24 #include "wtf/text/WTFString.h" 24 #include "wtf/text/WTFString.h"
25 25
26 namespace blink { 26 namespace blink {
27 27
28 Document* DOMParser::parseFromString(const String& str, const String& type) { 28 Document* DOMParser::parseFromString(const String& str, const String& type) {
29 Document* doc = DOMImplementation::createDocument( 29 Document* doc = DOMImplementation::createDocument(
30 type, DocumentInit(KURL(), nullptr, m_contextDocument), false); 30 type, DocumentInit(KURL(), nullptr, m_contextDocument), false);
31 doc->setContent(str); 31 doc->setContent(str);
32 doc->setMimeType(AtomicString(type));
32 if (m_contextDocument) { 33 if (m_contextDocument) {
33 doc->setURL(m_contextDocument->url()); 34 doc->setURL(m_contextDocument->url());
34 doc->setSecurityOrigin(m_contextDocument->getSecurityOrigin()); 35 doc->setSecurityOrigin(m_contextDocument->getSecurityOrigin());
35 } 36 }
36 return doc; 37 return doc;
37 } 38 }
38 39
39 DOMParser::DOMParser(Document& document) 40 DOMParser::DOMParser(Document& document)
40 : m_contextDocument(document.contextDocument()) {} 41 : m_contextDocument(document.contextDocument()) {}
41 42
42 DEFINE_TRACE(DOMParser) { 43 DEFINE_TRACE(DOMParser) {
43 visitor->trace(m_contextDocument); 44 visitor->trace(m_contextDocument);
44 } 45 }
45 46
46 } // namespace blink 47 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/external/wpt/domparsing/DOMParser-parseFromString-xml-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698