Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge keyword and predefined type longhands

Browse source
This commit is contained in:
Ravi Shankar 2016-10-22 18:59:29 +05:30
parent 6029c927ee
commit af8899edf0
2 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/properties/data.py
View file

@ -63,7 +63,7 @@ class Longhand(object):
def __init__(self, style_struct, name, animatable=None, derived_from=None, keyword=None, def __init__(self, style_struct, name, animatable=None, derived_from=None, keyword=None,
predefined_type=None, custom_cascade=False, experimental=False, internal=False, predefined_type=None, custom_cascade=False, experimental=False, internal=False,
need_clone=False, need_index=False, gecko_ffi_name=None, depend_on_viewport_size=False, need_clone=False, need_index=False, gecko_ffi_name=None, depend_on_viewport_size=False,
allowed_in_keyframe_block=True, complex_color=False): allowed_in_keyframe_block=True, complex_color=False, cast_type='u8'):
self.name = name self.name = name
self.keyword = keyword self.keyword = keyword
self.predefined_type = predefined_type self.predefined_type = predefined_type
@ -78,6 +78,7 @@ class Longhand(object):
self.depend_on_viewport_size = depend_on_viewport_size self.depend_on_viewport_size = depend_on_viewport_size
self.derived_from = (derived_from or "").split() self.derived_from = (derived_from or "").split()
self.complex_color = complex_color self.complex_color = complex_color
self.cast_type = cast_type
# https://drafts.csswg.org/css-animations/#keyframes # https://drafts.csswg.org/css-animations/#keyframes
# > The <declaration-list> inside of <keyframe-block> accepts any CSS property # > The <declaration-list> inside of <keyframe-block> accepts any CSS property

33
components/style/properties/gecko.mako.rs
View file

@ -490,21 +490,29 @@ impl Debug for ${style_struct.gecko_struct_name} {
"CSSColor": impl_color, "CSSColor": impl_color,
} }
def predefined_type_method(longhand): def longhand_method(longhand):
args = dict(ident=longhand.ident, gecko_ffi_name=longhand.gecko_ffi_name, args = dict(ident=longhand.ident, gecko_ffi_name=longhand.gecko_ffi_name,
need_clone=longhand.need_clone) need_clone=longhand.need_clone)
method = predefined_types[longhand.predefined_type]
# additional type-specific arguments # get the method and pass additional keyword or type-specific arguments
if longhand.predefined_type in ["CSSColor"]: if longhand.keyword:
args.update(complex_color=longhand.complex_color) method = impl_keyword
args.update(keyword=longhand.keyword)
if "font" in longhand.ident:
args.update(cast_type=longhand.cast_type)
else:
method = predefined_types[longhand.predefined_type]
if longhand.predefined_type in ["CSSColor"]:
args.update(complex_color=longhand.complex_color)
method(**args) method(**args)
keyword_longhands = [x for x in longhands if x.keyword and x.name not in force_stub] picked_longhands, stub_longhands = [], []
predefined_longhands = [x for x in longhands for x in longhands:
if x.predefined_type in predefined_types and x.name not in force_stub] if (x.keyword or x.predefined_type in predefined_types) and x.name not in force_stub:
stub_longhands = [x for x in longhands if x not in keyword_longhands + predefined_longhands] picked_longhands.append(x)
else:
stub_longhands.append(x)
# If one of the longhands is not handled # If one of the longhands is not handled
# by either: # by either:
@ -518,6 +526,7 @@ impl Debug for ${style_struct.gecko_struct_name} {
# If you hit this error, please add `product="servo"` to the longhand. # If you hit this error, please add `product="servo"` to the longhand.
# In case the longhand is used in a shorthand, add it to the force_stub # In case the longhand is used in a shorthand, add it to the force_stub
# list above. # list above.
for stub in stub_longhands: for stub in stub_longhands:
if stub.name not in force_stub: if stub.name not in force_stub:
raise Exception("Don't know what to do with longhand %s in style struct %s" raise Exception("Don't know what to do with longhand %s in style struct %s"
@ -533,10 +542,8 @@ impl ${style_struct.gecko_struct_name} {
* Auto-Generated Methods. * Auto-Generated Methods.
*/ */
<% <%
for longhand in keyword_longhands: for longhand in picked_longhands:
impl_keyword(longhand.ident, longhand.gecko_ffi_name, longhand.keyword, longhand.need_clone) longhand_method(longhand)
for longhand in predefined_longhands:
predefined_type_method(longhand)
%> %>
/* /*