diff --git a/components/layout/construct.rs b/components/layout/construct.rs index a0b85802a66..d13fd01bb02 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -1309,10 +1309,9 @@ impl<'a> FlowConstructor<'a> { pub fn repair_if_possible(&mut self, node: &ThreadSafeLayoutNode) -> bool { // We can skip reconstructing the flow if we don't have to reconstruct and none of our kids // did either. - if node.restyle_damage().contains(RECONSTRUCT_FLOW) { - return false - } - + // + // We visit the kids first and reset their HAS_NEWLY_CONSTRUCTED_FLOW flags after checking + // them. NOTE: Make sure not to bail out early before resetting all the flags! let mut need_to_reconstruct = false; for kid in node.children() { if kid.flags().contains(HAS_NEWLY_CONSTRUCTED_FLOW) { @@ -1324,6 +1323,11 @@ impl<'a> FlowConstructor<'a> { return false } + if node.restyle_damage().contains(RECONSTRUCT_FLOW) { + return false + } + + let mut style = node.style().clone(); let mut layout_data_ref = node.mutate_layout_data(); let layout_data = layout_data_ref.as_mut().expect("no layout data"); diff --git a/components/layout/incremental.rs b/components/layout/incremental.rs index 14205b32cb5..adabc4bb471 100644 --- a/components/layout/incremental.rs +++ b/components/layout/incremental.rs @@ -175,13 +175,22 @@ pub fn compute_damage(old: &Option>, new: &ComputedValues) - get_padding.padding_top, get_padding.padding_right, get_padding.padding_bottom, get_padding.padding_left, get_box.width, get_box.height, - get_font.font_family, get_font.font_size, get_font.font_style, get_font.font_weight, get_inheritedtext.text_align, get_text.text_decoration, get_inheritedbox.line_height ]); add_if_not_equal!(old, new, damage, - [ REPAINT, BUBBLE_ISIZES, REFLOW_OUT_OF_FLOW, REFLOW, RECONSTRUCT_FLOW ], - [ get_box.float, get_box.display, get_box.position ]); + [ REPAINT, BUBBLE_ISIZES, REFLOW_OUT_OF_FLOW, REFLOW, RECONSTRUCT_FLOW ], [ + get_box.float, get_box.display, get_box.position, get_box.content, + get_counters.counter_reset, get_counters.counter_increment, + get_list.quotes, get_list.list_style_type, + + // If these text or font properties change, we need to reconstruct the flow so that + // text shaping is re-run. + get_inheritedtext.letter_spacing, get_inheritedtext.text_rendering, + get_inheritedtext.text_transform, get_inheritedtext.word_spacing, + get_font.font_family, get_font.font_style, get_font.font_variant, get_font.font_weight, + get_font.font_size, get_font.font_stretch + ]); // FIXME: test somehow that we checked every CSS property damage diff --git a/tests/ref/basic.list b/tests/ref/basic.list index ca54517fe1b..d899e60d1cf 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -162,6 +162,7 @@ prefs:"layout.writing-mode.enabled" == iframe/size_attributes_vertical_writing_m == img_width_style_intrinsic_width_a.html img_width_style_intrinsic_width_ref.html == incremental_float_a.html incremental_float_ref.html == incremental_inline_layout_a.html incremental_inline_layout_ref.html +== incremental_letter_spacing_a.html incremental_letter_spacing_ref.html == inline_absolute_hypothetical_clip_a.html inline_absolute_hypothetical_clip_ref.html == inline_absolute_out_of_flow_a.html inline_absolute_out_of_flow_ref.html != inline_background_a.html inline_background_ref.html diff --git a/tests/ref/incremental_letter_spacing_a.html b/tests/ref/incremental_letter_spacing_a.html new file mode 100644 index 00000000000..351cd100d05 --- /dev/null +++ b/tests/ref/incremental_letter_spacing_a.html @@ -0,0 +1,15 @@ + + + + + Incremental layout letter-spacing test + + +

Hello, world!

+ + + diff --git a/tests/ref/incremental_letter_spacing_ref.html b/tests/ref/incremental_letter_spacing_ref.html new file mode 100644 index 00000000000..0c1f3004bdd --- /dev/null +++ b/tests/ref/incremental_letter_spacing_ref.html @@ -0,0 +1,10 @@ + + + + + Incremental layout letter-spacing reference + + +

Hello, world!

+ +