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

Rename PushScrollRoot and remove PopScrollRoot

Browse source 
PopScrollRoot was unused and PushScrollRoot no longer pushes a scroll
root, but defines a new one.
This commit is contained in:
Martin Robinson 2017-05-03 10:39:41 +02:00
parent 8187969c39
commit 83ac0a8505
3 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/layout/display_list_builder.rs
View file

@ -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);
}

3
components/layout/webrender_helpers.rs
View file

@ -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(),
}
}
}