script: Move the layout_wrapper outside of script.

This allows us to have ensure_data() and clear_data() functions on the TElement
trait, instead of hacking around it adding methods in random traits.

This also allows us to do some further cleanup, which I'd rather do in a
followup.

1 files changed, 2 insertions, 12 deletions

diff --git a/components/style/gecko/traversal.rs b/components/style/gecko/traversal.rs
index 35683ba08e3..9b0770318ce 100644
--- a/components/style/gecko/traversal.rs
+++ b/components/style/gecko/traversal.rs
@@ -4,10 +4,8 @@
 
 //! Gecko-specific bits for the styling DOM traversal.
 
-use atomic_refcell::AtomicRefCell;
 use context::{SharedStyleContext, StyleContext};
-use data::ElementData;
-use dom::{NodeInfo, TNode};
+use dom::{NodeInfo, TNode, TElement};
 use gecko::wrapper::{GeckoElement, GeckoNode};
 use traversal::{DomTraversal, PerLevelTraversalData, TraversalDriver, recalc_style_at};
 
@@ -36,7 +34,7 @@ impl<'recalc, 'le> DomTraversal<GeckoElement<'le>> for RecalcStyleOnly<'recalc>
     {
         if node.is_element() {
             let el = node.as_element().unwrap();
-            let mut data = unsafe { el.ensure_data() }.borrow_mut();
+            let mut data = unsafe { el.ensure_data() };
             recalc_style_at(self, traversal_data, context, el, &mut data);
         }
     }
@@ -48,14 +46,6 @@ impl<'recalc, 'le> DomTraversal<GeckoElement<'le>> for RecalcStyleOnly<'recalc>
     /// We don't use the post-order traversal for anything.
     fn needs_postorder_traversal() -> bool { false }
 
-    unsafe fn ensure_element_data<'a>(element: &'a GeckoElement<'le>) -> &'a AtomicRefCell<ElementData> {
-        element.ensure_data()
-    }
-
-    unsafe fn clear_element_data<'a>(element: &'a GeckoElement<'le>) {
-        element.clear_data()
-    }
-
     fn shared_context(&self) -> &SharedStyleContext {
         &self.shared
     }