mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Auto merge of #7883 - notriddle:master, r=pcwalton
Draw shadows after the background. Fixes #7872 <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7883) <!-- Reviewable:end -->
This commit is contained in:
commit
409fbafe9c
6 changed files with 60 additions and 4 deletions
|
@ -971,14 +971,14 @@ impl FragmentDisplayListBuilding for Fragment {
|
|||
// Add shadows, background, borders, and outlines, if applicable.
|
||||
if let Some(ref inline_context) = self.inline_context {
|
||||
for node in inline_context.nodes.iter().rev() {
|
||||
self.build_display_list_for_box_shadow_if_applicable(
|
||||
self.build_display_list_for_background_if_applicable(
|
||||
&*node.style,
|
||||
display_list,
|
||||
layout_context,
|
||||
level,
|
||||
&stacking_relative_border_box,
|
||||
&clip);
|
||||
self.build_display_list_for_background_if_applicable(
|
||||
self.build_display_list_for_box_shadow_if_applicable(
|
||||
&*node.style,
|
||||
display_list,
|
||||
layout_context,
|
||||
|
@ -1008,13 +1008,13 @@ impl FragmentDisplayListBuilding for Fragment {
|
|||
}
|
||||
|
||||
if !self.is_scanned_text_fragment() {
|
||||
self.build_display_list_for_box_shadow_if_applicable(&*self.style,
|
||||
self.build_display_list_for_background_if_applicable(&*self.style,
|
||||
display_list,
|
||||
layout_context,
|
||||
level,
|
||||
&stacking_relative_border_box,
|
||||
&clip);
|
||||
self.build_display_list_for_background_if_applicable(&*self.style,
|
||||
self.build_display_list_for_box_shadow_if_applicable(&*self.style,
|
||||
display_list,
|
||||
layout_context,
|
||||
level,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue