mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Further changes required by Servo
This commit is contained in:
parent
18b9e1b615
commit
7ce706f891
7 changed files with 13 additions and 9 deletions
|
@ -111,9 +111,13 @@ impl Flow for MulticolFlow {
|
|||
NonNegativeLengthPercentageOrNormal::LengthPercentage(ref len) => {
|
||||
len.0.to_pixel_length(content_inline_size)
|
||||
},
|
||||
NonNegativeLengthPercentageOrNormal::Normal => {
|
||||
self.block_flow.fragment.style.get_font().font_size.size()
|
||||
},
|
||||
NonNegativeLengthPercentageOrNormal::Normal => self
|
||||
.block_flow
|
||||
.fragment
|
||||
.style
|
||||
.get_font()
|
||||
.font_size
|
||||
.computed_size(),
|
||||
});
|
||||
|
||||
let column_style = style.get_column();
|
||||
|
|
|
@ -551,7 +551,7 @@ pub fn font_metrics_for_style(
|
|||
|
||||
/// Returns the line block-size needed by the given computed style and font size.
|
||||
pub fn line_height_from_style(style: &ComputedValues, metrics: &FontMetrics) -> Au {
|
||||
let font_size = style.get_font().font_size.size();
|
||||
let font_size = style.get_font().font_size.computed_size();
|
||||
match style.get_inherited_text().line_height {
|
||||
LineHeight::Normal => Au::from(metrics.line_gap),
|
||||
LineHeight::Number(l) => Au::from(font_size * l.0),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue