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

Reduce code duplication when adding a SessionHistoryChange

Browse source
This commit is contained in:
Jeroen Kleijn 2017-06-09 19:50:40 +02:00
parent e46aa87b4c
commit bca052e7b3
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/constellation/constellation.rs
View file

@ -800,6 +800,12 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
} }
} }
fn add_pending_change(&mut self, change: SessionHistoryChange)
{
self.handle_load_start_msg(change.new_pipeline_id);
self.pending_changes.push(change);
}
/// Handles loading pages, navigation, and granting access to the compositor /// Handles loading pages, navigation, and granting access to the compositor
#[allow(unsafe_code)] #[allow(unsafe_code)]
fn handle_request(&mut self) { fn handle_request(&mut self) {
@ -1418,8 +1424,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
let sandbox = IFrameSandboxState::IFrameSandboxed; let sandbox = IFrameSandboxState::IFrameSandboxed;
self.new_pipeline(new_pipeline_id, browsing_context_id, top_level_browsing_context_id, parent_info, self.new_pipeline(new_pipeline_id, browsing_context_id, top_level_browsing_context_id, parent_info,
window_size, load_data.clone(), sandbox, false); window_size, load_data.clone(), sandbox, false);
self.handle_load_start_msg(new_pipeline_id); self.add_pending_change(SessionHistoryChange {
self.pending_changes.push(SessionHistoryChange {
top_level_browsing_context_id: top_level_browsing_context_id, top_level_browsing_context_id: top_level_browsing_context_id,
browsing_context_id: browsing_context_id, browsing_context_id: browsing_context_id,
new_pipeline_id: new_pipeline_id, new_pipeline_id: new_pipeline_id,
@ -1476,8 +1481,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
load_data.clone(), load_data.clone(),
sandbox, sandbox,
false); false);
self.handle_load_start_msg(pipeline_id); self.add_pending_change(SessionHistoryChange {
self.pending_changes.push(SessionHistoryChange {
top_level_browsing_context_id: top_level_browsing_context_id, top_level_browsing_context_id: top_level_browsing_context_id,
browsing_context_id: browsing_context_id, browsing_context_id: browsing_context_id,
new_pipeline_id: pipeline_id, new_pipeline_id: pipeline_id,
@ -1573,8 +1577,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
}; };
// Create the new pipeline, attached to the parent and push to pending changes // Create the new pipeline, attached to the parent and push to pending changes
self.handle_load_start_msg(load_info.info.new_pipeline_id); self.add_pending_change(SessionHistoryChange {
self.pending_changes.push(SessionHistoryChange {
top_level_browsing_context_id: load_info.info.top_level_browsing_context_id, top_level_browsing_context_id: load_info.info.top_level_browsing_context_id,
browsing_context_id: load_info.info.browsing_context_id, browsing_context_id: load_info.info.browsing_context_id,
new_pipeline_id: load_info.info.new_pipeline_id, new_pipeline_id: load_info.info.new_pipeline_id,
@ -1639,8 +1642,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
assert!(!self.pipelines.contains_key(&new_pipeline_id)); assert!(!self.pipelines.contains_key(&new_pipeline_id));
self.pipelines.insert(new_pipeline_id, pipeline); self.pipelines.insert(new_pipeline_id, pipeline);
self.handle_load_start_msg(new_pipeline_id); self.add_pending_change(SessionHistoryChange {
self.pending_changes.push(SessionHistoryChange {
top_level_browsing_context_id: top_level_browsing_context_id, top_level_browsing_context_id: top_level_browsing_context_id,
browsing_context_id: browsing_context_id, browsing_context_id: browsing_context_id,
new_pipeline_id: new_pipeline_id, new_pipeline_id: new_pipeline_id,
@ -1791,8 +1793,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
let new_pipeline_id = PipelineId::new(); let new_pipeline_id = PipelineId::new();
let sandbox = IFrameSandboxState::IFrameUnsandboxed; let sandbox = IFrameSandboxState::IFrameUnsandboxed;
let replace_instant = if replace { Some(timestamp) } else { None }; let replace_instant = if replace { Some(timestamp) } else { None };
self.handle_load_start_msg(new_pipeline_id); self.add_pending_change(SessionHistoryChange {
self.pending_changes.push(SessionHistoryChange {
top_level_browsing_context_id: top_level_id, top_level_browsing_context_id: top_level_id,
browsing_context_id: browsing_context_id, browsing_context_id: browsing_context_id,
new_pipeline_id: new_pipeline_id, new_pipeline_id: new_pipeline_id,
@ -2180,8 +2181,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
}; };
self.new_pipeline(new_pipeline_id, browsing_context_id, top_level_id, parent_info, self.new_pipeline(new_pipeline_id, browsing_context_id, top_level_id, parent_info,
window_size, load_data.clone(), sandbox, is_private); window_size, load_data.clone(), sandbox, is_private);
self.handle_load_start_msg(new_pipeline_id); self.add_pending_change(SessionHistoryChange {
self.pending_changes.push(SessionHistoryChange {
top_level_browsing_context_id: top_level_id, top_level_browsing_context_id: top_level_id,
browsing_context_id: browsing_context_id, browsing_context_id: browsing_context_id,
new_pipeline_id: new_pipeline_id, new_pipeline_id: new_pipeline_id,