3 files changed, 32 insertions, 0 deletions

diff --git a/components/script/animations.rs b/components/script/animations.rs
index bddbac14966..c383048b3a8 100644
--- a/components/script/animations.rs
+++ b/components/script/animations.rs
@@ -99,6 +99,27 @@ impl Animations {
         self.unroot_unused_nodes(&sets);
     }
 
+    /// Cancel animations for the given node, if any exist.
+    pub(crate) fn cancel_animations_for_node(&self, node: &Node) {
+        let mut animations = self.sets.sets.write();
+        let mut cancel_animations_for = |key| {
+            animations.get_mut(&key).map(|set| {
+                set.cancel_all_animations();
+            });
+        };
+
+        let opaque_node = node.to_opaque();
+        cancel_animations_for(AnimationSetKey::new_for_non_pseudo(opaque_node));
+        cancel_animations_for(AnimationSetKey::new_for_pseudo(
+            opaque_node,
+            PseudoElement::Before,
+        ));
+        cancel_animations_for(AnimationSetKey::new_for_pseudo(
+            opaque_node,
+            PseudoElement::After,
+        ));
+    }
+
     /// Processes any new animations that were discovered after reflow. Collect messages
     /// that trigger events for any animations that changed state.
     pub(crate) fn do_post_reflow_update(&self, window: &Window, now: f64) {
diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 1d0aabc3d51..1092a070837 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -3855,6 +3855,10 @@ impl Document {
             .borrow()
             .do_post_reflow_update(&self.window, self.current_animation_timeline_value());
     }
+
+    pub(crate) fn cancel_animations_for_node(&self, node: &Node) {
+        self.animations.borrow().cancel_animations_for_node(node);
+    }
 }
 
 impl Element {
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index f17c22163d0..9bfe91e3470 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -281,6 +281,11 @@ impl Node {
         }
     }
 
+    pub fn clean_up_layout_data(&self) {
+        self.owner_doc().cancel_animations_for_node(self);
+        self.style_and_layout_data.borrow_mut().take();
+    }
+
     /// Clean up flags and unbind from tree.
     pub fn complete_remove_subtree(root: &Node, context: &UnbindContext) {
         for node in root.traverse_preorder(ShadowIncluding::Yes) {
@@ -295,6 +300,8 @@ impl Node {
             );
         }
         for node in root.traverse_preorder(ShadowIncluding::Yes) {
+            node.clean_up_layout_data();
+
             // This needs to be in its own loop, because unbind_from_tree may
             // rely on the state of IS_IN_DOC of the context node's descendants,
             // e.g. when removing a <form>.