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

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

Issue 24483007: Make DOMParser::parseFromString specification compliant and throw exception in error scenario. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch after adding descriptive message. Created 7 years, 2 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 | « Source/core/xml/DOMParser.h ('k') | Source/core/xml/DOMParser.idl » ('j') | 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
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
12 * Lesser General Public License for more details. 12 * Lesser General Public License for more details.
13 * 13 *
14 * You should have received a copy of the GNU Lesser General Public 14 * You should have received a copy of the GNU Lesser General Public
15 * License along with this library; if not, write to the Free Software 15 * License along with this library; if not, write to the Free Software
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 U SA 16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 U SA
17 */ 17 */
18 18
19 #include "config.h" 19 #include "config.h"
20 #include "core/xml/DOMParser.h" 20 #include "core/xml/DOMParser.h"
21 21
22 #include "core/dom/DOMImplementation.h" 22 #include "core/dom/DOMImplementation.h"
23 #include "core/dom/ExceptionCode.h"
23 #include "wtf/text/WTFString.h" 24 #include "wtf/text/WTFString.h"
24 25
25 namespace WebCore { 26 namespace WebCore {
26 27
27 PassRefPtr<Document> DOMParser::parseFromString(const String& str, const String& contentType) 28 PassRefPtr<Document> DOMParser::parseFromString(const String& str, const String& contentType, ExceptionState& es)
28 { 29 {
29 if (!DOMImplementation::isXMLMIMEType(contentType) && contentType != "text/h tml") 30 // HTML5 is very explicit about which types we're allowed to support here:
31 // http://domparsing.spec.whatwg.org/#the-domparser-interface
32 if (contentType != "text/html"
33 && contentType != "text/xml"
34 && contentType != "application/xml"
35 && contentType != "application/xhtml+xml"
36 && contentType != "image/svg+xml") {
37 es.throwDOMException(TypeError, "Unsupported mime-type specified.");
30 return 0; 38 return 0;
39 }
31 40
32 RefPtr<Document> doc = DOMImplementation::createDocument(contentType, 0, KUR L(), false); 41 RefPtr<Document> doc = DOMImplementation::createDocument(contentType, 0, KUR L(), false);
33 doc->setContent(str); 42 doc->setContent(str);
34 return doc.release(); 43 return doc.release();
35 } 44 }
36 45
37 } // namespace WebCore 46 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/xml/DOMParser.h ('k') | Source/core/xml/DOMParser.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698