From 24b7eadfff33fd822dadbb9b76692fcfca7810d2 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@nox.paris>
Date: Mon, 25 Nov 2019 21:49:41 +0100
Subject: [PATCH] Make NodeExt private in layout_2020

---
 components/layout_2020/dom_traversal.rs |  2 +-
 components/layout_2020/flow/root.rs     | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/components/layout_2020/dom_traversal.rs b/components/layout_2020/dom_traversal.rs
index 67d616df787..732dc1afdc9 100644
--- a/components/layout_2020/dom_traversal.rs
+++ b/components/layout_2020/dom_traversal.rs
@@ -284,7 +284,7 @@ impl Drop for BoxSlot<'_> {
     }
 }
 
-pub trait NodeExt<'dom>: 'dom + Copy + LayoutNode + Send + Sync {
+pub(crate) trait NodeExt<'dom>: 'dom + Copy + LayoutNode + Send + Sync {
     fn is_element(self) -> bool;
     fn as_text(self) -> Option<String>;
     fn first_child(self) -> Option<Self>;
diff --git a/components/layout_2020/flow/root.rs b/components/layout_2020/flow/root.rs
index bbefa5a81df..a56ca0d30bb 100644
--- a/components/layout_2020/flow/root.rs
+++ b/components/layout_2020/flow/root.rs
@@ -19,6 +19,7 @@ use crate::style_ext::{
 };
 use crate::{ContainingBlock, DefiniteContainingBlock};
 use rayon::iter::{IntoParallelRefIterator, ParallelExtend, ParallelIterator};
+use script_layout_interface::wrapper_traits::LayoutNode;
 use servo_arc::Arc;
 use style::context::SharedStyleContext;
 use style::properties::ComputedValues;
@@ -30,10 +31,13 @@ pub struct BoxTreeRoot(BlockFormattingContext);
 pub struct FragmentTreeRoot(Vec<Fragment>);
 
 impl BoxTreeRoot {
-    pub fn construct<'dom>(
+    pub fn construct<'dom, Node>(
         context: &SharedStyleContext<'_>,
-        root_element: impl NodeExt<'dom>,
-    ) -> Self {
+        root_element: Node,
+    ) -> Self
+    where
+        Node: 'dom + Copy + LayoutNode + Send + Sync,
+    {
         let (contains_floats, boxes) = construct_for_root_element(&context, root_element);
         Self(BlockFormattingContext {
             contains_floats: contains_floats == ContainsFloats::Yes,