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

Auto merge of #16695 - Manishearth:kw-inherit, r=heycam

Browse source 
Do not inherit kw font size if it was not used due to MathML

See https://bugzilla.mozilla.org/show_bug.cgi?id=1361126#c9

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16695)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-02 22:33:15 -05:00 • committed by GitHub
commit fb6015a75b
3 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/style/properties/gecko.mako.rs
View file

@ -1490,8 +1490,10 @@ fn static_assert() {
/// This function will also handle scriptminsize and scriptlevel /// This function will also handle scriptminsize and scriptlevel
/// so should not be called when you just want the font sizes to be copied. /// so should not be called when you just want the font sizes to be copied.
/// Hence the different name. /// Hence the different name.
///
/// Returns true if the inherited keyword size was actually used
pub fn inherit_font_size_from(&mut self, parent: &Self, pub fn inherit_font_size_from(&mut self, parent: &Self,
kw_inherited_size: Option<Au>) { kw_inherited_size: Option<Au>) -> bool {
let (adjusted_size, adjusted_unconstrained_size) let (adjusted_size, adjusted_unconstrained_size)
= self.calculate_script_level_size(parent); = self.calculate_script_level_size(parent);
if adjusted_size.0 != parent.gecko.mSize || if adjusted_size.0 != parent.gecko.mSize ||
@ -1513,18 +1515,21 @@ fn static_assert() {
self.gecko.mFont.size = adjusted_size.0; self.gecko.mFont.size = adjusted_size.0;
self.gecko.mSize = adjusted_size.0; self.gecko.mSize = adjusted_size.0;
self.gecko.mScriptUnconstrainedSize = adjusted_unconstrained_size.0; self.gecko.mScriptUnconstrainedSize = adjusted_unconstrained_size.0;
false
} else if let Some(size) = kw_inherited_size { } else if let Some(size) = kw_inherited_size {
// Parent element was a keyword-derived size. // Parent element was a keyword-derived size.
self.gecko.mFont.size = size.0; self.gecko.mFont.size = size.0;
self.gecko.mSize = size.0; self.gecko.mSize = size.0;
// MathML constraints didn't apply here, so we can ignore this. // MathML constraints didn't apply here, so we can ignore this.
self.gecko.mScriptUnconstrainedSize = size.0; self.gecko.mScriptUnconstrainedSize = size.0;
true
} else { } else {
// MathML isn't affecting us, and our parent element does not // MathML isn't affecting us, and our parent element does not
// have a keyword-derived size. Set things normally. // have a keyword-derived size. Set things normally.
self.gecko.mFont.size = parent.gecko.mFont.size; self.gecko.mFont.size = parent.gecko.mFont.size;
self.gecko.mSize = parent.gecko.mSize; self.gecko.mSize = parent.gecko.mSize;
self.gecko.mScriptUnconstrainedSize = parent.gecko.mScriptUnconstrainedSize; self.gecko.mScriptUnconstrainedSize = parent.gecko.mScriptUnconstrainedSize;
false
} }
} }

10
components/style/properties/longhand/font.mako.rs
View file

@ -927,10 +927,14 @@ ${helpers.single_keyword_system("font-variant-caps",
let kw_inherited_size = context.style().font_size_keyword.map(|(kw, ratio)| { let kw_inherited_size = context.style().font_size_keyword.map(|(kw, ratio)| {
SpecifiedValue::Keyword(kw, ratio).to_computed_value(context) SpecifiedValue::Keyword(kw, ratio).to_computed_value(context)
}); });
context.mutate_style().mutate_font() let used_kw = context.mutate_style().mutate_font()
.inherit_font_size_from(parent, kw_inherited_size); .inherit_font_size_from(parent, kw_inherited_size);
context.mutate_style().font_size_keyword = if used_kw {
context.inherited_style.font_size_keyword; context.mutate_style().font_size_keyword =
context.inherited_style.font_size_keyword;
} else {
context.mutate_style().font_size_keyword = None;
}
} }
pub fn cascade_initial_font_size(context: &mut Context) { pub fn cascade_initial_font_size(context: &mut Context) {

3
components/style/properties/properties.mako.rs
View file

@ -1569,8 +1569,9 @@ pub mod style_structs {
/// (Servo does not handle MathML, so this just calls copy_font_size_from) /// (Servo does not handle MathML, so this just calls copy_font_size_from)
pub fn inherit_font_size_from(&mut self, parent: &Self, pub fn inherit_font_size_from(&mut self, parent: &Self,
_: Option<Au>) { _: Option<Au>) -> bool {
self.copy_font_size_from(parent); self.copy_font_size_from(parent);
false
} }
/// (Servo does not handle MathML, so this just calls set_font_size) /// (Servo does not handle MathML, so this just calls set_font_size)
pub fn apply_font_size(&mut self, pub fn apply_font_size(&mut self,