diff options
| author | Utsav Oza <utsavoza96@gmail.com> | 2020-06-03 15:47:44 +0530 |
|---|---|---|
| committer | Utsav Oza <utsavoza96@gmail.com> | 2020-06-10 22:10:44 +0530 |
| commit | 15fd256302cc4401e0c4e2d154d473bfaa16223d (patch) | |
| tree | d783cb77e558a34b9c67d06dc2def6a6341b501d /components/layout_thread/lib.rs | |
| parent | 5493424d9aacbdf1066e2e2c48ccbc2a98752509 (diff) | |
| download | servo-15fd256302cc4401e0c4e2d154d473bfaa16223d.tar.gz servo-15fd256302cc4401e0c4e2d154d473bfaa16223d.zip | |
Store resolved font style in canvas context state
Diffstat (limited to 'components/layout_thread/lib.rs')
| -rw-r--r-- | components/layout_thread/lib.rs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index 9ae955789a9..14dbfc0c80e 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -52,8 +52,9 @@ use layout::parallel; use layout::query::{ process_client_rect_query, process_content_box_request, process_content_boxes_request, process_element_inner_text_query, process_node_scroll_area_request, - process_node_scroll_id_request, process_offset_parent_query, process_parse_font_request, - process_resolved_style_request, LayoutRPCImpl, LayoutThreadData, + process_node_scroll_id_request, process_offset_parent_query, + process_resolved_font_style_request, process_resolved_style_request, LayoutRPCImpl, + LayoutThreadData, }; use layout::sequential; use layout::traversal::{ @@ -558,7 +559,7 @@ impl LayoutThread { scroll_id_response: None, scroll_area_response: Rect::zero(), resolved_style_response: String::new(), - parse_font_response: None, + resolved_font_style_response: None, offset_parent_response: OffsetParentResponse::empty(), scroll_offsets: HashMap::new(), text_index_response: TextIndexResponse(None), @@ -1232,8 +1233,8 @@ impl LayoutThread { &QueryMsg::ElementInnerTextQuery(_) => { rw_data.element_inner_text_response = String::new(); }, - &QueryMsg::ParseFontQuery(..) => { - rw_data.parse_font_response = None; + &QueryMsg::ResolvedFontStyleQuery(..) => { + rw_data.resolved_font_style_response = None; }, &QueryMsg::InnerWindowDimensionsQuery(_) => { rw_data.inner_window_dimensions_response = None; @@ -1555,10 +1556,10 @@ impl LayoutThread { rw_data.resolved_style_response = process_resolved_style_request(context, node, pseudo, property, root_flow); }, - &QueryMsg::ParseFontQuery(node, ref property, ref value) => { + &QueryMsg::ResolvedFontStyleQuery(node, ref property, ref value) => { let node = unsafe { ServoLayoutNode::new(&node) }; let url = self.url.clone(); - rw_data.parse_font_response = process_parse_font_request( + rw_data.resolved_font_style_response = process_resolved_font_style_request( context, node, value, |