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

Send LoadStart event when the actual pipeline is loading

Browse source
This commit is contained in:
Paul Rouget 2020-06-22 07:17:32 +02:00
parent 3f999ce785
commit b5b8d462f2
2 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/constellation/constellation.rs
View file

@ -1317,10 +1317,6 @@ where
"no replacement" "no replacement"
}, },
); );
self.handle_load_start_msg(
change.top_level_browsing_context_id,
change.browsing_context_id,
);
self.pending_changes.push(change); self.pending_changes.push(change);
} }
@ -3626,18 +3622,6 @@ where
} }
} }
fn handle_load_start_msg(
&mut self,
top_level_browsing_context_id: TopLevelBrowsingContextId,
browsing_context_id: BrowsingContextId,
) {
if browsing_context_id == top_level_browsing_context_id {
// Notify embedder top level document started loading.
self.embedder_proxy
.send((Some(top_level_browsing_context_id), EmbedderMsg::LoadStart));
}
}
fn handle_load_complete_msg( fn handle_load_complete_msg(
&mut self, &mut self,
top_level_browsing_context_id: TopLevelBrowsingContextId, top_level_browsing_context_id: TopLevelBrowsingContextId,
@ -3680,10 +3664,6 @@ where
// Notify embedder and compositor top level document finished loading. // Notify embedder and compositor top level document finished loading.
self.compositor_proxy self.compositor_proxy
.send(ToCompositorMsg::LoadComplete(top_level_browsing_context_id)); .send(ToCompositorMsg::LoadComplete(top_level_browsing_context_id));
self.embedder_proxy.send((
Some(top_level_browsing_context_id),
EmbedderMsg::LoadComplete,
));
} }
} else { } else {
self.handle_subframe_loaded(pipeline_id); self.handle_subframe_loaded(pipeline_id);

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

@ -997,9 +997,15 @@ impl Document {
pub fn set_ready_state(&self, state: DocumentReadyState) { pub fn set_ready_state(&self, state: DocumentReadyState) {
match state { match state {
DocumentReadyState::Loading => { DocumentReadyState::Loading => {
if self.window().is_top_level() {
self.send_to_embedder(EmbedderMsg::LoadStart);
}
update_with_current_time_ms(&self.dom_loading); update_with_current_time_ms(&self.dom_loading);
}, },
DocumentReadyState::Complete => { DocumentReadyState::Complete => {
if self.window().is_top_level() {
self.send_to_embedder(EmbedderMsg::LoadComplete);
}
update_with_current_time_ms(&self.dom_complete); update_with_current_time_ms(&self.dom_complete);
}, },
DocumentReadyState::Interactive => update_with_current_time_ms(&self.dom_interactive), DocumentReadyState::Interactive => update_with_current_time_ms(&self.dom_interactive),