servo: Merge #7883 - Draw shadows after the background (from notriddle:master); r=pcwalton

Fixes #7872

Source-Repo: https://github.com/servo/servo
Source-Revision: 409fbafe9cdd16a2b5a25f64eae0bc11d6fc9aa1
This commit is contained in:
Michael Howell 2015-10-06 22:03:48 -06:00
Родитель 5c7ac8e940
Коммит 37bfbc973f
1 изменённых файлов: 4 добавлений и 4 удалений

Просмотреть файл

@ -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,