From 05fb2ef6ee307f4e317430aa51a5692d7ba07b51 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Fri, 22 Apr 2016 10:28:27 -0700 Subject: Merge DisplayListEntry into DisplayItem We don't really need two levels of abstraction for every element in the DisplayList. This simplifies the complexity of the data structure in preparation for providing documentation and properly handling scrolling roots. --- components/layout/sequential.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/layout/sequential.rs') diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs index bc4668f33c6..16aa0d5f277 100644 --- a/components/layout/sequential.rs +++ b/components/layout/sequential.rs @@ -15,7 +15,7 @@ use flow::{self, Flow, ImmutableFlowUtils, InorderFlowTraversal, MutableFlowUtil use flow_ref::{self, FlowRef}; use fragment::FragmentBorderBoxIterator; use generated_content::ResolveGeneratedContent; -use gfx::display_list::{DisplayListEntry, StackingContext}; +use gfx::display_list::{DisplayItem, StackingContext}; use incremental::{REFLOW, STORE_OVERFLOW}; use style::dom::TNode; use style::traversal::DomTraversalContext; @@ -82,7 +82,7 @@ pub fn traverse_flow_tree_preorder(root: &mut FlowRef, pub fn build_display_list_for_subtree(root: &mut FlowRef, root_stacking_context: &mut StackingContext, shared_layout_context: &SharedLayoutContext) - -> Vec { + -> Vec { let flow_root = flow_ref::deref_mut(root); let layout_context = LayoutContext::new(shared_layout_context); flow_root.traverse_preorder(&ComputeAbsolutePositions { layout_context: &layout_context }); -- cgit v1.2.3