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

Do not emit DL items for zero images

Browse source 
Fixes wpt test failure.
This commit is contained in:
Pyfisch 2018-08-16 12:41:37 +02:00
parent 3d2957c737
commit 1c438ed82c
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
components/layout/display_list/builder.rs
View file

@ -385,6 +385,13 @@ impl<'a> DisplayListBuildState<'a> {
items.push(display_item); items.push(display_item);
} }
fn add_image_item(&mut self, base: BaseDisplayItem, item: webrender_api::ImageDisplayItem) {
if item.stretch_size == LayoutSize::zero() {
return;
}
self.add_display_item(DisplayItem::Image(CommonDisplayItem::new(base, item)))
}
fn parent_clip_scroll_node_index(&self, index: ClipScrollNodeIndex) -> ClipScrollNodeIndex { fn parent_clip_scroll_node_index(&self, index: ClipScrollNodeIndex) -> ClipScrollNodeIndex {
if index.is_root_scroll_node() { if index.is_root_scroll_node() {
return index; return index;
@ -1052,7 +1059,7 @@ impl FragmentDisplayListBuilding for Fragment {
); );
debug!("(building display list) adding background image."); debug!("(building display list) adding background image.");
state.add_display_item(DisplayItem::Image(CommonDisplayItem::new( state.add_image_item(
base, base,
webrender_api::ImageDisplayItem { webrender_api::ImageDisplayItem {
image_key: webrender_image.key.unwrap(), image_key: webrender_image.key.unwrap(),
@ -1061,7 +1068,7 @@ impl FragmentDisplayListBuilding for Fragment {
image_rendering: style.get_inherited_box().image_rendering.to_layout(), image_rendering: style.get_inherited_box().image_rendering.to_layout(),
alpha_type: webrender_api::AlphaType::PremultipliedAlpha, alpha_type: webrender_api::AlphaType::PremultipliedAlpha,
}, },
))); );
}); });
} }
@ -1922,7 +1929,7 @@ impl FragmentDisplayListBuilding for Fragment {
if let Some(ref image) = image_fragment.image { if let Some(ref image) = image_fragment.image {
if let Some(id) = image.id { if let Some(id) = image.id {
let base = create_base_display_item(state); let base = create_base_display_item(state);
state.add_display_item(DisplayItem::Image(CommonDisplayItem::new( state.add_image_item(
base, base,
webrender_api::ImageDisplayItem { webrender_api::ImageDisplayItem {
image_key: id, image_key: id,
@ -1935,7 +1942,7 @@ impl FragmentDisplayListBuilding for Fragment {
.to_layout(), .to_layout(),
alpha_type: webrender_api::AlphaType::PremultipliedAlpha, alpha_type: webrender_api::AlphaType::PremultipliedAlpha,
}, },
))); );
} }
} }
}, },
@ -1959,18 +1966,15 @@ impl FragmentDisplayListBuilding for Fragment {
}; };
let base = create_base_display_item(state); let base = create_base_display_item(state);
let display_item = DisplayItem::Image(CommonDisplayItem::new( let display_item = webrender_api::ImageDisplayItem {
base, image_key,
webrender_api::ImageDisplayItem { stretch_size: stacking_relative_content_box.size.to_layout(),
image_key, tile_spacing: LayoutSize::zero(),
stretch_size: stacking_relative_content_box.size.to_layout(), image_rendering: ImageRendering::Auto,
tile_spacing: LayoutSize::zero(), alpha_type: webrender_api::AlphaType::PremultipliedAlpha,
image_rendering: ImageRendering::Auto, };
alpha_type: webrender_api::AlphaType::PremultipliedAlpha,
},
));
state.add_display_item(display_item); state.add_image_item(base, display_item);
}, },
SpecificFragmentInfo::UnscannedText(_) => { SpecificFragmentInfo::UnscannedText(_) => {
panic!("Shouldn't see unscanned fragments here.") panic!("Shouldn't see unscanned fragments here.")