diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-02-21 01:09:35 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-21 01:09:35 -0800 |
commit | d724bffde80fec1698a485698d8743022a1e9d57 (patch) | |
tree | 6f913f2a0e744f6044d126ad5e9c42a1ef6f7adf /components | |
parent | b63488c2acb0f20f595287bde35b2199f34a3a12 (diff) | |
parent | 06650f8428f4ef7ec8477b8ec234d85b8c84c189 (diff) | |
download | servo-d724bffde80fec1698a485698d8743022a1e9d57.tar.gz servo-d724bffde80fec1698a485698d8743022a1e9d57.zip |
Auto merge of #15612 - UnICorN21:master, r=canaltinova
fixed the wrong behavior of border-spacing
fixed the wrong behavior of border-spacing
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #15489.
<!-- Either: -->
- [X] There are tests for these changes OR
- [ ] These changes do not require tests because _____
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/15612)
<!-- Reviewable:end -->
Diffstat (limited to 'components')
-rw-r--r-- | components/style/properties/longhand/inherited_table.mako.rs | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/components/style/properties/longhand/inherited_table.mako.rs b/components/style/properties/longhand/inherited_table.mako.rs index 1a6daa55417..b3cefca4304 100644 --- a/components/style/properties/longhand/inherited_table.mako.rs +++ b/components/style/properties/longhand/inherited_table.mako.rs @@ -114,15 +114,11 @@ ${helpers.single_keyword("caption-side", "top bottom", Err(()) => (), Ok(length) => { first = Some(length); - match specified::Length::parse_non_negative(input) { - Err(()) => (), - Ok(length) => second = Some(length), + if let Ok(len) = input.try(|input| specified::Length::parse_non_negative(input)) { + second = Some(len); } } } - if input.next().is_ok() { - return Err(()) - } match (first, second) { (None, None) => Err(()), (Some(length), None) => { |