aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout_thread_2020/lib.rs
diff options
context:
space:
mode:
authorAnthony Ramine <nox@nox.paris>2020-04-07 13:13:33 +0200
committerAnthony Ramine <nox@nox.paris>2020-04-07 14:34:47 +0200
commitc10e8399246e5254a080c2dc809d1c180f06cc93 (patch)
tree886801861030bfd2ff6f4f5ac146f61526d1d28f /components/layout_thread_2020/lib.rs
parent030a1cf8fb040155ca4c5a414f6e2ca01f7574ad (diff)
downloadservo-c10e8399246e5254a080c2dc809d1c180f06cc93.tar.gz
servo-c10e8399246e5254a080c2dc809d1c180f06cc93.zip
Don't go through the layout thread to retrieve a node's primary style
Diffstat (limited to 'components/layout_thread_2020/lib.rs')
-rw-r--r--components/layout_thread_2020/lib.rs15
1 files changed, 4 insertions, 11 deletions
diff --git a/components/layout_thread_2020/lib.rs b/components/layout_thread_2020/lib.rs
index 0dbc6b44cdf..3a808d287ae 100644
--- a/components/layout_thread_2020/lib.rs
+++ b/components/layout_thread_2020/lib.rs
@@ -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(),