From c606ec13e224c76bf477106044b7b3f9a4f07e74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 17 Jul 2017 22:48:11 +0200
Subject: [PATCH] Bug 1377993: Make node slots less memory hungry in common
 cases.

---
 components/style/gecko/wrapper.rs | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs
index cf28b396500..75044c4080b 100644
--- a/components/style/gecko/wrapper.rs
+++ b/components/style/gecko/wrapper.rs
@@ -505,7 +505,7 @@ impl<'le> GeckoElement<'le> {
 
     /// Returns true if this element has a shadow root.
     fn has_shadow_root(&self) -> bool {
-        self.get_dom_slots().map_or(false, |slots| !slots.mShadowRoot.mRawPtr.is_null())
+        self.get_extended_slots().map_or(false, |slots| !slots.mShadowRoot.mRawPtr.is_null())
     }
 
     /// Returns a reference to the DOM slots for this Element, if they exist.
@@ -514,6 +514,13 @@ impl<'le> GeckoElement<'le> {
         unsafe { slots.as_ref() }
     }
 
+    /// Returns a reference to the extended DOM slots for this Element.
+    fn get_extended_slots(&self) -> Option<&structs::FragmentOrElement_nsExtendedDOMSlots> {
+        self.get_dom_slots().and_then(|s| {
+            unsafe { s.mExtendedSlots.mPtr.as_ref() }
+        })
+    }
+
     #[inline]
     fn get_xbl_binding(&self) -> Option<GeckoXBLBinding> {
         if self.flags() & (structs::NODE_MAY_BE_IN_BINDING_MNGR as u32) == 0 {
@@ -556,10 +563,9 @@ impl<'le> GeckoElement<'le> {
 
     fn get_non_xul_xbl_binding_parent_raw_content(&self) -> *mut nsIContent {
         debug_assert!(!self.is_xul_element());
-        match self.get_dom_slots() {
-            Some(slots) => unsafe { *slots.__bindgen_anon_1.mBindingParent.as_ref() },
-            None => ptr::null_mut(),
-        }
+        self.get_extended_slots().map_or(ptr::null_mut(), |slots| {
+            slots.mBindingParent
+        })
     }
 
     fn has_xbl_binding_parent(&self) -> bool {