From a9019da39d5a47e62f51aa3ab568389daccbe9bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= <ferjmoreno@gmail.com>
Date: Wed, 6 Mar 2019 16:05:59 +0100
Subject: [PATCH] Move mutation observers list to NodeRareData

---
 components/script/dom/node.rs     | 11 +++--------
 components/script/dom/raredata.rs |  4 ++++
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index f8b6de5cb24..f93679a3976 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -5,7 +5,6 @@
 //! The core DOM types. Defines the basic DOM hierarchy as well as all the HTML elements.
 
 use crate::document_loader::DocumentLoader;
-use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::codegen::Bindings::CharacterDataBinding::CharacterDataMethods;
 use crate::dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
 use crate::dom::bindings::codegen::Bindings::ElementBinding::ElementMethods;
@@ -152,9 +151,6 @@ pub struct Node {
     /// node is finalized.
     style_and_layout_data: Cell<Option<OpaqueStyleAndLayoutData>>,
 
-    /// Registered observers for this node.
-    mutation_observers: DomRefCell<Vec<RegisteredObserver>>,
-
     unique_id: UniqueId,
 }
 
@@ -454,12 +450,13 @@ impl Node {
 
     /// Return all registered mutation observers for this node.
     pub fn registered_mutation_observers(&self) -> RefMut<Vec<RegisteredObserver>> {
-        self.mutation_observers.borrow_mut()
+        self.rare_data.mutation_observers.borrow_mut()
     }
 
     /// Removes the mutation observer for a given node.
     pub fn remove_mutation_observer(&self, observer: &MutationObserver) {
-        self.mutation_observers
+        self.rare_data
+            .mutation_observers
             .borrow_mut()
             .retain(|reg_obs| &*reg_obs.observer != observer)
     }
@@ -1652,8 +1649,6 @@ impl Node {
 
             style_and_layout_data: Cell::new(None),
 
-            mutation_observers: Default::default(),
-
             unique_id: UniqueId::new(),
         }
     }
diff --git a/components/script/dom/raredata.rs b/components/script/dom/raredata.rs
index 65b47a40e41..05383197da7 100644
--- a/components/script/dom/raredata.rs
+++ b/components/script/dom/raredata.rs
@@ -2,7 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
+use crate::dom::bindings::cell::DomRefCell;
 use crate::dom::bindings::root::MutNullableDom;
+use crate::dom::mutationobserver::RegisteredObserver;
 use crate::dom::shadowroot::ShadowRoot;
 
 #[derive(Default, JSTraceable, MallocSizeOf)]
@@ -12,6 +14,8 @@ pub struct NodeRareData {
     /// This is None if the node is not in a shadow tree or
     /// if it is a ShadowRoot.
     pub owner_shadow_root: MutNullableDom<ShadowRoot>,
+    /// Registered observers for this node.
+    pub mutation_observers: DomRefCell<Vec<RegisteredObserver>>,
 }
 
 #[derive(Default, JSTraceable, MallocSizeOf)]