Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 15:49:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

extract querymsg from ReflowGoal

Browse source
This commit is contained in:
moe 2018-03-16 14:06:27 +08:00 • committed by csmoe
parent b93f153ed5
commit df6b64181b
5 changed files with 177 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

212
components/layout_thread/lib.rs
View file

@ -94,7 +94,7 @@ use profile_traits::mem::{self, Report, ReportKind, ReportsChan};
use profile_traits::time::{self, TimerMetadata, profile}; use profile_traits::time::{self, TimerMetadata, profile};
use profile_traits::time::{TimerMetadataFrameType, TimerMetadataReflowType}; use profile_traits::time::{TimerMetadataFrameType, TimerMetadataReflowType};
use script_layout_interface::message::{Msg, NewLayoutThreadInfo, NodesFromPointQueryType, Reflow}; use script_layout_interface::message::{Msg, NewLayoutThreadInfo, NodesFromPointQueryType, Reflow};
use script_layout_interface::message::{ReflowComplete, ReflowGoal, ScriptReflow}; use script_layout_interface::message::{ReflowComplete, QueryMsg, ReflowGoal, ScriptReflow};
use script_layout_interface::rpc::{LayoutRPC, StyleResponse, OffsetParentResponse}; use script_layout_interface::rpc::{LayoutRPC, StyleResponse, OffsetParentResponse};
use script_layout_interface::rpc::TextIndexResponse; use script_layout_interface::rpc::TextIndexResponse;
use script_layout_interface::wrapper_traits::LayoutNode; use script_layout_interface::wrapper_traits::LayoutNode;
@ -1083,38 +1083,40 @@ impl LayoutThread {
// Since we cannot compute anything, give spec-required placeholders. // Since we cannot compute anything, give spec-required placeholders.
debug!("layout: No root node: bailing"); debug!("layout: No root node: bailing");
match data.reflow_goal { match data.reflow_goal {
ReflowGoal::ContentBoxQuery(_) => { ReflowGoal::LayoutQuery(ref quermsg, _) => match quermsg {
rw_data.content_box_response = None; &QueryMsg::ContentBoxQuery(_) => {
}, rw_data.content_box_response = None;
ReflowGoal::ContentBoxesQuery(_) => { },
rw_data.content_boxes_response = Vec::new(); &QueryMsg::ContentBoxesQuery(_) => {
}, rw_data.content_boxes_response = Vec::new();
ReflowGoal::NodesFromPointQuery(..) => { },
rw_data.nodes_from_point_response = Vec::new(); &QueryMsg::NodesFromPointQuery(..) => {
}, rw_data.nodes_from_point_response = Vec::new();
ReflowGoal::NodeGeometryQuery(_) => { },
rw_data.client_rect_response = Rect::zero(); &QueryMsg::NodeGeometryQuery(_) => {
}, rw_data.client_rect_response = Rect::zero();
ReflowGoal::NodeScrollGeometryQuery(_) => { },
rw_data.scroll_area_response = Rect::zero(); &QueryMsg::NodeScrollGeometryQuery(_) => {
}, rw_data.scroll_area_response = Rect::zero();
ReflowGoal::NodeScrollIdQuery(_) => { },
rw_data.scroll_id_response = None; &QueryMsg::NodeScrollIdQuery(_) => {
}, rw_data.scroll_id_response = None;
ReflowGoal::ResolvedStyleQuery(_, _, _) => { },
rw_data.resolved_style_response = String::new(); &QueryMsg::ResolvedStyleQuery(_, _, _) => {
}, rw_data.resolved_style_response = String::new();
ReflowGoal::OffsetParentQuery(_) => { },
rw_data.offset_parent_response = OffsetParentResponse::empty(); &QueryMsg::OffsetParentQuery(_) => {
}, rw_data.offset_parent_response = OffsetParentResponse::empty();
ReflowGoal::StyleQuery(_) => { },
rw_data.style_response = StyleResponse(None); &QueryMsg::StyleQuery(_) => {
}, rw_data.style_response = StyleResponse(None);
ReflowGoal::TextIndexQuery(..) => { },
rw_data.text_index_response = TextIndexResponse(None); &QueryMsg::TextIndexQuery(..) => {
} rw_data.text_index_response = TextIndexResponse(None);
ReflowGoal::ElementInnerTextQuery(_) => { }
rw_data.element_inner_text_response = String::new(); &QueryMsg::ElementInnerTextQuery(_) => {
rw_data.element_inner_text_response = String::new();
},
}, },
ReflowGoal::Full | ReflowGoal:: TickAnimations => {} ReflowGoal::Full | ReflowGoal:: TickAnimations => {}
} }
@ -1355,80 +1357,82 @@ impl LayoutThread {
}; };
let root_flow = FlowRef::deref_mut(&mut root_flow); let root_flow = FlowRef::deref_mut(&mut root_flow);
match *reflow_goal { match *reflow_goal {
ReflowGoal::ContentBoxQuery(node) => { ReflowGoal::LayoutQuery(ref querymsg, _) => match querymsg {
let node = unsafe { ServoLayoutNode::new(&node) }; &QueryMsg::ContentBoxQuery(node) => {
rw_data.content_box_response = process_content_box_request(node, root_flow); let node = unsafe { ServoLayoutNode::new(&node) };
}, rw_data.content_box_response = process_content_box_request(node, root_flow);
ReflowGoal::ContentBoxesQuery(node) => { },
let node = unsafe { ServoLayoutNode::new(&node) }; &QueryMsg::ContentBoxesQuery(node) => {
rw_data.content_boxes_response = process_content_boxes_request(node, root_flow); let node = unsafe { ServoLayoutNode::new(&node) };
}, rw_data.content_boxes_response = process_content_boxes_request(node, root_flow);
ReflowGoal::TextIndexQuery(node, point_in_node) => { },
let node = unsafe { ServoLayoutNode::new(&node) }; &QueryMsg::TextIndexQuery(node, point_in_node) => {
let opaque_node = node.opaque(); let node = unsafe { ServoLayoutNode::new(&node) };
let point_in_node = Point2D::new( let opaque_node = node.opaque();
Au::from_f32_px(point_in_node.x), let point_in_node = Point2D::new(
Au::from_f32_px(point_in_node.y) Au::from_f32_px(point_in_node.x),
); Au::from_f32_px(point_in_node.y)
rw_data.text_index_response = TextIndexResponse( );
rw_data.indexable_text.text_index(opaque_node, point_in_node) rw_data.text_index_response = TextIndexResponse(
); rw_data.indexable_text.text_index(opaque_node, point_in_node)
}, );
ReflowGoal::NodeGeometryQuery(node) => { },
let node = unsafe { ServoLayoutNode::new(&node) }; &QueryMsg::NodeGeometryQuery(node) => {
rw_data.client_rect_response = process_node_geometry_request(node, root_flow); let node = unsafe { ServoLayoutNode::new(&node) };
}, rw_data.client_rect_response = process_node_geometry_request(node, root_flow);
ReflowGoal::NodeScrollGeometryQuery(node) => { },
let node = unsafe { ServoLayoutNode::new(&node) }; &QueryMsg::NodeScrollGeometryQuery(node) => {
rw_data.scroll_area_response = process_node_scroll_area_request(node, root_flow); let node = unsafe { ServoLayoutNode::new(&node) };
}, rw_data.scroll_area_response = process_node_scroll_area_request(node, root_flow);
ReflowGoal::NodeScrollIdQuery(node) => { },
let node = unsafe { ServoLayoutNode::new(&node) }; &QueryMsg::NodeScrollIdQuery(node) => {
rw_data.scroll_id_response = Some(process_node_scroll_id_request(self.id, node)); let node = unsafe { ServoLayoutNode::new(&node) };
}, rw_data.scroll_id_response = Some(process_node_scroll_id_request(self.id, node));
ReflowGoal::ResolvedStyleQuery(node, ref pseudo, ref property) => { },
let node = unsafe { ServoLayoutNode::new(&node) }; &QueryMsg::ResolvedStyleQuery(node, ref pseudo, ref property) => {
rw_data.resolved_style_response = let node = unsafe { ServoLayoutNode::new(&node) };
process_resolved_style_request(context, rw_data.resolved_style_response =
node, process_resolved_style_request(context,
pseudo, node,
property, pseudo,
root_flow); property,
}, root_flow);
ReflowGoal::OffsetParentQuery(node) => { },
let node = unsafe { ServoLayoutNode::new(&node) }; &QueryMsg::OffsetParentQuery(node) => {
rw_data.offset_parent_response = process_offset_parent_query(node, root_flow); let node = unsafe { ServoLayoutNode::new(&node) };
}, rw_data.offset_parent_response = process_offset_parent_query(node, root_flow);
ReflowGoal::StyleQuery(node) => { },
let node = unsafe { ServoLayoutNode::new(&node) }; &QueryMsg::StyleQuery(node) => {
rw_data.style_response = process_style_query(node); let node = unsafe { ServoLayoutNode::new(&node) };
}, rw_data.style_response = process_style_query(node);
ReflowGoal::NodesFromPointQuery(client_point, ref reflow_goal) => { },
let mut flags = match reflow_goal { &QueryMsg::NodesFromPointQuery(client_point, ref reflow_goal) => {
&NodesFromPointQueryType::Topmost => webrender_api::HitTestFlags::empty(), let mut flags = match reflow_goal {
&NodesFromPointQueryType::All => webrender_api::HitTestFlags::FIND_ALL, &NodesFromPointQueryType::Topmost => webrender_api::HitTestFlags::empty(),
}; &NodesFromPointQueryType::All => webrender_api::HitTestFlags::FIND_ALL,
};
// The point we get is not relative to the entire WebRender scene, but to this // The point we get is not relative to the entire WebRender scene, but to this
// particular pipeline, so we need to tell WebRender about that. // particular pipeline, so we need to tell WebRender about that.
flags.insert(webrender_api::HitTestFlags::POINT_RELATIVE_TO_PIPELINE_VIEWPORT); flags.insert(webrender_api::HitTestFlags::POINT_RELATIVE_TO_PIPELINE_VIEWPORT);
let client_point = webrender_api::WorldPoint::from_untyped(&client_point); let client_point = webrender_api::WorldPoint::from_untyped(&client_point);
let results = self.webrender_api.hit_test( let results = self.webrender_api.hit_test(
self.webrender_document, self.webrender_document,
Some(self.id.to_webrender()), Some(self.id.to_webrender()),
client_point, client_point,
flags flags
); );
rw_data.nodes_from_point_response = results.items.iter() rw_data.nodes_from_point_response = results.items.iter()
.map(|item| UntrustedNodeAddress(item.tag.0 as *const c_void)) .map(|item| UntrustedNodeAddress(item.tag.0 as *const c_void))
.collect() .collect()
}, },
ReflowGoal::ElementInnerTextQuery(node) => { &QueryMsg::ElementInnerTextQuery(node) => {
let node = unsafe { ServoLayoutNode::new(&node) }; let node = unsafe { ServoLayoutNode::new(&node) };
rw_data.element_inner_text_response = rw_data.element_inner_text_response =
process_element_inner_text_query(node, &rw_data.indexable_text); process_element_inner_text_query(node, &rw_data.indexable_text);
},
}, },
ReflowGoal::Full | ReflowGoal::TickAnimations => {} ReflowGoal::Full | ReflowGoal::TickAnimations => {}
} }

4
components/script/dom/document.rs
View file

@ -108,7 +108,7 @@ use net_traits::response::HttpsState;
use num_traits::ToPrimitive; use num_traits::ToPrimitive;
use profile_traits::time::{TimerMetadata, TimerMetadataFrameType, TimerMetadataReflowType}; use profile_traits::time::{TimerMetadata, TimerMetadataFrameType, TimerMetadataReflowType};
use ref_slice::ref_slice; use ref_slice::ref_slice;
use script_layout_interface::message::{Msg, NodesFromPointQueryType, ReflowGoal}; use script_layout_interface::message::{Msg, NodesFromPointQueryType, QueryMsg, ReflowGoal};
use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory}; use script_runtime::{CommonScriptMsg, ScriptThreadEventCategory};
use script_thread::{MainThreadScriptMsg, ScriptThread}; use script_thread::{MainThreadScriptMsg, ScriptThread};
use script_traits::{AnimationState, DocumentActivity, MouseButton, MouseEventType}; use script_traits::{AnimationState, DocumentActivity, MouseButton, MouseEventType};
@ -1968,7 +1968,7 @@ impl Document {
client_point: &Point2D<f32>, client_point: &Point2D<f32>,
reflow_goal: NodesFromPointQueryType) reflow_goal: NodesFromPointQueryType)
-> Vec<UntrustedNodeAddress> { -> Vec<UntrustedNodeAddress> {
if !self.window.reflow(ReflowGoal::NodesFromPointQuery(*client_point, reflow_goal), if !self.window.reflow(ReflowGoal::LayoutQuery(QueryMsg::NodesFromPointQuery(*client_point, reflow_goal), u64::default()),
ReflowReason::Query) { ReflowReason::Query) {
return vec!(); return vec!();
}; };

4
components/script/dom/htmlelement.rs
View file

@ -35,7 +35,7 @@ use dom::virtualmethods::VirtualMethods;
use dom::window::ReflowReason; use dom::window::ReflowReason;
use dom_struct::dom_struct; use dom_struct::dom_struct;
use html5ever::{LocalName, Prefix}; use html5ever::{LocalName, Prefix};
use script_layout_interface::message::ReflowGoal; use script_layout_interface::message::{QueryMsg, ReflowGoal};
use std::collections::HashSet; use std::collections::HashSet;
use std::default::Default; use std::default::Default;
use std::rc::Rc; use std::rc::Rc;
@ -419,7 +419,7 @@ impl HTMLElementMethods for HTMLElement {
return node.GetTextContent().unwrap(); return node.GetTextContent().unwrap();
} }
window.reflow(ReflowGoal::ElementInnerTextQuery(node.to_trusted_node_address()), ReflowReason::Query); window.reflow(ReflowGoal::LayoutQuery(QueryMsg::ElementInnerTextQuery(node.to_trusted_node_address()), u64::default()), ReflowReason::Query);
DOMString::from(window.layout().element_inner_text()) DOMString::from(window.layout().element_inner_text())
} }

52
components/script/dom/window.rs
View file

@ -66,7 +66,7 @@ use num_traits::ToPrimitive;
use profile_traits::mem::ProfilerChan as MemProfilerChan; use profile_traits::mem::ProfilerChan as MemProfilerChan;
use profile_traits::time::ProfilerChan as TimeProfilerChan; use profile_traits::time::ProfilerChan as TimeProfilerChan;
use script_layout_interface::{TrustedNodeAddress, PendingImageState}; use script_layout_interface::{TrustedNodeAddress, PendingImageState};
use script_layout_interface::message::{Msg, Reflow, ReflowGoal, ScriptReflow}; use script_layout_interface::message::{Msg, Reflow, QueryMsg, ReflowGoal, ScriptReflow};
use script_layout_interface::reporter::CSSErrorReporter; use script_layout_interface::reporter::CSSErrorReporter;
use script_layout_interface::rpc::{ContentBoxResponse, ContentBoxesResponse, LayoutRPC}; use script_layout_interface::rpc::{ContentBoxResponse, ContentBoxesResponse, LayoutRPC};
use script_layout_interface::rpc::{NodeScrollIdResponse, ResolvedStyleResponse, TextIndexResponse}; use script_layout_interface::rpc::{NodeScrollIdResponse, ResolvedStyleResponse, TextIndexResponse};
@ -1374,12 +1374,16 @@ impl Window {
issued_reflow issued_reflow
} }
pub fn layout_reflow(&self, query_msg: QuerMsg) -> bool {
self.reflow(ReflowGoal::LayoutQuery(query_msg, time::precise_time_ns()), ReflowReason::Query)
}
pub fn layout(&self) -> &LayoutRPC { pub fn layout(&self) -> &LayoutRPC {
&*self.layout_rpc &*self.layout_rpc
} }
pub fn content_box_query(&self, content_box_request: TrustedNodeAddress) -> Option<Rect<Au>> { pub fn content_box_query(&self, content_box_request: TrustedNodeAddress) -> Option<Rect<Au>> {
if !self.reflow(ReflowGoal::ContentBoxQuery(content_box_request), ReflowReason::Query) { if !self.layout_reflow(QueryMsg::ContentBoxQuery(content_box_request)) {
return None; return None;
} }
let ContentBoxResponse(rect) = self.layout_rpc.content_box(); let ContentBoxResponse(rect) = self.layout_rpc.content_box();
@ -1387,7 +1391,7 @@ impl Window {
} }
pub fn content_boxes_query(&self, content_boxes_request: TrustedNodeAddress) -> Vec<Rect<Au>> { pub fn content_boxes_query(&self, content_boxes_request: TrustedNodeAddress) -> Vec<Rect<Au>> {
if !self.reflow(ReflowGoal::ContentBoxesQuery(content_boxes_request), ReflowReason::Query) { if !self.layout_reflow(QueryMsg::ContentBoxesQuery(content_boxes_request)) {
return vec![]; return vec![];
} }
let ContentBoxesResponse(rects) = self.layout_rpc.content_boxes(); let ContentBoxesResponse(rects) = self.layout_rpc.content_boxes();
@ -1395,14 +1399,14 @@ impl Window {
} }
pub fn client_rect_query(&self, node_geometry_request: TrustedNodeAddress) -> Rect<i32> { pub fn client_rect_query(&self, node_geometry_request: TrustedNodeAddress) -> Rect<i32> {
if !self.reflow(ReflowGoal::NodeGeometryQuery(node_geometry_request), ReflowReason::Query) { if !self.layout_reflow(QueryMsg::NodeGeometryQuery(node_geometry_request)) {
return Rect::zero(); return Rect::zero();
} }
self.layout_rpc.node_geometry().client_rect self.layout_rpc.node_geometry().client_rect
} }
pub fn scroll_area_query(&self, node: TrustedNodeAddress) -> Rect<i32> { pub fn scroll_area_query(&self, node: TrustedNodeAddress) -> Rect<i32> {
if !self.reflow(ReflowGoal::NodeScrollGeometryQuery(node), ReflowReason::Query) { if !self.layout_reflow(QueryMsg::NodeScrollGeometryQuery(node)) {
return Rect::zero(); return Rect::zero();
} }
self.layout_rpc.node_scroll_area().client_rect self.layout_rpc.node_scroll_area().client_rect
@ -1425,10 +1429,7 @@ impl Window {
y_: f64, y_: f64,
behavior: ScrollBehavior behavior: ScrollBehavior
) { ) {
if !self.reflow( if !self.layout_reflow(QueryMsg::NodeScrollIdQuery(node.to_trusted_node_address())) {
ReflowGoal::NodeScrollIdQuery(node.to_trusted_node_address()),
ReflowReason::Query
) {
return; return;
} }
@ -1452,8 +1453,7 @@ impl Window {
element: TrustedNodeAddress, element: TrustedNodeAddress,
pseudo: Option<PseudoElement>, pseudo: Option<PseudoElement>,
property: PropertyId) -> DOMString { property: PropertyId) -> DOMString {
if !self.reflow(ReflowGoal::ResolvedStyleQuery(element, pseudo, property), if !self.layout_reflow(QueryMsg::ResolvedStyleQuery(element, pseudo, property)) {
ReflowReason::Query) {
return DOMString::new(); return DOMString::new();
} }
let ResolvedStyleResponse(resolved) = self.layout_rpc.resolved_style(); let ResolvedStyleResponse(resolved) = self.layout_rpc.resolved_style();
@ -1462,7 +1462,7 @@ impl Window {
#[allow(unsafe_code)] #[allow(unsafe_code)]
pub fn offset_parent_query(&self, node: TrustedNodeAddress) -> (Option<DomRoot<Element>>, Rect<Au>) { pub fn offset_parent_query(&self, node: TrustedNodeAddress) -> (Option<DomRoot<Element>>, Rect<Au>) {
if !self.reflow(ReflowGoal::OffsetParentQuery(node), ReflowReason::Query) { if !self.layout_reflow(QueryMsg::OffsetParentQuery(node)) {
return (None, Rect::zero()); return (None, Rect::zero());
} }
@ -1477,7 +1477,7 @@ impl Window {
} }
pub fn style_query(&self, node: TrustedNodeAddress) -> Option<servo_arc::Arc<ComputedValues>> { pub fn style_query(&self, node: TrustedNodeAddress) -> Option<servo_arc::Arc<ComputedValues>> {
if !self.reflow(ReflowGoal::StyleQuery(node), ReflowReason::Query) { if !self.layout_reflow(QueryMsg::StyleQuery(node)) {
return None return None
} }
self.layout_rpc.style().0 self.layout_rpc.style().0
@ -1488,7 +1488,7 @@ impl Window {
node: TrustedNodeAddress, node: TrustedNodeAddress,
point_in_node: Point2D<f32> point_in_node: Point2D<f32>
) -> TextIndexResponse { ) -> TextIndexResponse {
if !self.reflow(ReflowGoal::TextIndexQuery(node, point_in_node), ReflowReason::Query) { if !self.layout_reflow(QueryMsg::TextIndexQuery(node, point_in_node)) {
return TextIndexResponse(None); return TextIndexResponse(None);
} }
self.layout_rpc.text_index() self.layout_rpc.text_index()
@ -1870,18 +1870,20 @@ fn debug_reflow_events(id: PipelineId, reflow_goal: &ReflowGoal, reason: &Reflow
let mut debug_msg = format!("**** pipeline={}", id); let mut debug_msg = format!("**** pipeline={}", id);
debug_msg.push_str(match *reflow_goal { debug_msg.push_str(match *reflow_goal {
ReflowGoal::Full => "\tFull", ReflowGoal::Full => "\tFull",
ReflowGoal::ContentBoxQuery(_n) => "\tContentBoxQuery",
ReflowGoal::ContentBoxesQuery(_n) => "\tContentBoxesQuery",
ReflowGoal::NodesFromPointQuery(..) => "\tNodesFromPointQuery",
ReflowGoal::NodeGeometryQuery(_n) => "\tNodeGeometryQuery",
ReflowGoal::NodeScrollGeometryQuery(_n) => "\tNodeScrollGeometryQuery",
ReflowGoal::NodeScrollIdQuery(_n) => "\tNodeScrollIdQuery",
ReflowGoal::ResolvedStyleQuery(_, _, _) => "\tResolvedStyleQuery",
ReflowGoal::OffsetParentQuery(_n) => "\tOffsetParentQuery",
ReflowGoal::StyleQuery(_n) => "\tStyleQuery",
ReflowGoal::TextIndexQuery(..) => "\tTextIndexQuery",
ReflowGoal::TickAnimations => "\tTickAnimations", ReflowGoal::TickAnimations => "\tTickAnimations",
ReflowGoal::ElementInnerTextQuery(_) => "\tElementInnerTextQuery", ReflowGoal::LayoutQuery(ref query_msg, _) => match query_msg {
&QueryMsg::ContentBoxQuery(_n) => "\tContentBoxQuery",
&QueryMsg::ContentBoxesQuery(_n) => "\tContentBoxesQuery",
&QueryMsg::NodesFromPointQuery(..) => "\tNodesFromPointQuery",
&QueryMsg::NodeGeometryQuery(_n) => "\tNodeGeometryQuery",
&QueryMsg::NodeScrollGeometryQuery(_n) => "\tNodeScrollGeometryQuery",
&QueryMsg::NodeScrollIdQuery(_n) => "\tNodeScrollIdQuery",
&QueryMsg::ResolvedStyleQuery(_, _, _) => "\tResolvedStyleQuery",
&QueryMsg::OffsetParentQuery(_n) => "\tOffsetParentQuery",
&QueryMsg::StyleQuery(_n) => "\tStyleQuery",
&QueryMsg::TextIndexQuery(..) => "\tTextIndexQuery",
&QueryMsg::ElementInnerTextQuery(_) => "\tElementInnerTextQuery",
},
}); });
debug_msg.push_str(match *reason { debug_msg.push_str(match *reason {

59
components/script_layout_interface/message.rs
View file

@ -2,7 +2,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use {OpaqueStyleAndLayoutData, TrustedNodeAddress, PendingImage}; use {OpaqueStyleAndLayoutData, PendingImage, TrustedNodeAddress};
use app_units::Au; use app_units::Au;
use euclid::{Point2D, Rect}; use euclid::{Point2D, Rect};
use gfx_traits::Epoch; use gfx_traits::Epoch;
@ -106,11 +106,8 @@ pub enum NodesFromPointQueryType {
Topmost, Topmost,
} }
/// Any query to perform with this reflow.
#[derive(Debug, PartialEq)] #[derive(Debug, PartialEq)]
pub enum ReflowGoal { pub enum QueryMsg {
Full,
TickAnimations,
ContentBoxQuery(TrustedNodeAddress), ContentBoxQuery(TrustedNodeAddress),
ContentBoxesQuery(TrustedNodeAddress), ContentBoxesQuery(TrustedNodeAddress),
NodeScrollIdQuery(TrustedNodeAddress), NodeScrollIdQuery(TrustedNodeAddress),
@ -124,19 +121,33 @@ pub enum ReflowGoal {
ElementInnerTextQuery(TrustedNodeAddress), ElementInnerTextQuery(TrustedNodeAddress),
} }
/// Any query to perform with this reflow.
#[derive(Debug, PartialEq)]
pub enum ReflowGoal {
Full,
TickAnimations,
LayoutQuery(QueryMsg, u64),
}
impl ReflowGoal { impl ReflowGoal {
/// Returns true if the given ReflowQuery needs a full, up-to-date display list to /// Returns true if the given ReflowQuery needs a full, up-to-date display list to
/// be present or false if it only needs stacking-relative positions. /// be present or false if it only needs stacking-relative positions.
pub fn needs_display_list(&self) -> bool { pub fn needs_display_list(&self) -> bool {
match *self { match *self {
ReflowGoal::NodesFromPointQuery(..) | ReflowGoal::TextIndexQuery(..) | ReflowGoal::Full | ReflowGoal::TickAnimations => true,
ReflowGoal::TickAnimations | ReflowGoal::ElementInnerTextQuery(_) | ReflowGoal::LayoutQuery(ref querymsg, _) => match querymsg {
ReflowGoal::Full => true, &QueryMsg::NodesFromPointQuery(..) |
ReflowGoal::ContentBoxQuery(_) | ReflowGoal::ContentBoxesQuery(_) | &QueryMsg::TextIndexQuery(..) |
ReflowGoal::NodeGeometryQuery(_) | ReflowGoal::NodeScrollGeometryQuery(_) | &QueryMsg::ElementInnerTextQuery(_) => true,
ReflowGoal::NodeScrollIdQuery(_) | &QueryMsg::ContentBoxQuery(_) |
ReflowGoal::ResolvedStyleQuery(..) | ReflowGoal::OffsetParentQuery(_) | &QueryMsg::ContentBoxesQuery(_) |
ReflowGoal::StyleQuery(_) => false, &QueryMsg::NodeGeometryQuery(_) |
&QueryMsg::NodeScrollGeometryQuery(_) |
&QueryMsg::NodeScrollIdQuery(_) |
&QueryMsg::ResolvedStyleQuery(..) |
&QueryMsg::OffsetParentQuery(_) |
&QueryMsg::StyleQuery(_) => false,
},
} }
} }
@ -144,14 +155,20 @@ impl ReflowGoal {
/// false if a layout_thread display list is sufficient. /// false if a layout_thread display list is sufficient.
pub fn needs_display(&self) -> bool { pub fn needs_display(&self) -> bool {
match *self { match *self {
ReflowGoal::StyleQuery(_) | ReflowGoal::TextIndexQuery(..) | ReflowGoal::Full | ReflowGoal::TickAnimations => true,
ReflowGoal::ContentBoxQuery(_) | ReflowGoal::ContentBoxesQuery(_) | ReflowGoal::LayoutQuery(ref querymsg, _) => match querymsg {
ReflowGoal::NodeGeometryQuery(_) | ReflowGoal::NodeScrollGeometryQuery(_) | &QueryMsg::NodesFromPointQuery(..) |
ReflowGoal::NodeScrollIdQuery(_) | ReflowGoal::ResolvedStyleQuery(..) | &QueryMsg::TextIndexQuery(..) |
ReflowGoal::OffsetParentQuery(_) => false, &QueryMsg::ElementInnerTextQuery(_) => true,
ReflowGoal::NodesFromPointQuery(..) | ReflowGoal::Full | &QueryMsg::ContentBoxQuery(_) |
ReflowGoal::ElementInnerTextQuery(_) | &QueryMsg::ContentBoxesQuery(_) |
ReflowGoal::TickAnimations => true, &QueryMsg::NodeGeometryQuery(_) |
&QueryMsg::NodeScrollGeometryQuery(_) |
&QueryMsg::NodeScrollIdQuery(_) |
&QueryMsg::ResolvedStyleQuery(..) |
&QueryMsg::OffsetParentQuery(_) |
&QueryMsg::StyleQuery(_) => false,
},
} }
} }
} }