Bug 1367635 - Part 11: Don't re-cache structs if we just got them from the cache. r?emilio
MozReview-Commit-ID: IufheKDgnki
--- a/servo/components/style/properties/properties.mako.rs
+++ b/servo/components/style/properties/properties.mako.rs
@@ -3512,17 +3512,23 @@ where
}
% endif
builder.clear_modified_reset();
StyleAdjuster::new(&mut builder)
.adjust(layout_parent_style, flags);
- if builder.modified_reset() {
+ if builder.modified_reset() || !apply_reset {
+ // If we adjusted any reset structs, we can't cache this ComputedValues.
+ //
+ // Also, if we re-used existing reset structs, don't bother caching it
+ // back again. (Aside from being wasted effort, it will be wrong, since
+ // context.rule_cache_conditions won't be set appropriately if we
+ // didn't compute those reset properties.)
context.rule_cache_conditions.borrow_mut()
.set_uncacheable();
}
builder.build()
}
/// See StyleAdjuster::adjust_for_border_width.