3 files changed, 56 insertions, 11 deletions

diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
index 4ef2fccc79d..ca9243beb1b 100644
--- a/components/script/dom/htmlimageelement.rs
+++ b/components/script/dom/htmlimageelement.rs
@@ -872,7 +872,7 @@ impl HTMLImageElement {
     }
 
     /// <https://html.spec.whatwg.org/multipage/#update-the-image-data>
-    fn update_the_image_data(&self) {
+    pub fn update_the_image_data(&self) {
         let document = document_from_node(self);
         let window = document.window();
         let elem = self.upcast::<Element>();
@@ -1574,15 +1574,11 @@ impl VirtualMethods for HTMLImageElement {
     fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
         self.super_type().unwrap().attribute_mutated(attr, mutation);
         match attr.local_name() {
-            &local_name!("src") => self.update_the_image_data(),
-            &local_name!("srcset") => self.update_the_image_data(),
+            &local_name!("src") | &local_name!("srcset")  |
+            &local_name!("width") | &local_name!("crossorigin") |
+            &local_name!("sizes") => self.update_the_image_data(),
             _ => {},
         }
-        if let Some(parent) = self.upcast::<Node>().GetParentElement() {
-            if parent.is::<HTMLPictureElement>() {
-                self.update_the_image_data();
-            }
-        }
     }
 
     fn parse_plain_attribute(&self, name: &LocalName, value: DOMString) -> AttrValue {
@@ -1645,6 +1641,9 @@ impl VirtualMethods for HTMLImageElement {
         if tree_in_doc {
             document.register_responsive_image(self);
         }
+
+        // The element is inserted into a picture parent element
+        // https://html.spec.whatwg.org/multipage/#relevant-mutations
         if let Some(parent) = self.upcast::<Node>().GetParentElement() {
             if parent.is::<HTMLPictureElement>() {
                 self.update_the_image_data();
@@ -1656,6 +1655,12 @@ impl VirtualMethods for HTMLImageElement {
         self.super_type().unwrap().unbind_from_tree(context);
         let document = document_from_node(self);
         document.unregister_responsive_image(self);
+
+        // The element is removed from a picture parent element
+        // https://html.spec.whatwg.org/multipage/#relevant-mutations
+        if context.parent.is::<HTMLPictureElement>() {
+            self.update_the_image_data();
+        }
     }
 }
 
diff --git a/components/script/dom/htmlsourceelement.rs b/components/script/dom/htmlsourceelement.rs
index c33a6ba8571..4f175d29c63 100644
--- a/components/script/dom/htmlsourceelement.rs
+++ b/components/script/dom/htmlsourceelement.rs
@@ -2,16 +2,20 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use dom::attr::Attr;
 use dom::bindings::codegen::Bindings::HTMLSourceElementBinding;
 use dom::bindings::codegen::Bindings::HTMLSourceElementBinding::HTMLSourceElementMethods;
 use dom::bindings::codegen::Bindings::NodeBinding::NodeBinding::NodeMethods;
 use dom::bindings::inheritance::Castable;
+use dom::bindings::root::{Dom, Root};
 use dom::bindings::root::DomRoot;
 use dom::bindings::str::DOMString;
 use dom::document::Document;
+use dom::element::AttributeMutation;
 use dom::htmlelement::HTMLElement;
+use dom::htmlimageelement::HTMLImageElement;
 use dom::htmlmediaelement::HTMLMediaElement;
-use dom::node::Node;
+use dom::node::{Node, UnbindContext};
 use dom::virtualmethods::VirtualMethods;
 use dom_struct::dom_struct;
 use html5ever::{LocalName, Prefix};
@@ -46,6 +50,14 @@ impl HTMLSourceElement {
             HTMLSourceElementBinding::Wrap,
         )
     }
+
+    fn iterate_next_html_image_element_siblings(next_siblings_iterator: impl Iterator<Item=Root<Dom<Node>>>) {
+        for next_sibling in next_siblings_iterator {
+            if let Some(html_image_element_sibling) = next_sibling.downcast::<HTMLImageElement>() {
+                html_image_element_sibling.update_the_image_data();
+            }
+        }
+    }
 }
 
 impl VirtualMethods for HTMLSourceElement {
@@ -53,6 +65,18 @@ impl VirtualMethods for HTMLSourceElement {
         Some(self.upcast::<HTMLElement>() as &VirtualMethods)
     }
 
+    fn attribute_mutated(&self, attr: &Attr, mutation: AttributeMutation) {
+        self.super_type().unwrap().attribute_mutated(attr, mutation);
+        match attr.local_name() {
+            &local_name!("srcset") | &local_name!("sizes")  |
+            &local_name!("media") | &local_name!("type") => {
+                let next_sibling_iterator = self.upcast::<Node>().following_siblings();
+                HTMLSourceElement::iterate_next_html_image_element_siblings(next_sibling_iterator);
+            },
+            _ => {},
+        }
+    }
+
     /// <https://html.spec.whatwg.org/multipage/#the-source-element:nodes-are-inserted>
     fn bind_to_tree(&self, tree_in_doc: bool) {
         self.super_type().unwrap().bind_to_tree(tree_in_doc);
@@ -60,6 +84,16 @@ impl VirtualMethods for HTMLSourceElement {
         if let Some(media) = parent.downcast::<HTMLMediaElement>() {
             media.handle_source_child_insertion();
         }
+        let next_sibling_iterator = self.upcast::<Node>().following_siblings();
+        HTMLSourceElement::iterate_next_html_image_element_siblings(next_sibling_iterator);
+    }
+
+    fn unbind_from_tree(&self, context: &UnbindContext) {
+        self.super_type().unwrap().unbind_from_tree(context);
+        if let Some(next_sibling) = context.next_sibling {
+            let next_sibling_iterator = next_sibling.inclusively_following_siblings();
+            HTMLSourceElement::iterate_next_html_image_element_siblings(next_sibling_iterator);
+        }
     }
 }
 
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index edb49a4834a..8fa494767f6 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -293,7 +293,7 @@ impl Node {
             },
         }
 
-        let context = UnbindContext::new(self, prev_sibling.r(), cached_index);
+        let context = UnbindContext::new(self, prev_sibling.r(), next_sibling.r(), cached_index);
 
         child.prev_sibling.set(None);
         child.next_sibling.set(None);
@@ -2812,17 +2812,23 @@ pub struct UnbindContext<'a> {
     pub parent: &'a Node,
     /// The previous sibling of the inclusive ancestor that was removed.
     prev_sibling: Option<&'a Node>,
+    /// The next sibling of the inclusive ancestor that was removed.
+    pub next_sibling: Option<&'a Node>,
     /// Whether the tree is in a document.
     pub tree_in_doc: bool,
 }
 
 impl<'a> UnbindContext<'a> {
     /// Create a new `UnbindContext` value.
-    fn new(parent: &'a Node, prev_sibling: Option<&'a Node>, cached_index: Option<u32>) -> Self {
+    fn new(parent: &'a Node,
+           prev_sibling: Option<&'a Node>,
+           next_sibling: Option<&'a Node>,
+           cached_index: Option<u32>) -> Self {
         UnbindContext {
             index: Cell::new(cached_index),
             parent: parent,
             prev_sibling: prev_sibling,
+            next_sibling: next_sibling,
             tree_in_doc: parent.is_in_doc(),
         }
     }