From 71d285af800c874e5bc9d302d3e45e14de1fb7bb Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Fri, 21 Oct 2016 08:03:01 +0200 Subject: Use a new id type for tracking scrolling areas This is a step in disassociating scrolling areas from stacking contexts. Now scroll areas are defined by unique ids, which means that in the future stacking context will be able to contain more than one. --- components/layout/sequential.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'components/layout/sequential.rs') diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs index f2964976ed3..51f2ac874a0 100644 --- a/components/layout/sequential.rs +++ b/components/layout/sequential.rs @@ -15,6 +15,7 @@ use flow::IS_ABSOLUTELY_POSITIONED; use fragment::FragmentBorderBoxIterator; use generated_content::ResolveGeneratedContent; use gfx::display_list::{DisplayItem, StackingContext}; +use gfx_traits::ScrollRootId; use script_layout_interface::restyle_damage::{REFLOW, STORE_OVERFLOW}; use style::context::StyleContext; use traversal::{AssignBSizes, AssignISizes, BubbleISizes, BuildDisplayList}; @@ -78,7 +79,7 @@ pub fn build_display_list_for_subtree(flow_root: &mut Flow, root_stacking_context: &mut StackingContext, shared_layout_context: &SharedLayoutContext) -> Vec { - flow_root.collect_stacking_contexts(root_stacking_context); + flow_root.collect_stacking_contexts(root_stacking_context, ScrollRootId::root()); let mut build_display_list = BuildDisplayList { state: DisplayListBuildState::new(shared_layout_context, flow::base(flow_root).stacking_context_id), -- cgit v1.2.3