From 90e2f7bfbf7bd83efec7f85828fac66687f5e752 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Fri, 20 Nov 2015 11:52:49 -0800 Subject: Clean up restyle damage after it no longer applies BUBBLE_ISIZES and REPAINT can become "stuck" on in the default Servo configuration once they are activated. This is solved by removing these damage bits after they no longer apply. There isn't a good way to test this, other than noting that it doesn't break any existing CSS tests. This will become more important in the future as the REPAINT bit is used to implement display list patching. --- components/layout/construct.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'components/layout/construct.rs') diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 32f540e1d36..c2427b63b69 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -27,7 +27,7 @@ use fragment::{InlineAbsoluteHypotheticalFragmentInfo, TableColumnFragmentInfo}; use fragment::{InlineBlockFragmentInfo, SpecificFragmentInfo, UnscannedTextFragmentInfo}; use fragment::{WhitespaceStrippingResult}; use gfx::display_list::OpaqueNode; -use incremental::{RECONSTRUCT_FLOW, RestyleDamage}; +use incremental::{BUBBLE_ISIZES, RECONSTRUCT_FLOW, RestyleDamage}; use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFlow, InlineFragmentNodeFlags}; use inline::{InlineFragmentNodeInfo, LAST_FRAGMENT_OF_ELEMENT}; use list_item::{ListItemFlow, ListStyleTypeContent}; @@ -1697,7 +1697,8 @@ impl FlowConstructionUtils for FlowRef { /// properly computed. (This is not, however, a memory safety problem.) fn finish(&mut self) { if !opts::get().bubble_inline_sizes_separately { - flow_ref::deref_mut(self).bubble_inline_sizes() + flow_ref::deref_mut(self).bubble_inline_sizes(); + flow::mut_base(flow_ref::deref_mut(self)).restyle_damage.remove(BUBBLE_ISIZES); } } } -- cgit v1.2.3