diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-07 03:18:15 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-04-07 03:18:15 +0530 |
| commit | 256b865055c10082731b218f41373d47ad632062 (patch) | |
| tree | 892f770ecddf19523a91c2d8857ebea7cdcf5380 /components/layout/text.rs | |
| parent | a5bc74be2fc2b1ab43d5809d776a5056ac8f35c7 (diff) | |
| parent | c3d6bfc3dfd5d17c739c04b35ef76f339fe8d6fa (diff) | |
| download | servo-256b865055c10082731b218f41373d47ad632062.tar.gz servo-256b865055c10082731b218f41373d47ad632062.zip | |
Auto merge of #10407 - mauricioc:issue10403, r=bholley
Move some CSS properties to match Gecko's representation
Fixes #10403. Animation had an extra transition-delay property, which was also moved to Box. Let me know if I should squash the commits.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10407)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/text.rs')
| -rw-r--r-- | components/layout/text.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout/text.rs b/components/layout/text.rs index 30ce9f4bb41..0fb9e7cde05 100644 --- a/components/layout/text.rs +++ b/components/layout/text.rs @@ -417,7 +417,7 @@ pub fn font_metrics_for_style(font_context: &mut FontContext, font_style: Arc<Fo /// Returns the line block-size needed by the given computed style and font size. pub fn line_height_from_style(style: &ServoComputedValues, metrics: &FontMetrics) -> Au { let font_size = style.get_font().font_size; - match style.get_inheritedbox().line_height { + match style.get_inheritedtext().line_height { line_height::T::Normal => metrics.line_gap, line_height::T::Number(l) => font_size.scale_by(l), line_height::T::Length(l) => l |