auto merge of #2414 : Ms2ger/servo/parser-attribute, r=SimonSapin

2 files changed, 24 insertions, 7 deletions

diff --git a/src/components/script/dom/element.rs b/src/components/script/dom/element.rs
index b21bf35b325..5b8bd777468 100644
--- a/src/components/script/dom/element.rs
+++ b/src/components/script/dom/element.rs
@@ -206,7 +206,9 @@ impl<'a> ElementHelpers for JSRef<'a, Element> {
 
 pub trait AttributeHandlers {
     fn get_attribute(&self, namespace: Namespace, name: &str) -> Option<Temporary<Attr>>;
-    fn set_attr(&mut self, name: DOMString, value: DOMString) -> ErrorResult;
+    fn set_attribute_from_parser(&mut self, local_name: DOMString,
+                                 value: DOMString, namespace: Namespace,
+                                 prefix: Option<DOMString>);
     fn set_attribute(&mut self, namespace: Namespace, name: DOMString,
                      value: DOMString) -> ErrorResult;
     fn do_set_attribute(&mut self, local_name: DOMString, value: DOMString,
@@ -238,8 +240,14 @@ impl<'a> AttributeHandlers for JSRef<'a, Element> {
         }
     }
 
-    fn set_attr(&mut self, name: DOMString, value: DOMString) -> ErrorResult {
-        self.set_attribute(namespace::Null, name, value)
+    fn set_attribute_from_parser(&mut self, local_name: DOMString,
+                                 value: DOMString, namespace: Namespace,
+                                 prefix: Option<DOMString>) {
+        let name = match prefix {
+            None => local_name.clone(),
+            Some(ref prefix) => format!("{:s}:{:s}", *prefix, local_name),
+        };
+        self.do_set_attribute(local_name, value, name, namespace, prefix, |_| false)
     }
 
     fn set_attribute(&mut self, namespace: Namespace, name: DOMString,
diff --git a/src/components/script/html/hubbub_html_parser.rs b/src/components/script/html/hubbub_html_parser.rs
index 38fc676ce08..46f047053f5 100644
--- a/src/components/script/html/hubbub_html_parser.rs
+++ b/src/components/script/html/hubbub_html_parser.rs
@@ -17,7 +17,9 @@ use html::cssparse::{StylesheetProvenance, UrlProvenance, spawn_css_parser};
 use script_task::Page;
 
 use hubbub::hubbub;
+use hubbub::hubbub::{NullNs, XLinkNs, XmlNs, XmlNsNs};
 use servo_net::resource_task::{Load, Payload, Done, ResourceTask, load_whole_resource};
+use servo_util::namespace;
 use servo_util::namespace::Null;
 use servo_util::str::{DOMString, HTML_SPACE_CHARACTERS};
 use servo_util::task::spawn_named;
@@ -327,10 +329,17 @@ pub fn parse_html(page: &Page,
 
             debug!("-- attach attrs");
             for attr in tag.attributes.iter() {
-                //FIXME: this should have proper error handling or explicitly drop
-                //       exceptions on the ground
-                assert!(element.set_attr(attr.name.clone(),
-                                         attr.value.clone()).is_ok());
+                let (namespace, prefix) = match attr.ns {
+                    NullNs => (namespace::Null, None),
+                    XLinkNs => (namespace::XLink, Some("xlink")),
+                    XmlNs => (namespace::XML, Some("xml")),
+                    XmlNsNs => (namespace::XMLNS, Some("xmlns")),
+                    ns => fail!("Not expecting namespace {:?}", ns),
+                };
+                element.set_attribute_from_parser(attr.name.clone(),
+                                                  attr.value.clone(),
+                                                  namespace,
+                                                  prefix.map(|p| p.to_owned()));
             }
 
             //FIXME: workaround for https://github.com/mozilla/rust/issues/13246;