Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove unused DisplayItem::LayeredItem.

Browse source
This commit is contained in:
Ms2ger 2016-10-18 09:36:31 +02:00
parent 275278be44
commit 6d09843586
2 changed files with 0 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/gfx/display_list/mod.rs
View file

@ -766,7 +766,6 @@ pub enum DisplayItem {
Gradient(Box<GradientDisplayItem>), Gradient(Box<GradientDisplayItem>),
Line(Box<LineDisplayItem>), Line(Box<LineDisplayItem>),
BoxShadow(Box<BoxShadowDisplayItem>), BoxShadow(Box<BoxShadowDisplayItem>),
LayeredItem(Box<LayeredItem>),
Iframe(Box<IframeDisplayItem>), Iframe(Box<IframeDisplayItem>),
PushStackingContext(Box<PushStackingContextItem>), PushStackingContext(Box<PushStackingContextItem>),
PopStackingContext(Box<PopStackingContextItem>), PopStackingContext(Box<PopStackingContextItem>),
@ -1251,16 +1250,6 @@ pub struct BoxShadowDisplayItem {
pub clip_mode: BoxShadowClipMode, pub clip_mode: BoxShadowClipMode,
} }
/// Contains an item that should get its own layer during layer creation.
#[derive(Clone, HeapSizeOf, Deserialize, Serialize)]
pub struct LayeredItem {
/// Fields common to all display items.
pub item: DisplayItem,
/// The id of the layer this item belongs to.
pub layer_info: LayerInfo,
}
/// Defines a stacking context. /// Defines a stacking context.
#[derive(Clone, HeapSizeOf, Deserialize, Serialize)] #[derive(Clone, HeapSizeOf, Deserialize, Serialize)]
pub struct PushStackingContextItem { pub struct PushStackingContextItem {
@ -1359,8 +1348,6 @@ impl DisplayItem {
box_shadow.clip_mode); box_shadow.clip_mode);
} }
DisplayItem::LayeredItem(ref item) => item.item.draw_into_context(paint_context),
DisplayItem::Iframe(..) => {} DisplayItem::Iframe(..) => {}
DisplayItem::PushStackingContext(..) => {} DisplayItem::PushStackingContext(..) => {}
@ -1392,7 +1379,6 @@ impl DisplayItem {
DisplayItem::Gradient(ref gradient) => &gradient.base, DisplayItem::Gradient(ref gradient) => &gradient.base,
DisplayItem::Line(ref line) => &line.base, DisplayItem::Line(ref line) => &line.base,
DisplayItem::BoxShadow(ref box_shadow) => &box_shadow.base, DisplayItem::BoxShadow(ref box_shadow) => &box_shadow.base,
DisplayItem::LayeredItem(ref layered_item) => layered_item.item.base(),
DisplayItem::Iframe(ref iframe) => &iframe.base, DisplayItem::Iframe(ref iframe) => &iframe.base,
DisplayItem::PushStackingContext(ref stacking_context) => &stacking_context.base, DisplayItem::PushStackingContext(ref stacking_context) => &stacking_context.base,
DisplayItem::PopStackingContext(ref item) => &item.base, DisplayItem::PopStackingContext(ref item) => &item.base,
@ -1492,8 +1478,6 @@ impl fmt::Debug for DisplayItem {
DisplayItem::Gradient(_) => "Gradient".to_owned(), DisplayItem::Gradient(_) => "Gradient".to_owned(),
DisplayItem::Line(_) => "Line".to_owned(), DisplayItem::Line(_) => "Line".to_owned(),
DisplayItem::BoxShadow(_) => "BoxShadow".to_owned(), DisplayItem::BoxShadow(_) => "BoxShadow".to_owned(),
DisplayItem::LayeredItem(ref layered_item) =>
format!("LayeredItem({:?})", layered_item.item),
DisplayItem::Iframe(_) => "Iframe".to_owned(), DisplayItem::Iframe(_) => "Iframe".to_owned(),
DisplayItem::PushStackingContext(_) => "".to_owned(), DisplayItem::PushStackingContext(_) => "".to_owned(),
DisplayItem::PopStackingContext(_) => "".to_owned(), DisplayItem::PopStackingContext(_) => "".to_owned(),

3
components/layout/webrender_helpers.rs
View file

@ -485,9 +485,6 @@ impl WebRenderDisplayItemConverter for DisplayItem {
DisplayItem::Line(..) => { DisplayItem::Line(..) => {
println!("TODO DisplayItem::Line"); println!("TODO DisplayItem::Line");
} }
DisplayItem::LayeredItem(..) => {
panic!("Unexpected in webrender!");
}
DisplayItem::BoxShadow(ref item) => { DisplayItem::BoxShadow(ref item) => {
let rect = item.base.bounds.to_rectf(); let rect = item.base.bounds.to_rectf();
let box_bounds = item.box_bounds.to_rectf(); let box_bounds = item.box_bounds.to_rectf();