From 60e60b6f8aadf2f8dac5974e679078e1eb5e5427 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 26 Oct 2015 10:24:05 +0100 Subject: [PATCH] Return the result from process_content_boxes_request. --- components/layout/layout_task.rs | 2 +- components/layout/query.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index 890c64ff85b..db9188a680f 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -1230,7 +1230,7 @@ impl LayoutTask { ReflowQueryType::ContentBoxQuery(node) => process_content_box_request(node, &mut root_flow, &mut rw_data), ReflowQueryType::ContentBoxesQuery(node) => - process_content_boxes_request(node, &mut root_flow, &mut rw_data), + rw_data.content_boxes_response = process_content_boxes_request(node, &mut root_flow), ReflowQueryType::NodeGeometryQuery(node) => rw_data.client_rect_response = self.process_node_geometry_request(node, &mut root_flow), ReflowQueryType::ResolvedStyleQuery(node, ref pseudo, ref property) => { diff --git a/components/layout/query.rs b/components/layout/query.rs index 024d3022288..a6742815f17 100644 --- a/components/layout/query.rs +++ b/components/layout/query.rs @@ -295,13 +295,13 @@ pub fn process_content_box_request<'a>(requested_node: TrustedNodeAddress, }; } -pub fn process_content_boxes_request<'a>(requested_node: TrustedNodeAddress, - layout_root: &mut FlowRef, - rw_data: &mut RWGuard<'a>) { +pub fn process_content_boxes_request(requested_node: TrustedNodeAddress, + layout_root: &mut FlowRef) + -> Vec> { // FIXME(pcwalton): This has not been updated to handle the stacking context relative // stuff. So the position is wrong in most cases. let requested_node: OpaqueNode = OpaqueNodeMethods::from_script_node(requested_node); let mut iterator = CollectingFragmentBorderBoxIterator::new(requested_node); sequential::iterate_through_flow_tree_fragment_border_boxes(layout_root, &mut iterator); - rw_data.content_boxes_response = iterator.rects; + iterator.rects }