Backed out changeset e64e659c077d: servo PR #18809 and revendor for reftest failures, e.g. in layout/reftests/bugs/392435-1.html. r=backout on a CLOSED TREE

Backs out https://github.com/servo/servo/pull/18809

1 files changed, 11 insertions, 11 deletions

diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs
index ee8232ff599..077e43fb45c 100644
--- a/components/layout/traversal.rs
+++ b/components/layout/traversal.rs
@@ -7,14 +7,14 @@
 use construct::FlowConstructor;
 use context::LayoutContext;
 use display_list_builder::DisplayListBuildState;
-use flow::{self, FlowFlags, Flow, ImmutableFlowUtils};
+use flow::{self, CAN_BE_FRAGMENTED, Flow, ImmutableFlowUtils};
 use script_layout_interface::wrapper_traits::{LayoutNode, ThreadSafeLayoutNode};
 use servo_config::opts;
 use style::context::{SharedStyleContext, StyleContext};
 use style::data::ElementData;
 use style::dom::{NodeInfo, TElement, TNode};
 use style::selector_parser::RestyleDamage;
-use style::servo::restyle_damage::ServoRestyleDamage;
+use style::servo::restyle_damage::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT, REPOSITION};
 use style::traversal::{DomTraversal, recalc_style_at};
 use style::traversal::PerLevelTraversalData;
 use wrapper::{GetRawData, LayoutNodeLayoutData};
@@ -209,7 +209,7 @@ fn construct_flows_at<N>(context: &LayoutContext, node: N)
             }
         }
 
-        tnode.mutate_layout_data().unwrap().flags.insert(::data::LayoutDataFlags::HAS_BEEN_TRAVERSED);
+        tnode.mutate_layout_data().unwrap().flags.insert(::data::HAS_BEEN_TRAVERSED);
     }
 
     if let Some(el) = node.as_element() {
@@ -227,12 +227,12 @@ impl<'a> PostorderFlowTraversal for BubbleISizes<'a> {
     #[inline]
     fn process(&self, flow: &mut Flow) {
         flow.bubble_inline_sizes();
-        flow::mut_base(flow).restyle_damage.remove(ServoRestyleDamage::BUBBLE_ISIZES);
+        flow::mut_base(flow).restyle_damage.remove(BUBBLE_ISIZES);
     }
 
     #[inline]
     fn should_process(&self, flow: &mut Flow) -> bool {
-        flow::base(flow).restyle_damage.contains(ServoRestyleDamage::BUBBLE_ISIZES)
+        flow::base(flow).restyle_damage.contains(BUBBLE_ISIZES)
     }
 }
 
@@ -250,7 +250,7 @@ impl<'a> PreorderFlowTraversal for AssignISizes<'a> {
 
     #[inline]
     fn should_process(&self, flow: &mut Flow) -> bool {
-        flow::base(flow).restyle_damage.intersects(ServoRestyleDamage::REFLOW_OUT_OF_FLOW | ServoRestyleDamage::REFLOW)
+        flow::base(flow).restyle_damage.intersects(REFLOW_OUT_OF_FLOW | REFLOW)
     }
 }
 
@@ -280,9 +280,9 @@ impl<'a> PostorderFlowTraversal for AssignBSizes<'a> {
     #[inline]
     fn should_process(&self, flow: &mut Flow) -> bool {
         let base = flow::base(flow);
-        base.restyle_damage.intersects(ServoRestyleDamage::REFLOW_OUT_OF_FLOW | ServoRestyleDamage::REFLOW) &&
+        base.restyle_damage.intersects(REFLOW_OUT_OF_FLOW | REFLOW) &&
         // The fragmentation countainer is responsible for calling Flow::fragment recursively
-        !base.flags.contains(FlowFlags::CAN_BE_FRAGMENTED)
+        !base.flags.contains(CAN_BE_FRAGMENTED)
     }
 }
 
@@ -293,13 +293,13 @@ pub struct ComputeStackingRelativePositions<'a> {
 impl<'a> PreorderFlowTraversal for ComputeStackingRelativePositions<'a> {
     #[inline]
     fn should_process_subtree(&self, flow: &mut Flow) -> bool {
-        flow::base(flow).restyle_damage.contains(ServoRestyleDamage::REPOSITION)
+        flow::base(flow).restyle_damage.contains(REPOSITION)
     }
 
     #[inline]
     fn process(&self, flow: &mut Flow) {
         flow.compute_stacking_relative_position(self.layout_context);
-        flow::mut_base(flow).restyle_damage.remove(ServoRestyleDamage::REPOSITION)
+        flow::mut_base(flow).restyle_damage.remove(REPOSITION)
     }
 }
 
@@ -318,7 +318,7 @@ impl<'a> BuildDisplayList<'a> {
             flow.clip_and_scroll_info(self.state.layout_context.id);
 
         flow.build_display_list(&mut self.state);
-        flow::mut_base(flow).restyle_damage.remove(ServoRestyleDamage::REPAINT);
+        flow::mut_base(flow).restyle_damage.remove(REPAINT);
 
         for kid in flow::child_iter_mut(flow) {
             self.traverse(kid);