From 6eca17590c63eafc4c132f5698572e2899938275 Mon Sep 17 00:00:00 2001
From: Andrew Fluth <afluth@gmail.com>
Date: Thu, 2 Jun 2016 05:25:05 -0500
Subject: [PATCH] servo: Merge #11550 - Added support for additional xml types
 to DOMParser::parseFromString (from
 afluth:11505-ImplementParseFromStringXmlTypes); r=Ms2ger

<!-- Please describe your changes on the following line: -->
This pull request adds support for "application/xml" and "application/xhtml+xml" to DOMParser::parseFromString.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #11505 (github issue number if applicable).

<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 196adaff07201deb273077213fa63c460cc11629
---
 servo/components/script/dom/domparser.rs             | 7 +++++--
 servo/components/script/dom/webidls/DOMParser.webidl | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/servo/components/script/dom/domparser.rs b/servo/components/script/dom/domparser.rs
index f5655fdbed3b..346b8f801706 100644
--- a/servo/components/script/dom/domparser.rs
+++ b/servo/components/script/dom/domparser.rs
@@ -5,7 +5,10 @@
 use document_loader::DocumentLoader;
 use dom::bindings::codegen::Bindings::DOMParserBinding;
 use dom::bindings::codegen::Bindings::DOMParserBinding::DOMParserMethods;
-use dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::{Text_html, Text_xml};
+use dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Application_xhtml_xml;
+use dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Application_xml;
+use dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Text_html;
+use dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Text_xml;
 use dom::bindings::codegen::Bindings::DocumentBinding::DocumentReadyState;
 use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use dom::bindings::error::Fallible;
@@ -70,7 +73,7 @@ impl DOMParserMethods for DOMParser {
                 document.set_ready_state(DocumentReadyState::Complete);
                 Ok(document)
             }
-            Text_xml => {
+            Text_xml | Application_xml | Application_xhtml_xml => {
                 // FIXME: this should probably be FromParser when we actually parse the string (#3756).
                 let document = Document::new(&self.window,
                                              None,
diff --git a/servo/components/script/dom/webidls/DOMParser.webidl b/servo/components/script/dom/webidls/DOMParser.webidl
index 9df194706b9c..8680f695f973 100644
--- a/servo/components/script/dom/webidls/DOMParser.webidl
+++ b/servo/components/script/dom/webidls/DOMParser.webidl
@@ -8,9 +8,9 @@
 
 enum SupportedType {
   "text/html",
-  "text/xml"/*,
+  "text/xml",
   "application/xml",
-  "application/xhtml+xml",
+  "application/xhtml+xml"/*,
   "image/svg+xml"*/
 };