auto merge of #1448 : saneyuki/servo/attr, r=jdm

src/components/script/dom/bindings/codegen/Bindings.conf

@@ -185,7 +185,7 @@ DOMInterfaces = {
 'Element': {
     'nativeType': 'AbstractNode',
     'pointerType': '',
-    'needsAbstract': ['getClientRects', 'getBoundingClientRect', 'setAttribute', 'setAttributeNS', 'id', 'attributes']
+    'needsAbstract': ['getClientRects', 'getBoundingClientRect', 'setAttribute', 'setAttributeNS', 'removeAttribute', 'removeAttributeNS', 'id', 'attributes']
 },
 
 'Event': {

src/components/script/dom/document.rs

@@ -406,23 +406,33 @@ impl Document {
 
     pub fn update_idmap(&mut self,
                         abstract_self: AbstractNode,
-                        new_id: DOMString,
+                        new_id: Option<DOMString>,
                         old_id: Option<DOMString>) {
-        // remove old ids if the old ones are not same as the new one.
+        // remove old ids:
+        // * if the old ones are not same as the new one,
+        // * OR if the new one is none.
         match old_id {
-            Some(ref old_id) if new_id != *old_id => {
+            Some(ref old_id) if new_id.is_none() ||
+                                (*new_id.get_ref() != *old_id) => {
                 self.idmap.remove(old_id);
             }
             _ => ()
         }
 
-        // TODO: support the case if multiple elements which haves same id are in the same document.
+        match new_id {
-        self.idmap.mangle(new_id, abstract_self, |_, new_node: AbstractNode| -> AbstractNode {
+            Some(new_id) => {
-                             new_node
+                // TODO: support the case if multiple elements
-                         },
+                // which haves same id are in the same document.
-                         |_, old_node: &mut AbstractNode, new_node: AbstractNode| {
+                self.idmap.mangle(new_id, abstract_self,
-                             *old_node = new_node;
+                                  |_, new_node: AbstractNode| -> AbstractNode {
-                         });
+                                      new_node
+                                  },
+                                  |_, old_node: &mut AbstractNode, new_node: AbstractNode| {
+                                      *old_node = new_node;
+                                  });
+            }
+            None => ()
+        }
     }
 }
 

src/components/script/dom/element.rs

@@ -171,14 +171,7 @@ impl Element {
                          namespace: Namespace,
                          name: DOMString,
                          value: DOMString) -> ErrorResult {
-        //FIXME: Throw for XML-invalid names
+        let (prefix, local_name) = get_attribute_parts(name.clone());
-        //FIXME: Throw for XMLNS-invalid names
-        let (prefix, local_name) = if name.contains(":")  {
-            let parts: ~[&str] = name.splitn(':', 1).collect();
-            (Some(parts[0].to_owned()), parts[1].to_owned())
-        } else {
-            (None, name.clone())
-        };
         match prefix {
             Some(ref prefix_str) => {
                 if (namespace == namespace::Null ||
@@ -226,9 +219,11 @@ impl Element {
                 self.style_attribute = Some(style::parse_style_attribute(value))
             }
             "id" => {
+                // XXX: this dual declaration are workaround to avoid the compile error:
+                // "borrowed value does not live long enough"
                 let doc = self.node.owner_doc();
                 let doc = doc.mut_document();
-                doc.update_idmap(abstract_self, value.clone(), old_value);
+                doc.update_idmap(abstract_self, Some(value.clone()), old_value);
             }
             _ => ()
         }
@@ -249,6 +244,76 @@ impl Element {
             _ => ()
         }
 
+        self.notify_attribute_changed(abstract_self, local_name);
+    }
+
+    pub fn remove_attribute(&mut self,
+                            abstract_self: AbstractNode,
+                            namespace: Namespace,
+                            name: DOMString) -> ErrorResult {
+        let (_, local_name) = get_attribute_parts(name.clone());
+
+        self.node.wait_until_safe_to_modify_dom();
+
+        let idx = self.attrs.iter().position(|attr: &@mut Attr| -> bool {
+            attr.local_name == local_name
+        });
+
+        match idx {
+            None => (),
+            Some(idx) => {
+                let removed = self.attrs.remove(idx);
+                let removed_raw_value = Some(removed.Value());
+
+                if namespace == namespace::Null {
+                    self.after_remove_attr(abstract_self, local_name, removed_raw_value);
+                }
+            }
+        };
+
+        Ok(())
+    }
+
+    fn after_remove_attr(&mut self,
+                         abstract_self: AbstractNode,
+                         local_name: DOMString,
+                         old_value: Option<DOMString>) {
+        match local_name.as_slice() {
+            "style" => {
+                self.style_attribute = None
+            }
+            "id" => {
+                // XXX: this dual declaration are workaround to avoid the compile error:
+                // "borrowed value does not live long enough"
+                let doc = self.node.owner_doc();
+                let doc = doc.mut_document();
+                doc.update_idmap(abstract_self, None, old_value);
+            }
+            _ => ()
+        }
+
+        //XXXjdm We really need something like a vtable so we can call AfterSetAttr.
+        //       This hardcoding is awful.
+        match abstract_self.type_id() {
+            ElementNodeTypeId(HTMLImageElementTypeId) => {
+                abstract_self.with_mut_image_element(|image| {
+                    image.AfterRemoveAttr(local_name.clone());
+                });
+            }
+            ElementNodeTypeId(HTMLIframeElementTypeId) => {
+                abstract_self.with_mut_iframe_element(|iframe| {
+                    iframe.AfterRemoveAttr(local_name.clone());
+                });
+            }
+            _ => ()
+        }
+
+        self.notify_attribute_changed(abstract_self, local_name);
+    }
+
+    fn notify_attribute_changed(&self,
+                                abstract_self: AbstractNode,
+                                local_name: DOMString) {
         if abstract_self.is_in_doc() {
             let damage = match local_name.as_slice() {
                 "style" | "id" | "class" => MatchSelectorsDocumentDamage,
@@ -321,8 +386,7 @@ impl Element {
 
     pub fn SetAttribute(&mut self, abstract_self: AbstractNode, name: DOMString, value: DOMString)
                         -> ErrorResult {
-        self.set_attr(abstract_self, name, value);
+        self.set_attr(abstract_self, name, value)
-        Ok(())
     }
 
     pub fn SetAttributeNS(&mut self,
@@ -341,12 +405,18 @@ impl Element {
         self.set_attribute(abstract_self, namespace, name, value)
     }
 
-    pub fn RemoveAttribute(&self, _name: DOMString) -> ErrorResult {
+    pub fn RemoveAttribute(&mut self,
-        Ok(())
+                           abstract_self: AbstractNode,
+                           name: DOMString) -> ErrorResult {
+        self.remove_attribute(abstract_self, namespace::Null, name)
     }
 
-    pub fn RemoveAttributeNS(&self, _namespace: Option<DOMString>, _localname: DOMString) -> ErrorResult {
+    pub fn RemoveAttributeNS(&mut self,
-        Ok(())
+                             abstract_self: AbstractNode,
+                             namespace: Option<DOMString>,
+                             localname: DOMString) -> ErrorResult {
+        let namespace = Namespace::from_str(namespace);
+        self.remove_attribute(abstract_self, namespace, localname)
     }
 
     pub fn HasAttribute(&self, name: DOMString) -> bool {
@@ -489,3 +559,17 @@ impl Element {
         Ok(None)
     }
 }
+
+
+fn get_attribute_parts(name: DOMString) -> (Option<~str>, ~str) {
+    //FIXME: Throw for XML-invalid names
+    //FIXME: Throw for XMLNS-invalid names
+    let (prefix, local_name) = if name.contains(":")  {
+        let parts: ~[&str] = name.splitn(':', 1).collect();
+        (Some(parts[0].to_owned()), parts[1].to_owned())
+    } else {
+        (None, name)
+    };
+
+    (prefix, local_name)
+}

src/components/script/dom/htmliframeelement.rs

@@ -112,6 +112,12 @@ impl HTMLIFrameElement {
         }
     }
 
+    pub fn AfterRemoveAttr(&mut self, name: DOMString) {
+        if "sandbox" == name {
+            self.sandbox = None;
+        }
+    }
+
     pub fn AllowFullscreen(&self) -> bool {
         false
     }

src/components/script/dom/htmlimageelement.rs

@@ -67,6 +67,17 @@ impl HTMLImageElement {
         }
     }
 
+    pub fn AfterRemoveAttr(&mut self, name: DOMString) {
+        // FIXME (#1469):
+        // This might not handle remove src attribute actually since
+        // `self.update_image()` will see the missing src attribute and return early.
+        if "src" == name {
+            let document = self.htmlelement.element.node.owner_doc();
+            let window = document.document().window;
+            self.update_image(window.image_cache_task.clone(), None);
+        }
+    }
+
     pub fn Alt(&self) -> DOMString {
         ~""
     }

src/test/html/content/test_document_getElementById.html

@@ -59,6 +59,11 @@
 
       let old = document.getElementById(TEST_ID);
       is(old, null, "test3-1, the method shouldn't get the element by the old id.");
+
+      // remove id.
+      test.removeAttribute("id");
+      let e2 = document.getElementById(UPDATED_ID);
+      is(e2, null, "test3-2, the method should return null when the passed id is none in document.");
     }
 
     // TODO:

src/test/html/content/test_element_attribute.html

@@ -31,6 +31,16 @@
       is(r, VALUE, "test3, attribute update by Element.setAttribute().")
     }
 
+    {
+      test.setAttribute("id", "bar");
+      test.removeAttribute("id");
+
+      let r1 = test.hasAttribute("id");
+      is(r1, false, "test4-0, Element.removeAttribute().");
+      let r2 = test.getAttribute("id");
+      is(r2, null, "test4-1, Element.removeAttribute().");
+    }
+
     finish();
   </script>
 </body>