Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove never-sent ReflowWithNewlyLoadedWebFont message, fix #16026

Browse source
This commit is contained in:
Simon Sapin 2017-03-19 09:07:54 +01:00
parent a2c33ac6e6
commit a8ab65b869
2 changed files with 0 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
components/layout_thread/lib.rs
View file

@ -596,9 +596,6 @@ impl LayoutThread {
|| self.handle_reflow(&data, possibly_locked_rw_data)); || self.handle_reflow(&data, possibly_locked_rw_data));
}, },
Msg::TickAnimations => self.tick_all_animations(possibly_locked_rw_data), Msg::TickAnimations => self.tick_all_animations(possibly_locked_rw_data),
Msg::ReflowWithNewlyLoadedWebFont => {
self.reflow_with_newly_loaded_web_font(possibly_locked_rw_data)
}
Msg::SetStackingContextScrollStates(new_scroll_states) => { Msg::SetStackingContextScrollStates(new_scroll_states) => {
self.set_stacking_context_scroll_states(new_scroll_states, self.set_stacking_context_scroll_states(new_scroll_states,
possibly_locked_rw_data); possibly_locked_rw_data);
@ -1357,28 +1354,6 @@ impl LayoutThread {
assert!(layout_context.pending_images.is_none()); assert!(layout_context.pending_images.is_none());
} }
fn reflow_with_newly_loaded_web_font<'a, 'b>(&mut self, possibly_locked_rw_data: &mut RwData<'a, 'b>) {
let mut rw_data = possibly_locked_rw_data.lock();
font_context::invalidate_font_caches();
let reflow_info = Reflow {
goal: ReflowGoal::ForDisplay,
page_clip_rect: max_rect(),
};
let mut layout_context = self.build_layout_context(&*rw_data, false);
// No need to do a style recalc here.
if self.root_flow.is_none() {
return
}
self.perform_post_style_recalc_layout_passes(&reflow_info,
None,
None,
&mut *rw_data,
&mut layout_context);
}
fn perform_post_style_recalc_layout_passes(&mut self, fn perform_post_style_recalc_layout_passes(&mut self,
data: &Reflow, data: &Reflow,
query_type: Option<&ReflowQueryType>, query_type: Option<&ReflowQueryType>,

3
components/script_layout_interface/message.rs
View file

@ -45,9 +45,6 @@ pub enum Msg {
/// field is whether animations should be force-ticked. /// field is whether animations should be force-ticked.
AdvanceClockMs(i32, bool), AdvanceClockMs(i32, bool),
/// Requests that the layout thread reflow with a newly-loaded Web font.
ReflowWithNewlyLoadedWebFont,
/// Destroys layout data associated with a DOM node. /// Destroys layout data associated with a DOM node.
/// ///
/// TODO(pcwalton): Maybe think about batching to avoid message traffic. /// TODO(pcwalton): Maybe think about batching to avoid message traffic.