mirror of
https://github.com/servo/servo.git
synced 2025-08-07 22:45:34 +01:00
Auto merge of #14316 - canaltinova:stylo-properties, r=emilio
Implement parsing/serialization and/or gecko glue for some properties <!-- Please describe your changes on the following line: --> The PR covers implementation and/or gecko glue for these properties: 1. Implemented parsing/serialization and gecko glue for column-rule-width, column-rule-color and column-span longhand properties (column-span is not implemented in gecko yet but I wanted to complete column properties :) ) 2. Implemented parsing/serialization and gecko glue for text-emphasis-color longhand and text-emphasis shorthand properties. 3. Implemented gecko glue for column-gap and order properties I implemented column-rule-width and column-rule-color properties with `-moz-` prefixes, but I can remove them if it's not right. I coudn't test them in full stylo build yet (LLVM messed up my current clang). But I'll test them soon. r? @Manishearth or @emilio --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors <!-- Either: --> - [X] These changes do not require tests <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/14316) <!-- Reviewable:end -->
This commit is contained in:
commit
a2babd6db8
5 changed files with 130 additions and 4 deletions
|
@ -814,7 +814,7 @@ fn static_assert() {
|
|||
|
||||
<% skip_position_longhands = " ".join(x.ident for x in SIDES) %>
|
||||
<%self:impl_trait style_struct_name="Position"
|
||||
skip_longhands="${skip_position_longhands} z-index box-sizing">
|
||||
skip_longhands="${skip_position_longhands} z-index box-sizing order">
|
||||
|
||||
% for side in SIDES:
|
||||
<% impl_split_style_coord("%s" % side.ident,
|
||||
|
@ -864,6 +864,16 @@ fn static_assert() {
|
|||
}
|
||||
${impl_simple_copy('box_sizing', 'mBoxSizing')}
|
||||
|
||||
pub fn set_order(&mut self, v: longhands::order::computed_value::T) {
|
||||
self.gecko.mOrder = v;
|
||||
}
|
||||
|
||||
pub fn clone_order(&self) -> longhands::order::computed_value::T {
|
||||
self.gecko.mOrder
|
||||
}
|
||||
|
||||
${impl_simple_copy('order', 'mOrder')}
|
||||
|
||||
</%self:impl_trait>
|
||||
|
||||
<% skip_outline_longhands = " ".join("outline-style outline-width".split() +
|
||||
|
@ -2306,7 +2316,7 @@ clip-path
|
|||
</%self:impl_trait>
|
||||
|
||||
<%self:impl_trait style_struct_name="Column"
|
||||
skip_longhands="column-width column-count">
|
||||
skip_longhands="column-width column-count column-gap -moz-column-rule-width">
|
||||
|
||||
pub fn set_column_width(&mut self, v: longhands::column_width::computed_value::T) {
|
||||
match v.0 {
|
||||
|
@ -2330,6 +2340,18 @@ clip-path
|
|||
}
|
||||
|
||||
${impl_simple_copy('column_count', 'mColumnCount')}
|
||||
|
||||
pub fn set_column_gap(&mut self, v: longhands::column_gap::computed_value::T) {
|
||||
match v.0 {
|
||||
Some(len) => self.gecko.mColumnGap.set(len),
|
||||
None => self.gecko.mColumnGap.set_value(CoordDataValue::Normal),
|
||||
}
|
||||
}
|
||||
|
||||
<%call expr="impl_coord_copy('column_gap', 'mColumnGap')"></%call>
|
||||
|
||||
<% impl_app_units("_moz_column_rule_width", "mColumnRuleWidth", need_clone=True,
|
||||
round_to_pixels=True) %>
|
||||
</%self:impl_trait>
|
||||
|
||||
<%self:impl_trait style_struct_name="Counters"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue