aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-04-13 20:48:14 -0500
committerGitHub <noreply@github.com>2017-04-13 20:48:14 -0500
commit8bd07ec5861b2e245dbd1fea388e87488cb69106 (patch)
tree9980a3a1637273e049daf51dba34c810d323ccce /components/script/dom
parent94397ff0b4fed138241760770ff2d230985bed8a (diff)
parent60b160d867e54081defe24d0a772357ea406b2ae (diff)
downloadservo-8bd07ec5861b2e245dbd1fea388e87488cb69106.tar.gz
servo-8bd07ec5861b2e245dbd1fea388e87488cb69106.zip
Auto merge of #16421 - hiikezoe:font-variant-shorthand, r=heycam
Font variant shorthand <!-- Please describe your changes on the following line: --> This is a PR of https://bugzilla.mozilla.org/show_bug.cgi?id=1354876 --- <!-- 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 <!-- Either: --> - [X] These changes do not require tests because gecko has a bunch of test cases. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- 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/16421) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/webidls/CSSStyleDeclaration.webidl2
1 files changed, 2 insertions, 0 deletions
diff --git a/components/script/dom/webidls/CSSStyleDeclaration.webidl b/components/script/dom/webidls/CSSStyleDeclaration.webidl
index 498d4a634d4..aebe2b5f7c6 100644
--- a/components/script/dom/webidls/CSSStyleDeclaration.webidl
+++ b/components/script/dom/webidls/CSSStyleDeclaration.webidl
@@ -281,6 +281,8 @@ partial interface CSSStyleDeclaration {
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString font-style;
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString fontVariant;
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString font-variant;
+ [SetterThrows, TreatNullAs=EmptyString] attribute DOMString fontVariantCaps;
+ [SetterThrows, TreatNullAs=EmptyString] attribute DOMString font-variant-caps;
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString fontWeight;
[SetterThrows, TreatNullAs=EmptyString] attribute DOMString font-weight;