From 83ac0a8505d81d7e3cb45ba926eda316cc4efb0b Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Wed, 3 May 2017 10:39:41 +0200 Subject: [PATCH] Rename PushScrollRoot and remove PopScrollRoot PopScrollRoot was unused and PushScrollRoot no longer pushes a scroll root, but defines a new one. --- components/gfx/display_list/mod.rs | 29 +++++++++-------------- components/layout/display_list_builder.rs | 4 ++-- components/layout/webrender_helpers.rs | 3 +-- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/components/gfx/display_list/mod.rs b/components/gfx/display_list/mod.rs index 77a64553c29..f2aea7a97df 100644 --- a/components/gfx/display_list/mod.rs +++ b/components/gfx/display_list/mod.rs @@ -86,7 +86,7 @@ impl DisplayList { scroll_offsets, result); } - &DisplayItem::PushScrollRoot(ref item) => { + &DisplayItem::DefineClip(ref item) => { let mut point = *translated_point; DisplayList::scroll_root(&item.scroll_root, &mut point, @@ -149,7 +149,7 @@ impl DisplayList { scroll_offsets, result); } - &DisplayItem::PushScrollRoot(ref item) => { + &DisplayItem::DefineClip(ref item) => { let mut point = *translated_point; DisplayList::scroll_root(&item.scroll_root, &mut point, @@ -160,7 +160,7 @@ impl DisplayList { scroll_offsets, result); } - &DisplayItem::PopStackingContext(_) | &DisplayItem::PopScrollRoot(_) => return, + &DisplayItem::PopStackingContext(_) => return, _ => { if let Some(meta) = item.hit_test(*translated_point) { result.push(meta); @@ -510,8 +510,8 @@ pub struct ScrollRoot { } impl ScrollRoot { - pub fn to_push(&self, pipeline_id: PipelineId) -> DisplayItem { - DisplayItem::PushScrollRoot(box PushScrollRootItem { + pub fn to_define_item(&self, pipeline_id: PipelineId) -> DisplayItem { + DisplayItem::DefineClip(box DefineClipItem { base: BaseDisplayItem::empty(pipeline_id), scroll_root: self.clone(), }) @@ -534,8 +534,7 @@ pub enum DisplayItem { Iframe(Box), PushStackingContext(Box), PopStackingContext(Box), - PushScrollRoot(Box), - PopScrollRoot(Box), + DefineClip(Box), } /// Information common to all display items. @@ -1123,7 +1122,7 @@ pub struct PopStackingContextItem { /// Starts a group of items inside a particular scroll root. #[derive(Clone, HeapSizeOf, Deserialize, Serialize)] -pub struct PushScrollRootItem { +pub struct DefineClipItem { /// Fields common to all display items. pub base: BaseDisplayItem, @@ -1159,8 +1158,7 @@ impl DisplayItem { DisplayItem::Iframe(ref iframe) => &iframe.base, DisplayItem::PushStackingContext(ref stacking_context) => &stacking_context.base, DisplayItem::PopStackingContext(ref item) => &item.base, - DisplayItem::PushScrollRoot(ref item) => &item.base, - DisplayItem::PopScrollRoot(ref base) => &base, + DisplayItem::DefineClip(ref item) => &item.base, } } @@ -1246,12 +1244,8 @@ impl fmt::Debug for DisplayItem { return write!(f, "PopStackingContext({:?}", item.stacking_context_id); } - if let DisplayItem::PushScrollRoot(ref item) = *self { - return write!(f, "PushScrollRoot({:?}", item.scroll_root); - } - - if let DisplayItem::PopScrollRoot(_) = *self { - return write!(f, "PopScrollRoot"); + if let DisplayItem::DefineClip(ref item) = *self { + return write!(f, "DefineClip({:?}", item.scroll_root); } write!(f, "{} @ {:?} {:?}", @@ -1277,8 +1271,7 @@ impl fmt::Debug for DisplayItem { DisplayItem::Iframe(_) => "Iframe".to_owned(), DisplayItem::PushStackingContext(_) | DisplayItem::PopStackingContext(_) | - DisplayItem::PushScrollRoot(_) | - DisplayItem::PopScrollRoot(_) => "".to_owned(), + DisplayItem::DefineClip(_) => "".to_owned(), }, self.bounds(), self.base().clip diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index 878b1220336..d91050176a9 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -289,12 +289,12 @@ impl<'a> DisplayListBuildState<'a> { let pipeline_id = self.layout_context.id; if stacking_context.context_type != StackingContextType::Real { - list.extend(info.scroll_roots.into_iter().map(|root| root.to_push(pipeline_id))); + list.extend(info.scroll_roots.into_iter().map(|root| root.to_define_item(pipeline_id))); self.to_display_list_for_items(list, child_items, info.children); } else { let (push_item, pop_item) = stacking_context.to_display_list_items(pipeline_id); list.push(push_item); - list.extend(info.scroll_roots.into_iter().map(|root| root.to_push(pipeline_id))); + list.extend(info.scroll_roots.into_iter().map(|root| root.to_define_item(pipeline_id))); self.to_display_list_for_items(list, child_items, info.children); list.push(pop_item); } diff --git a/components/layout/webrender_helpers.rs b/components/layout/webrender_helpers.rs index aceebd8a19d..eca0837d6a8 100644 --- a/components/layout/webrender_helpers.rs +++ b/components/layout/webrender_helpers.rs @@ -449,7 +449,7 @@ impl WebRenderDisplayItemConverter for DisplayItem { stacking_context.filters.to_filter_ops()); } DisplayItem::PopStackingContext(_) => builder.pop_stacking_context(), - DisplayItem::PushScrollRoot(ref item) => { + DisplayItem::DefineClip(ref item) => { builder.push_clip_id(item.scroll_root.parent_id); let our_id = item.scroll_root.id; @@ -460,7 +460,6 @@ impl WebRenderDisplayItemConverter for DisplayItem { builder.pop_clip_id(); } - DisplayItem::PopScrollRoot(_) => {} //builder.pop_scroll_layer(), } } }