Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #17568 - Handle prefixed value of -moz-user-select properly (from upsuper:user-select); r=Manishearth

Browse Source 
This is supposed to fix [bug 1374996](https://bugzilla.mozilla.org/show_bug.cgi?id=1374996).

Source-Repo: https://github.com/servo/servo
Source-Revision: d52a08a5c5175b01561b93f0cd94545fdd2b989c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 67aaf9295071d1017d01d7bbd2b5f9e8d49419c5
This commit is contained in:
Xidorn Quan 2017-07-03 21:56:19 -07:00
parent bb1ea70f5f
commit d691c3135d
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servo/components/style/properties/data.py
View File

@ -60,7 +60,7 @@ class Keyword(object):
extra_gecko_values=None, extra_servo_values=None,
aliases=None,
extra_gecko_aliases=None, extra_servo_aliases=None,
gecko_strip_moz_prefix=True,
gecko_strip_moz_prefix=None,
gecko_inexhaustive=None):
self.name = name
self.values = values.split()
@ -75,7 +75,8 @@ class Keyword(object):
self.extra_gecko_aliases = parse_aliases(extra_gecko_aliases or "")
self.extra_servo_aliases = parse_aliases(extra_servo_aliases or "")
self.consts_map = {} if custom_consts is None else custom_consts
self.gecko_strip_moz_prefix = gecko_strip_moz_prefix
self.gecko_strip_moz_prefix = True \
if gecko_strip_moz_prefix is None else gecko_strip_moz_prefix
self.gecko_inexhaustive = gecko_inexhaustive or (gecko_enum_prefix is None)
def gecko_values(self):

2
servo/components/style/properties/helpers.mako.rs
View File

@ -701,7 +701,7 @@
'gecko_constant_prefix', 'gecko_enum_prefix',
'extra_gecko_values', 'extra_servo_values',
'aliases', 'extra_gecko_aliases', 'extra_servo_aliases',
'custom_consts', 'gecko_inexhaustive',
'custom_consts', 'gecko_inexhaustive', 'gecko_strip_moz_prefix',
]}
%>

4
servo/components/style/properties/longhand/ui.mako.rs
View File

@ -17,11 +17,13 @@ ${helpers.single_keyword("ime-mode", "auto normal active disabled inactive",
spec="https://drafts.csswg.org/css-ui/#input-method-editor")}
${helpers.single_keyword("-moz-user-select", "auto text none all element elements" +
" toggle tri-state -moz-all -moz-none -moz-text",
" toggle tri-state -moz-all -moz-text",
products="gecko",
alias="-webkit-user-select",
gecko_ffi_name="mUserSelect",
gecko_enum_prefix="StyleUserSelect",
gecko_strip_moz_prefix=False,
aliases="-moz-none=none",
animation_value_type="none",
spec="https://drafts.csswg.org/css-ui-4/#propdef-user-select")}

3
servo/tests/unit/style/parsing/ui.rs
View File

@ -20,8 +20,9 @@ fn test_moz_user_select() {
assert_roundtrip_with_context!(_moz_user_select::parse, "toggle");
assert_roundtrip_with_context!(_moz_user_select::parse, "tri-state");
assert_roundtrip_with_context!(_moz_user_select::parse, "-moz-all");
assert_roundtrip_with_context!(_moz_user_select::parse, "-moz-none");
assert_roundtrip_with_context!(_moz_user_select::parse, "-moz-text");
assert_eq!(parse(_moz_user_select::parse, "-moz-none"),
Ok(_moz_user_select::SpecifiedValue::none));
assert!(parse(_moz_user_select::parse, "potato").is_err());
}