Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

font-variant-caps should accept all-small-caps and all-petite-caps #16821

Merged
merged 1 commit into from May 12, 2017

Conversation

@Manishearth
Copy link
Member

Manishearth commented May 11, 2017

This change is Reviewable

@highfive
Copy link

highfive commented May 11, 2017

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/longhand/font.mako.rs
  • @emilio: components/style/properties/longhand/font.mako.rs
@highfive
Copy link

highfive commented May 11, 2017

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!
@jryans
Copy link
Contributor

jryans commented May 11, 2017

@bors-servo
Copy link
Contributor

bors-servo commented May 11, 2017

📌 Commit f80690f has been approved by jryans

@Manishearth
Copy link
Member Author

Manishearth commented May 12, 2017

Test expectation update

diff --git a/layout/reftests/font-features/reftest.list b/layout/reftests/font-features/reftest.list
index 4c7d478..88bc34c 100644
--- a/layout/reftests/font-features/reftest.list
+++ b/layout/reftests/font-features/reftest.list
@@ -60,7 +60,7 @@ HTTP(..) == annotations.html annotations-ref.html
 # test for specific features being on and others off, based on prop values
 # (debug problems with font-variant-debug.html which displays all props)
 fails-if(stylo) HTTP(..) == font-variant-alternates.html font-variant-alternates-ref.html
-fails-if(stylo) HTTP(..) == font-variant-caps.html font-variant-caps-ref.html
+HTTP(..) == font-variant-caps.html font-variant-caps-ref.html
 HTTP(..) == font-variant-east-asian.html font-variant-east-asian-ref.html
 HTTP(..) == font-variant-ligatures.html font-variant-ligatures-ref.html
 HTTP(..) == font-variant-numeric.html font-variant-numeric-ref.html
@@ -99,14 +99,14 @@ random-if(!winWidget&&!cocoaWidget) fails-if(winWidget||cocoaWidget) HTTP(..) ==
 HTTP(..) != caps-fallback-smallcaps1.html caps-fallback-default.html
 HTTP(..) != caps-fallback-smallcaps2.html caps-fallback-default.html
 HTTP(..) != caps-fallback-petitecaps.html caps-fallback-default.html
-fails-if(stylo) HTTP(..) != caps-fallback-allsmallcaps.html caps-fallback-default.html
-fails-if(stylo) HTTP(..) != caps-fallback-allpetitecaps.html caps-fallback-default.html
+HTTP(..) != caps-fallback-allsmallcaps.html caps-fallback-default.html
+HTTP(..) != caps-fallback-allpetitecaps.html caps-fallback-default.html
 # -- normal or fallback rendering
 HTTP(..) == caps-fallback-smallcaps1.html caps-fallback-smcp.html
 HTTP(..) == caps-fallback-smallcaps2.html caps-fallback-smcp.html
 HTTP(..) == caps-fallback-petitecaps.html caps-fallback-smcp.html
-fails-if(stylo) HTTP(..) == caps-fallback-allsmallcaps.html caps-fallback-smcpc2sc.html
-fails-if(stylo) HTTP(..) == caps-fallback-allpetitecaps.html caps-fallback-smcpc2sc.html
+HTTP(..) == caps-fallback-allsmallcaps.html caps-fallback-smcpc2sc.html
+HTTP(..) == caps-fallback-allpetitecaps.html caps-fallback-smcpc2sc.html
 
 # font-variant-position fallback
 random-if(cocoaWidget||Android) HTTP(..) == subsuper-fallback.html subsuper-fallback-ref.html # bug 1139269
diff --git a/layout/style/test/stylo-failures.md b/layout/style/test/stylo-failures.md
index f7bf802..2126bee 100644
--- a/layout/style/test/stylo-failures.md
+++ b/layout/style/test/stylo-failures.md
@@ -123,7 +123,7 @@ to mochitest command.
     * test_align_shorthand_serialization.html [8]
   * font-variant-{alternates,east-asian,ligatures,numeric} properties servo/servo#15957
     * test_property_syntax_errors.html `font-variant-alternates` [2]
-    * test_value_storage.html `font-variant` [176]
+    * test_value_storage.html `font-variant` [167]
     * test_specified_value_serialization.html `bug-721136` [1]
 * Properties implemented but not in geckolib:
   * font-feature-settings property servo/servo#15975
@bors-servo
Copy link
Contributor

bors-servo commented May 12, 2017

Testing commit f80690f with merge 7c6cc8d...

bors-servo added a commit that referenced this pull request May 12, 2017
font-variant-caps should accept all-small-caps and all-petite-caps

<!-- 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/16821)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 12, 2017

💔 Test failed - mac-dev-unit

@jdm
Copy link
Member

jdm commented May 12, 2017

@bors-servo
Copy link
Contributor

bors-servo commented May 12, 2017

Testing commit f80690f with merge c260beb...

bors-servo added a commit that referenced this pull request May 12, 2017
font-variant-caps should accept all-small-caps and all-petite-caps

<!-- 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/16821)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 12, 2017

☀️ 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-msvc-dev
Approved by: jryans
Pushing c260beb to master...

@bors-servo bors-servo merged commit f80690f into servo:master May 12, 2017
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@Manishearth Manishearth deleted the Manishearth:variant-caps branch May 7, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.