Auto merge of #11737 - Ms2ger:init-data, r=pcwalton

Move the initialize_data method out of the TNode trait.

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

1 files changed, 13 insertions, 14 deletions

diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
index 303c9f76943..3c18e909bae 100644
--- a/components/layout/wrapper.rs
+++ b/components/layout/wrapper.rs
@@ -120,6 +120,19 @@ impl<'ln> ServoLayoutNode<'ln> {
             chain: self.chain,
         }
     }
+
+    pub fn initialize_data(self) {
+        if unsafe { self.borrow_data_unchecked() }.is_none() {
+            let ptr: NonOpaqueStyleAndLayoutData =
+                Box::into_raw(box RefCell::new(PrivateLayoutData::new()));
+            let opaque = OpaqueStyleAndLayoutData {
+                ptr: unsafe { NonZero::new(ptr as *mut ()) }
+            };
+            unsafe {
+                self.node.init_style_and_layout_data(opaque);
+            }
+        }
+    }
 }
 
 impl<'ln> TNode for ServoLayoutNode<'ln> {
@@ -158,20 +171,6 @@ impl<'ln> TNode for ServoLayoutNode<'ln> {
         OpaqueNodeMethods::from_jsmanaged(unsafe { self.get_jsmanaged() })
     }
 
-    fn initialize_data(self) {
-        let has_data = unsafe { self.borrow_data_unchecked().is_some() };
-        if !has_data {
-            let ptr: NonOpaqueStyleAndLayoutData =
-                Box::into_raw(box RefCell::new(PrivateLayoutData::new()));
-            let opaque = OpaqueStyleAndLayoutData {
-                ptr: unsafe { NonZero::new(ptr as *mut ()) }
-            };
-            unsafe {
-                self.node.init_style_and_layout_data(opaque);
-            }
-        }
-    }
-
     fn layout_parent_node(self, reflow_root: OpaqueNode) -> Option<ServoLayoutNode<'ln>> {
         if self.opaque() == reflow_root {
             None