mirror of
https://github.com/servo/servo.git
synced 2025-08-07 22:45:34 +01:00
Make it possible to construct StyleBuilder with two different inherited styles.
Part 3 of Gecko bug 1382806. r=emilio
This commit is contained in:
parent
f991b76535
commit
048044f98b
4 changed files with 41 additions and 1 deletions
|
@ -637,6 +637,7 @@ impl Stylist {
|
|||
guards,
|
||||
parent,
|
||||
parent,
|
||||
parent,
|
||||
None,
|
||||
None,
|
||||
font_metrics,
|
||||
|
@ -753,6 +754,7 @@ impl Stylist {
|
|||
guards,
|
||||
Some(inherited_style),
|
||||
Some(inherited_style),
|
||||
Some(inherited_style),
|
||||
None,
|
||||
None,
|
||||
font_metrics,
|
||||
|
@ -778,6 +780,7 @@ impl Stylist {
|
|||
guards,
|
||||
Some(parent_style),
|
||||
Some(parent_style),
|
||||
Some(parent_style),
|
||||
visited_values,
|
||||
None,
|
||||
font_metrics,
|
||||
|
@ -1342,6 +1345,7 @@ impl Stylist {
|
|||
guards,
|
||||
Some(parent_style),
|
||||
Some(parent_style),
|
||||
Some(parent_style),
|
||||
None,
|
||||
None,
|
||||
&metrics,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue