Auto merge of #17744 - emilio:ensure-data, r=nox

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.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17744)
<!-- Reviewable:end -->

1 files changed, 0 insertions, 13 deletions

diff --git a/components/script/test.rs b/components/script/test.rs
index 9aeff2a22a5..bdd84d681b8 100644
--- a/components/script/test.rs
+++ b/components/script/test.rs
@@ -24,7 +24,6 @@ pub mod size_of {
     use dom::htmlspanelement::HTMLSpanElement;
     use dom::node::Node;
     use dom::text::Text;
-    use layout_wrapper::{ServoLayoutElement, ServoLayoutNode, ServoThreadSafeLayoutNode};
     use std::mem::size_of;
 
     pub fn CharacterData() -> usize {
@@ -55,18 +54,6 @@ pub mod size_of {
         size_of::<Node>()
     }
 
-    pub fn SendElement() -> usize {
-        size_of::<::style::dom::SendElement<ServoLayoutElement>>()
-    }
-
-    pub fn SendNode() -> usize {
-        size_of::<::style::dom::SendNode<ServoLayoutNode>>()
-    }
-
-    pub fn ServoThreadSafeLayoutNode() -> usize {
-        size_of::<ServoThreadSafeLayoutNode>()
-    }
-
     pub fn Text() -> usize {
         size_of::<Text>()
     }