Make additional properties be reset by the 'font' shorthand. #15305

dbaron · 2017-01-31T02:20:59Z

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 None 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

./mach build -d does not report any errors (I haven't quite gotten the servo build to work, but stylo build works)
./mach test-tidy does not report any errors
These changes fix font shorthand should reset font-size-adjust, font-kerning, font-language-override etc. even if those longhands cannot be set via the longhand #15033 (github issue number if applicable).

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.

This change is

highfive · 2017-01-31T02:21:05Z

Thanks for the pull request, and welcome! The Servo team is excited to review your changes, and you should hear from @glennw (or someone else) soon.

highfive · 2017-01-31T02:21:06Z

Heads up! This PR modifies the following files:

@bholley: components/style/properties/shorthand/font.mako.rs
@emilio: components/style/properties/shorthand/font.mako.rs

highfive · 2017-01-31T02:21:07Z

Warning

These commits modify style code, but no tests are modified. Please consider adding a test!

dbaron · 2017-01-31T05:36:55Z

(And I did now get the Servo build to work, after installing a bunch of packages, and realizing I needed to "unset MOZCONFIG" to get my Gecko mozconfig out of the way for building JS.)

Manishearth

@bors-servo delegate+

r=me with nit

(you can bors-servo r=Manishearth this to approve for landing)

I suspect this will break in ./mach test-unit -p style due to the funky conditional compilation we do in unit testing mode (product is still servo but we include all properties). If it does, the fix would be to do something like

<% 
  extra_reset_props = ["font-size-adjust", "font-kerning", ....]
  enabled_reset_props = [prop for prop in extra_reset_props if prop in data.longhands_by_name]
%>

above the shorthand decl, and using ${enabled_reset_props}.join(" ") and

%for prop in enabled_reset_props:
    ${to_rust_ident(prop)}: None,
%endfor

Manishearth · 2017-01-31T05:48:27Z

components/style/properties/shorthand/font.mako.rs

@@ -73,6 +78,17 @@
            font_size: size,
            line_height: line_height,
            font_family: Some(font_family::SpecifiedValue(family))
+    % if product == "gecko":
+            ,


nit: just keep this comma above. trailing commas are ok and often encouraged in rust

Manishearth · 2017-01-31T05:51:38Z

@bors-servo delegate+

hm, homu doesn't pick up review comments

bors-servo · 2017-01-31T05:51:39Z

✌️ @dbaron can now approve this pull request

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 servo#15033.

dbaron · 2017-02-02T20:47:26Z

./mach test-unit -p style seems to be OK; the output ends with:

test result: ok. 138 passed; 0 failed; 0 ignored; 0 measured

emilio · 2017-02-02T21:14:32Z

@bors-servo r=Manishearth,emilio

Thanks David :)

bors-servo · 2017-02-02T21:14:33Z

📌 Commit 7a65a47 has been approved by Manishearth,emilio

bors-servo · 2017-02-02T21:14:37Z

⌛ Testing commit 7a65a47 with merge ef81384...

@Manishearth

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 ---  - [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).  - [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.   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15305)

bors-servo · 2017-02-02T22:03:14Z

💔 Test failed - mac-rel-wpt2

Manishearth · 2017-02-02T22:05:18Z

@bors-servo try retry

looks like a new intermittent? cc @creativcoder @jdm

  ▶ ERROR [expected OK] /workers/baseurl/alpha/sharedworker.html
  └   → SharedWorker is not defined

bors-servo · 2017-02-02T22:05:23Z

⌛ Trying commit 7a65a47 with merge ca72081...

@Manishearth

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 ---  - [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).  - [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.   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15305)

bors-servo · 2017-02-02T23:08:03Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
State: approved=Manishearth,emilio try=True

bors-servo · 2017-02-02T23:08:07Z

⌛ Testing commit 7a65a47 with merge 68b6821...

@Manishearth

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 ---  - [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).  - [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.   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15305)

bors-servo · 2017-02-02T23:45:45Z

💔 Test failed - linux-rel-wpt

Manishearth · 2017-02-02T23:50:58Z

OK, that's a webrender intermittent

@bors-servo try- r+ retry

bors-servo · 2017-02-02T23:50:59Z

💡 This pull request was already approved, no need to approve it again.

There's another pull request that is currently being tested, blocking this pull request: stylo: Optimize some FFI calls #15353

bors-servo · 2017-02-02T23:50:59Z

📌 Commit 7a65a47 has been approved by Manishearth

bors-servo · 2017-02-03T00:43:28Z

⌛ Testing commit 7a65a47 with merge e912400...

@Manishearth

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 ---  - [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).  - [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.   --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15305)

bors-servo · 2017-02-03T01:37:28Z

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
Approved by: Manishearth
Pushing e912400 to master...

highfive assigned glennw Jan 31, 2017

highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jan 31, 2017

Manishearth approved these changes Jan 31, 2017

View reviewed changes

Make additional properties be reset by the 'font' shorthand.

7a65a47

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 servo#15033.

dbaron force-pushed the reset-more-for-font branch from bb83612 to 7a65a47 Compare February 2, 2017 20:48

highfive assigned Manishearth and unassigned glennw Feb 2, 2017

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Feb 2, 2017

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Feb 2, 2017

highfive removed the S-tests-failed The changes caused existing tests to fail. label Feb 2, 2017

highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Feb 2, 2017

highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Feb 2, 2017

highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Feb 2, 2017

bors-servo merged commit 7a65a47 into servo:master Feb 3, 2017

highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Feb 3, 2017

This was referenced Feb 3, 2017

Intermittent ERROR expected OK in /workers/baseurl/alpha/sharedworker.html #15361

Closed

Intermittent crash "failed to fill whole buffer" in /_mozilla/css/iframe/multiple_external.html #15362

Closed

dbaron deleted the reset-more-for-font branch February 3, 2017 04:15

upsuper mentioned this pull request Feb 7, 2017

Make mozjs not check MOZCONFIG environment servo/mozjs#113

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Make additional properties be reset by the 'font' shorthand. #15305

Make additional properties be reset by the 'font' shorthand. #15305

dbaron commented Jan 31, 2017 •

edited

Loading

highfive commented Jan 31, 2017

highfive commented Jan 31, 2017

highfive commented Jan 31, 2017

dbaron commented Jan 31, 2017

Manishearth left a comment

Manishearth Jan 31, 2017

Manishearth commented Jan 31, 2017

bors-servo commented Jan 31, 2017

dbaron commented Feb 2, 2017

emilio commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 2, 2017

Manishearth commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 2, 2017

Manishearth commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 3, 2017

bors-servo commented Feb 3, 2017

Make additional properties be reset by the 'font' shorthand. #15305

Make additional properties be reset by the 'font' shorthand. #15305

Conversation

dbaron commented Jan 31, 2017 • edited Loading

highfive commented Jan 31, 2017

highfive commented Jan 31, 2017

highfive commented Jan 31, 2017

dbaron commented Jan 31, 2017

Manishearth left a comment

Choose a reason for hiding this comment

Manishearth Jan 31, 2017

Choose a reason for hiding this comment

Manishearth commented Jan 31, 2017

bors-servo commented Jan 31, 2017

dbaron commented Feb 2, 2017

emilio commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 2, 2017

Manishearth commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 2, 2017

Manishearth commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 2, 2017

bors-servo commented Feb 3, 2017

bors-servo commented Feb 3, 2017

dbaron commented Jan 31, 2017 •

edited

Loading