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

add methods to ensure frame state stays consistent

Browse source
This commit is contained in:
Connor Brewster 2017-01-17 21:48:51 -06:00
parent f010fb58fd
commit eedff27ea9
2 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/constellation/constellation.rs
View file

@ -2033,9 +2033,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
debug_assert_eq!(entry.instant, curr_entry.instant); debug_assert_eq!(entry.instant, curr_entry.instant);
frame.pipeline_id = pipeline_id; frame.update_current(pipeline_id, &entry);
frame.instant = entry.instant;
frame.url = entry.url.clone();
old_pipeline_id old_pipeline_id
}, },
@ -2130,7 +2128,7 @@ impl<Message, LTF, STF> Constellation<Message, LTF, STF>
let (evicted_id, new_frame, clear_future, location_changed) = if let Some(mut entry) = frame_change.replace { let (evicted_id, new_frame, clear_future, location_changed) = if let Some(mut entry) = frame_change.replace {
debug!("Replacing pipeline in existing frame."); debug!("Replacing pipeline in existing frame.");
let evicted_id = entry.pipeline_id; let evicted_id = entry.pipeline_id;
entry.pipeline_id = Some(frame_change.new_pipeline_id); entry.replace_pipeline(frame_change.new_pipeline_id, frame_change.url.clone());
self.traverse_to_entry(entry); self.traverse_to_entry(entry);
(evicted_id, false, false, false) (evicted_id, false, false, false)
} else if let Some(frame) = self.frames.get_mut(&frame_change.frame_id) { } else if let Some(frame) = self.frames.get_mut(&frame_change.frame_id) {

16
components/constellation/frame.rs
View file

@ -76,6 +76,13 @@ impl Frame {
pub fn remove_forward_entries(&mut self) -> Vec<FrameState> { pub fn remove_forward_entries(&mut self) -> Vec<FrameState> {
replace(&mut self.next, vec!()) replace(&mut self.next, vec!())
} }
/// Update the current entry of the Frame from an entry that has been traversed to.
pub fn update_current(&mut self, pipeline_id: PipelineId, entry: &FrameState) {
self.pipeline_id = pipeline_id;
self.instant = entry.instant;
self.url = entry.url.clone();
}
} }
/// An entry in a frame's session history. /// An entry in a frame's session history.
@ -99,6 +106,15 @@ pub struct FrameState {
pub frame_id: FrameId, pub frame_id: FrameId,
} }
impl FrameState {
/// Updates the entry's pipeline and url. This is used when navigating with replacement
/// enabled.
pub fn replace_pipeline(&mut self, pipeline_id: PipelineId, url: ServoUrl) {
self.pipeline_id = Some(pipeline_id);
self.url = url;
}
}
/// Represents a pending change in the frame tree, that will be applied /// Represents a pending change in the frame tree, that will be applied
/// once the new pipeline has loaded and completed initial layout / paint. /// once the new pipeline has loaded and completed initial layout / paint.
pub struct FrameChange { pub struct FrameChange {