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

Tidy

Browse source
This commit is contained in:
Simon Sapin 2016-04-20 17:19:25 +02:00
parent bf8edd1596
commit 515c5ef540
3 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/style/properties/build.py
View file

@ -4,7 +4,6 @@
import json import json
import os.path import os.path
import re
import sys import sys
BASE = os.path.dirname(__file__) BASE = os.path.dirname(__file__)
@ -49,11 +48,11 @@ def render(filename, **context):
strict_undefined=True, strict_undefined=True,
filename=filename) filename=filename)
# Uncomment to debug generated Python code: # Uncomment to debug generated Python code:
#write("/tmp", "mako_%s.py" % os.path.basename(filename), template.code) # write("/tmp", "mako_%s.py" % os.path.basename(filename), template.code)
return template.render(**context).encode("utf8") return template.render(**context).encode("utf8")
except: except:
# Uncomment to see a traceback in generated Python code: # Uncomment to see a traceback in generated Python code:
#raise # raise
abort(exceptions.text_error_template().render().encode("utf8")) abort(exceptions.text_error_template().render().encode("utf8"))

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

@ -124,11 +124,9 @@ class PropertiesData(object):
self.style_structs.append(style_struct) self.style_structs.append(style_struct)
self.current_style_struct = style_struct self.current_style_struct = style_struct
def active_style_structs(self): def active_style_structs(self):
return [s for s in self.style_structs if s.additional_methods or s.longhands] return [s for s in self.style_structs if s.additional_methods or s.longhands]
def switch_to_style_struct(self, name): def switch_to_style_struct(self, name):
for style_struct in self.style_structs: for style_struct in self.style_structs:
if style_struct.trait_name == name: if style_struct.trait_name == name:
@ -138,7 +136,7 @@ class PropertiesData(object):
def declare_longhand(self, name, products="gecko servo", **kwargs): def declare_longhand(self, name, products="gecko servo", **kwargs):
products = products.split() products = products.split()
if not self.product in products: if self.product not in products:
return return
longand = Longhand(self.current_style_struct, name, **kwargs) longand = Longhand(self.current_style_struct, name, **kwargs)

3
components/style/properties/properties.mako.rs
View file

@ -114,7 +114,8 @@ pub mod longhands {
// //
// FIXME: is it still? // FIXME: is it still?
*cacheable = false; *cacheable = false;
let inherited_struct = inherited_style.get_${data.current_style_struct.trait_name_lower}(); let inherited_struct =
inherited_style.get_${data.current_style_struct.trait_name_lower}();
context.mutate_style().mutate_${data.current_style_struct.trait_name_lower}() context.mutate_style().mutate_${data.current_style_struct.trait_name_lower}()
.copy_${property.ident}_from(inherited_struct); .copy_${property.ident}_from(inherited_struct);
} }