aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-04-03 03:53:09 -0500
committerGitHub <noreply@github.com>2017-04-03 03:53:09 -0500
commitfac0d17fd6edf996876d6e6379e48ef4f9cb43d6 (patch)
treecbef60e6e781739ea27f2355105f6859e7da9f28 /components/script/dom
parent5b037a0aa080799faae93efe59e56938a1eba913 (diff)
parent131b12dc670659ee72052e16b06f5426bdc8758c (diff)
downloadservo-fac0d17fd6edf996876d6e6379e48ef4f9cb43d6.tar.gz
servo-fac0d17fd6edf996876d6e6379e48ef4f9cb43d6.zip
Auto merge of #16224 - servo:valid-fontface, r=upsuper
Make the parser accept @font-face rules without font-family or src. Fix #16165. Also, it turns out that the CSSFontFaceRule IDL specified in the css-fonts spec is not web-compatible. Instead browsers implement a .style attribute like in CSSStyleRule: https://github.com/w3c/csswg-drafts/issues/825 This in turn requires preserving data about which descriptors were set or not (distinguishing unset from set to a value that happens to be the initial value), so this commit also makes every field `Option<_>`. <!-- 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/16224) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/webidls/CSSFontFaceRule.webidl15
1 files changed, 6 insertions, 9 deletions
diff --git a/components/script/dom/webidls/CSSFontFaceRule.webidl b/components/script/dom/webidls/CSSFontFaceRule.webidl
index 3749a79a818..a0a1b8f950b 100644
--- a/components/script/dom/webidls/CSSFontFaceRule.webidl
+++ b/components/script/dom/webidls/CSSFontFaceRule.webidl
@@ -2,16 +2,13 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-// https://drafts.csswg.org/css-fonts/#cssfontfacerule
+// https://drafts.csswg.org/css-fonts/#cssfontfacerule is unfortunately not web-compatible:
+// https://github.com/w3c/csswg-drafts/issues/825
+
+// https://www.w3.org/TR/2000/REC-DOM-Level-2-Style-20001113/css.html#CSS-CSSFontFaceRule ,
+// plus extended attributes matching CSSStyleRule
[Exposed=Window]
interface CSSFontFaceRule : CSSRule {
- // attribute DOMString family;
- // attribute DOMString src;
- // attribute DOMString style;
- // attribute DOMString weight;
- // attribute DOMString stretch;
- // attribute DOMString unicodeRange;
- // attribute DOMString variant;
- // attribute DOMString featureSettings;
+ // [SameObject, PutForwards=cssText] readonly attribute CSSStyleDeclaration style;
};