Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

More aggressively remove Fragment RestyleDamage

Browse source 
Now clean up damage on all fragments that belong to a Flow. This ensures
that damage does not re-propagate up to the parent Flow from the
Fragments. It also means that the flow tree dump should show a more
accurate picture of the state of the flow tree.
This commit is contained in:
Martin Robinson 2015-12-16 16:10:10 +01:00
parent da8952b702
commit ce8e6fd3b9
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
components/layout/block.rs
View file

@ -45,7 +45,7 @@ use fragment::{CoordinateSystem, Fragment, FragmentBorderBoxIterator, HAS_LAYER}
use fragment::{SpecificFragmentInfo}; use fragment::{SpecificFragmentInfo};
use gfx::display_list::{ClippingRegion, DisplayList}; use gfx::display_list::{ClippingRegion, DisplayList};
use gfx_traits::LayerId; use gfx_traits::LayerId;
use incremental::{REFLOW, REFLOW_OUT_OF_FLOW}; use incremental::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT};
use layout_debug; use layout_debug;
use layout_task::DISPLAY_PORT_SIZE_FACTOR; use layout_task::DISPLAY_PORT_SIZE_FACTOR;
use model::{CollapsibleMargins, MaybeAuto, specified, specified_or_none}; use model::{CollapsibleMargins, MaybeAuto, specified, specified_or_none};
@ -982,6 +982,7 @@ impl BlockFlow {
self.formatting_context_type() == FormattingContextType::None) && self.formatting_context_type() == FormattingContextType::None) &&
!self.base.flags.contains(IS_ABSOLUTELY_POSITIONED) { !self.base.flags.contains(IS_ABSOLUTELY_POSITIONED) {
self.base.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW); self.base.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW);
self.fragment.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW);
} }
} }
@ -1201,6 +1202,7 @@ impl BlockFlow {
self.base.position.size.block = block_size; self.base.position.size.block = block_size;
self.base.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW); self.base.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW);
self.fragment.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW);
} }
/// Compute inline size based using the `block_container_inline_size` set by the parent flow. /// Compute inline size based using the `block_container_inline_size` set by the parent flow.
@ -1429,6 +1431,7 @@ impl BlockFlow {
// earlier, lay it out again. // earlier, lay it out again.
self.base.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW); self.base.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW);
self.fragment.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW);
} }
fn is_inline_block(&self) -> bool { fn is_inline_block(&self) -> bool {
@ -1575,7 +1578,8 @@ impl Flow for BlockFlow {
LengthOrPercentageOrAuto::Length(_) => false, LengthOrPercentageOrAuto::Length(_) => false,
_ => true, _ => true,
}; };
self.bubble_inline_sizes_for_block(consult_children) self.bubble_inline_sizes_for_block(consult_children);
self.fragment.restyle_damage.remove(BUBBLE_ISIZES);
} }
/// Recursively (top-down) determines the actual inline-size of child contexts and fragments. /// Recursively (top-down) determines the actual inline-size of child contexts and fragments.
@ -1994,6 +1998,7 @@ impl Flow for BlockFlow {
self.build_display_list_for_block(box DisplayList::new(), self.build_display_list_for_block(box DisplayList::new(),
layout_context, layout_context,
BorderPaintingMode::Separate); BorderPaintingMode::Separate);
self.fragment.restyle_damage.remove(REPAINT);
if opts::get().validate_display_list_geometry { if opts::get().validate_display_list_geometry {
self.base.validate_display_list_geometry(); self.base.validate_display_list_geometry();
} }

13
components/layout/inline.rs
View file

@ -17,7 +17,7 @@ use fragment::{CoordinateSystem, Fragment, FragmentBorderBoxIterator, SpecificFr
use gfx::display_list::OpaqueNode; use gfx::display_list::OpaqueNode;
use gfx::font::FontMetrics; use gfx::font::FontMetrics;
use gfx::font_context::FontContext; use gfx::font_context::FontContext;
use incremental::{REFLOW, REFLOW_OUT_OF_FLOW, RESOLVE_GENERATED_CONTENT}; use incremental::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT, RESOLVE_GENERATED_CONTENT};
use layout_debug; use layout_debug;
use model::IntrinsicISizesContribution; use model::IntrinsicISizesContribution;
use std::cmp::max; use std::cmp::max;
@ -1354,6 +1354,8 @@ impl Flow for InlineFlow {
intrinsic_sizes_for_nonbroken_run.union_inline(&intrinsic_sizes_for_fragment); intrinsic_sizes_for_nonbroken_run.union_inline(&intrinsic_sizes_for_fragment);
} }
} }
fragment.restyle_damage.remove(BUBBLE_ISIZES);
} }
// Flush any remaining nonbroken-run and inline-run intrinsic sizes. // Flush any remaining nonbroken-run and inline-run intrinsic sizes.
@ -1615,6 +1617,9 @@ impl Flow for InlineFlow {
}); });
self.base.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW); self.base.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW);
for fragment in &mut self.fragments.fragments {
fragment.restyle_damage.remove(REFLOW_OUT_OF_FLOW | REFLOW);
}
} }
fn compute_absolute_position(&mut self, _: &LayoutContext) { fn compute_absolute_position(&mut self, _: &LayoutContext) {
@ -1742,7 +1747,11 @@ impl Flow for InlineFlow {
fn update_late_computed_block_position_if_necessary(&mut self, _: Au) {} fn update_late_computed_block_position_if_necessary(&mut self, _: Au) {}
fn build_display_list(&mut self, layout_context: &LayoutContext) { fn build_display_list(&mut self, layout_context: &LayoutContext) {
self.build_display_list_for_inline(layout_context) self.build_display_list_for_inline(layout_context);
for fragment in &mut self.fragments.fragments {
fragment.restyle_damage.remove(REPAINT);
}
} }
fn repair_style(&mut self, _: &Arc<ComputedValues>) {} fn repair_style(&mut self, _: &Arc<ComputedValues>) {}