servo: Merge #14771 - Add support of text-combine-upright for stylo (from upsuper:text-combine-upright); r=Wafflespeanut
authorXidorn Quan <me@upsuper.org>
Wed, 28 Dec 2016 21:19:26 -0800
changeset 478610 ca6fed9033979a068f0bb4cd2838fc455b0b781d
parent 478609 5f917bf3682f14940cfbc4d5a2ad3cc8aa0552ae
child 478611 fb3cb6e8f720e2772efba1fae1ea4dc87b8e8a72
push id44079
push userbmo:gps@mozilla.com
push dateSat, 04 Feb 2017 00:14:49 +0000
reviewersWafflespeanut
servo: Merge #14771 - Add support of text-combine-upright for stylo (from upsuper:text-combine-upright); r=Wafflespeanut <!-- Please describe your changes on the following line: --> --- <!-- 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 - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because it is just a trivial change for stylo only <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> Source-Repo: https://github.com/servo/servo Source-Revision: 49bdef98bff28771b189073f5f0d487fe9529b86
servo/components/style/properties/longhand/inherited_text.mako.rs
--- a/servo/components/style/properties/longhand/inherited_text.mako.rs
+++ b/servo/components/style/properties/longhand/inherited_text.mako.rs
@@ -1053,8 +1053,16 @@
 
 // CSS Ruby Layout Module Level 1
 // https://www.w3.org/TR/css-ruby-1/
 ${helpers.single_keyword("ruby-align", "start center space-between space-around",
                          products="gecko", animatable=False)}
 
 ${helpers.single_keyword("ruby-position", "over under",
                          products="gecko", animatable=False)}
+
+// CSS Writing Modes Module Level 3
+// https://drafts.csswg.org/css-writing-modes-3/#text-combine-upright
+// The spec has "digits <integer>?" value in addition. But that value is
+// at-risk, and Gecko's layout code doesn't support that either. So we
+// can just take the easy way for now.
+${helpers.single_keyword("text-combine-upright", "none all",
+                         products="gecko", animatable=False)}