diff options
Diffstat (limited to 'components/layout')
-rw-r--r-- | components/layout/parallel.rs | 2 | ||||
-rw-r--r-- | components/layout/sequential.rs | 2 | ||||
-rw-r--r-- | components/layout/traversal.rs | 10 |
3 files changed, 2 insertions, 12 deletions
diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs index 6b8cb3ef2cc..a6bd121fd37 100644 --- a/components/layout/parallel.rs +++ b/components/layout/parallel.rs @@ -21,8 +21,6 @@ use style::dom::UnsafeNode; use traversal::{AssignBSizes, AssignISizes, BubbleISizes}; use traversal::{PostorderFlowTraversal, PreorderFlowTraversal}; -pub use style::parallel::traverse_dom; - /// Traversal chunk size. const CHUNK_SIZE: usize = 16; diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs index 3c95b75fbb6..ef57d1d402c 100644 --- a/components/layout/sequential.rs +++ b/components/layout/sequential.rs @@ -18,8 +18,6 @@ use style::servo::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW, STORE_OVERFLOW}; use traversal::{AssignBSizes, AssignISizes, BubbleISizes, BuildDisplayList}; use traversal::{InorderFlowTraversal, PostorderFlowTraversal, PreorderFlowTraversal}; -pub use style::sequential::traverse_dom; - pub fn resolve_generated_content(root: &mut Flow, layout_context: &LayoutContext) { ResolveGeneratedContent::new(&layout_context).traverse(root, 0); } diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index 6dfaa136ed2..48bfc107797 100644 --- a/components/layout/traversal.rs +++ b/components/layout/traversal.rs @@ -15,14 +15,13 @@ use style::data::ElementData; use style::dom::{NodeInfo, TElement, TNode}; use style::selector_parser::RestyleDamage; use style::servo::restyle_damage::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT, REPOSITION}; -use style::traversal::{DomTraversal, TraversalDriver, recalc_style_at}; +use style::traversal::{DomTraversal, recalc_style_at}; use style::traversal::PerLevelTraversalData; use wrapper::{GetRawData, LayoutNodeLayoutData}; use wrapper::ThreadSafeLayoutNodeHelpers; pub struct RecalcStyleAndConstructFlows<'a> { context: LayoutContext<'a>, - driver: TraversalDriver, } impl<'a> RecalcStyleAndConstructFlows<'a> { @@ -33,10 +32,9 @@ impl<'a> RecalcStyleAndConstructFlows<'a> { impl<'a> RecalcStyleAndConstructFlows<'a> { /// Creates a traversal context, taking ownership of the shared layout context. - pub fn new(context: LayoutContext<'a>, driver: TraversalDriver) -> Self { + pub fn new(context: LayoutContext<'a>) -> Self { RecalcStyleAndConstructFlows { context: context, - driver: driver, } } @@ -85,10 +83,6 @@ impl<'a, E> DomTraversal<E> for RecalcStyleAndConstructFlows<'a> fn shared_context(&self) -> &SharedStyleContext { &self.context.style_context } - - fn is_parallel(&self) -> bool { - self.driver.is_parallel() - } } /// A top-down traversal. |