diff options
| author | David Zbarsky <dzbarsky@gmail.com> | 2015-08-20 12:31:19 -0400 |
|---|---|---|
| committer | David Zbarsky <dzbarsky@gmail.com> | 2015-11-01 23:16:14 -0800 |
| commit | 00980ea595dd54643eee59c1a0e2ddef39286e7f (patch) | |
| tree | 75e43edd9ead2fc0e9c484ae57c9bef8bccf2fca /components/layout/block.rs | |
| parent | 35b452660bf0759d222e8f2ac4b8c57f75529443 (diff) | |
| download | servo-00980ea595dd54643eee59c1a0e2ddef39286e7f.tar.gz servo-00980ea595dd54643eee59c1a0e2ddef39286e7f.zip | |
Implement calc expressions for more value types
Diffstat (limited to 'components/layout/block.rs')
| -rw-r--r-- | components/layout/block.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/components/layout/block.rs b/components/layout/block.rs index adb48e3248f..399b3e5a9f4 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -340,6 +340,10 @@ impl CandidateBSizeIterator { (LengthOrPercentageOrNone::Percentage(percent), Some(block_container_block_size)) => { Some(block_container_block_size.scale_by(percent)) } + (LengthOrPercentageOrNone::Calc(calc), Some(block_container_block_size)) => { + Some(block_container_block_size.scale_by(calc.percentage()) + calc.length()) + } + (LengthOrPercentageOrNone::Calc(_), _) | (LengthOrPercentageOrNone::Percentage(_), None) | (LengthOrPercentageOrNone::None, _) => None, (LengthOrPercentageOrNone::Length(length), _) => Some(length), |