mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
Don't go through the layout thread to retrieve a node's primary style
This commit is contained in:
parent
030a1cf8fb
commit
c10e839924
10 changed files with 38 additions and 79 deletions
|
@ -42,8 +42,7 @@ use layout::query::{
|
|||
use layout::query::{process_element_inner_text_query, process_node_geometry_request};
|
||||
use layout::query::{process_node_scroll_area_request, process_node_scroll_id_request};
|
||||
use layout::query::{
|
||||
process_offset_parent_query, process_resolved_style_request, process_style_query,
|
||||
process_text_index_request,
|
||||
process_offset_parent_query, process_resolved_style_request, process_text_index_request,
|
||||
};
|
||||
use layout::traversal::RecalcStyle;
|
||||
use layout::{BoxTreeRoot, FragmentTreeRoot};
|
||||
|
@ -64,7 +63,7 @@ use profile_traits::time::{TimerMetadataFrameType, TimerMetadataReflowType};
|
|||
use script_layout_interface::message::{LayoutThreadInit, Msg, NodesFromPointQueryType};
|
||||
use script_layout_interface::message::{QueryMsg, ReflowComplete, ReflowGoal, ScriptReflow};
|
||||
use script_layout_interface::rpc::TextIndexResponse;
|
||||
use script_layout_interface::rpc::{LayoutRPC, OffsetParentResponse, StyleResponse};
|
||||
use script_layout_interface::rpc::{LayoutRPC, OffsetParentResponse};
|
||||
use script_traits::{ConstellationControlMsg, LayoutControlMsg, LayoutMsg as ConstellationMsg};
|
||||
use script_traits::{DrawAPaintImageResult, PaintWorkletError};
|
||||
use script_traits::{Painter, WebrenderIpcSender};
|
||||
|
@ -551,7 +550,6 @@ impl LayoutThread {
|
|||
scroll_area_response: Rect::zero(),
|
||||
resolved_style_response: String::new(),
|
||||
offset_parent_response: OffsetParentResponse::empty(),
|
||||
style_response: StyleResponse(None),
|
||||
scroll_offsets: HashMap::new(),
|
||||
text_index_response: TextIndexResponse(None),
|
||||
nodes_from_point_response: vec![],
|
||||
|
@ -978,9 +976,7 @@ impl LayoutThread {
|
|||
&QueryMsg::OffsetParentQuery(_) => {
|
||||
rw_data.offset_parent_response = OffsetParentResponse::empty();
|
||||
},
|
||||
&QueryMsg::StyleQuery(_) => {
|
||||
rw_data.style_response = StyleResponse(None);
|
||||
},
|
||||
&QueryMsg::StyleQuery => {},
|
||||
&QueryMsg::TextIndexQuery(..) => {
|
||||
rw_data.text_index_response = TextIndexResponse(None);
|
||||
},
|
||||
|
@ -1261,10 +1257,7 @@ impl LayoutThread {
|
|||
&QueryMsg::OffsetParentQuery(node) => {
|
||||
rw_data.offset_parent_response = process_offset_parent_query(node);
|
||||
},
|
||||
&QueryMsg::StyleQuery(node) => {
|
||||
let node = unsafe { ServoLayoutNode::new(&node) };
|
||||
rw_data.style_response = process_style_query(node);
|
||||
},
|
||||
&QueryMsg::StyleQuery => {},
|
||||
&QueryMsg::NodesFromPointQuery(client_point, ref reflow_goal) => {
|
||||
let mut flags = match reflow_goal {
|
||||
&NodesFromPointQueryType::Topmost => webrender_api::HitTestFlags::empty(),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue