aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-08-06 17:01:05 -0400
committerGitHub <noreply@github.com>2019-08-06 17:01:05 -0400
commit0368cd8de6a20cd37ccb75150bd3886d792842d3 (patch)
tree33f7c7b9ff52f737af8d6daf1ffb4d8cd7a2b5f6
parentff3a9180a709a18ae1c143b739bbbc0224a5f695 (diff)
parent8e6591b81b00e0a7897ef2f2c5f2d4974b9dbfef (diff)
downloadservo-0368cd8de6a20cd37ccb75150bd3886d792842d3.tar.gz
servo-0368cd8de6a20cd37ccb75150bd3886d792842d3.zip
Auto merge of #23920 - servo:fix-style-2020, r=SimonSapin
Fix a panic when using layout 2020 <!-- 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/23920) <!-- Reviewable:end -->
-rw-r--r--components/style/properties/properties.mako.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs
index 6915e19dde8..c16de38f204 100644
--- a/components/style/properties/properties.mako.rs
+++ b/components/style/properties/properties.mako.rs
@@ -505,8 +505,10 @@ impl NonCustomPropertyId {
% if engine == "gecko":
unsafe { structs::nsCSSProps_gPropertyEnabled[self.0] }
% else:
- static PREF_NAME: [Option< &str>; ${len(data.longhands) + len(data.shorthands)}] = [
- % for property in data.longhands + data.shorthands:
+ static PREF_NAME: [Option< &str>; ${
+ len(data.longhands) + len(data.shorthands) + len(data.all_aliases())
+ }] = [
+ % for property in data.longhands + data.shorthands + data.all_aliases():
<%
attrs = {"servo-2013": "servo_2013_pref", "servo-2020": "servo_2020_pref"}
pref = getattr(property, attrs[engine])