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

Return the result from process_content_boxes_request.

Browse source
This commit is contained in:
Ms2ger 2015-10-26 10:24:05 +01:00
parent a84055d8fe
commit 60e60b6f8a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/layout/layout_task.rs
View file

@ -1230,7 +1230,7 @@ impl LayoutTask {
ReflowQueryType::ContentBoxQuery(node) => ReflowQueryType::ContentBoxQuery(node) =>
process_content_box_request(node, &mut root_flow, &mut rw_data), process_content_box_request(node, &mut root_flow, &mut rw_data),
ReflowQueryType::ContentBoxesQuery(node) => 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) => ReflowQueryType::NodeGeometryQuery(node) =>
rw_data.client_rect_response = self.process_node_geometry_request(node, &mut root_flow), rw_data.client_rect_response = self.process_node_geometry_request(node, &mut root_flow),
ReflowQueryType::ResolvedStyleQuery(node, ref pseudo, ref property) => { ReflowQueryType::ResolvedStyleQuery(node, ref pseudo, ref property) => {

8
components/layout/query.rs
View file

@ -295,13 +295,13 @@ pub fn process_content_box_request<'a>(requested_node: TrustedNodeAddress,
}; };
} }
pub fn process_content_boxes_request<'a>(requested_node: TrustedNodeAddress, pub fn process_content_boxes_request(requested_node: TrustedNodeAddress,
layout_root: &mut FlowRef, layout_root: &mut FlowRef)
rw_data: &mut RWGuard<'a>) { -> Vec<Rect<Au>> {
// FIXME(pcwalton): This has not been updated to handle the stacking context relative // FIXME(pcwalton): This has not been updated to handle the stacking context relative
// stuff. So the position is wrong in most cases. // stuff. So the position is wrong in most cases.
let requested_node: OpaqueNode = OpaqueNodeMethods::from_script_node(requested_node); let requested_node: OpaqueNode = OpaqueNodeMethods::from_script_node(requested_node);
let mut iterator = CollectingFragmentBorderBoxIterator::new(requested_node); let mut iterator = CollectingFragmentBorderBoxIterator::new(requested_node);
sequential::iterate_through_flow_tree_fragment_border_boxes(layout_root, &mut iterator); sequential::iterate_through_flow_tree_fragment_border_boxes(layout_root, &mut iterator);
rw_data.content_boxes_response = iterator.rects; iterator.rects
} }