mirror of
https://github.com/servo/servo.git
synced 2025-07-10 00:43:39 +01:00
e912400bc3
Make additional properties be reset by the 'font' shorthand. A number of properties are supposed to be reset to initial values by the 'font' shorthand. This does so for all such properties that Servo currently supports (conditional on when they're supported). Fixes #15033. It's not clear to me that the use of <code>None</code> is correct for resetting to initial values, but it seems to match what at least some other shorthands do (I think I was looking at the code for border), and it appears to fix the tests as expected. I haven't probed into it more than that. /cc @Manishearth --- <!-- 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 (I haven't quite gotten the servo build to work, but stylo build works) - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #15033 (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes - [ ] These changes do not require tests because _____ This has test coverage when running stylo. In particular, it fixes a bunch of sets of mochitest failures in layout/style/test/test_value_storage.html, with the set for each value of the 'font' shorthand listed in property_database.js looking like: ``` TEST-PASS | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' TEST-PASS | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-style') TEST-PASS | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-variant') TEST-PASS | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-weight') TEST-PASS | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-size') TEST-PASS | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'line-height') TEST-PASS | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-family') TEST-PASS | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-stretch') -TEST-UNEXPECTED-FAIL | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-size-adjust') - didn't expect "", but got it +TEST-PASS | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-size-adjust') TEST-UNEXPECTED-FAIL | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-feature-settings') - didn't expect "", but got it TEST-UNEXPECTED-FAIL | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-language-override') - didn't expect "", but got it -TEST-UNEXPECTED-FAIL | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-kerning') - didn't expect "", but got it +TEST-PASS | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-kerning') TEST-UNEXPECTED-FAIL | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-synthesis') - didn't expect "", but got it TEST-UNEXPECTED-FAIL | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-variant-alternates') - didn't expect "", but got it -TEST-UNEXPECTED-FAIL | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-variant-caps') - didn't expect "", but got it +TEST-PASS | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-variant-caps') TEST-UNEXPECTED-FAIL | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-variant-east-asian') - didn't expect "", but got it TEST-UNEXPECTED-FAIL | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-variant-ligatures') - didn't expect "", but got it TEST-UNEXPECTED-FAIL | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-variant-numeric') - didn't expect "", but got it -TEST-UNEXPECTED-FAIL | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-variant-position') - didn't expect "", but got it +TEST-PASS | layout/style/test/test_value_storage.html | setting 'medium serif' on 'font' (for 'font-variant-position') ``` I'm not sure if separate Servo test coverage is needed. <!-- 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/15305) <!-- Reviewable:end --> |
||
|---|---|---|
| .. | ||
| binding_tools | ||
| gecko | ||
| gecko_bindings | ||
| gecko_string_cache | ||
| properties | ||
| rule_tree | ||
| servo | ||
| values | ||
| animation.rs | ||
| attr.rs | ||
| bezier.rs | ||
| bloom.rs | ||
| build.rs | ||
| build_gecko.rs | ||
| cache.rs | ||
| Cargo.toml | ||
| cascade_info.rs | ||
| context.rs | ||
| custom_properties.rs | ||
| data.rs | ||
| dom.rs | ||
| element_state.rs | ||
| error_reporting.rs | ||
| font_face.rs | ||
| font_metrics.rs | ||
| keyframes.rs | ||
| lib.rs | ||
| logical_geometry.rs | ||
| matching.rs | ||
| media_queries.rs | ||
| owning_handle.rs | ||
| parallel.rs | ||
| parser.rs | ||
| README.md | ||
| restyle_hints.rs | ||
| scoped_tls.rs | ||
| selector_parser.rs | ||
| sequential.rs | ||
| sink.rs | ||
| str.rs | ||
| stylesheets.rs | ||
| stylist.rs | ||
| supports.rs | ||
| thread_state.rs | ||
| timer.rs | ||
| traversal.rs | ||
| viewport.rs | ||
